Remove workaround for int conversion bug

[aquarium] / src / main / resources / aquarium.properties

diff --git a/src/main/resources/aquarium.properties b/src/main/resources/aquarium.properties
index 1f388bd..90949d6 100644 (file)
--- a/src/main/resources/aquarium.properties
+++ b/src/main/resources/aquarium.properties
@@ -5,14 +5,17 @@ version = 0.0.2-SNAPSHOT
 # starting directory and then fall back to the classpath.
 aquarium.policy = policy.yaml
 
+# Location of the file that defines the mappings between
+# user roles and agreements
+aquarium.role-agreement.map=role-agreement.map
+
 ### Queue related settings
 
 # Comma separated list of amqp servers to use. The servers must be in an
 # active-active mode.
 amqp.servers=localhost
 
-# Comma separated list of amqp servers to use. The servers must be in an
-# active-active mode.
+# Port for connecting to the AMQP server
 amqp.port=5672
 
 # User name for connecting with the AMQP server
@@ -25,14 +28,14 @@ amqp.passwd=aquarium
 amqp.vhost=/
 
 # Queue declarations for receiving resource events.
-# Format is "exchange:routing.key". Entries are separated by ;
-amqp.resevents.queues=exch:*.resource.#:aquarium-resevents
+# Format is "exchange:routing.key:queue". Entries are separated by ;
+amqp.resevents.queues=pithos:pithos.resource.#:aquarium-pithos-resevents;cyclades:cyclades.resource.#:aquarium-cyclades-resevents
 
-# Queue declarations for receiving IM events, format is "exchange:routing.key"
+# Queue declarations for receiving IM events, format is "exchange:routing.key:queue"
 amqp.userevents.queues=exch:*.resource.#:aquarium-resevents
 
 # REST service listening port
-rest.port=8080
+rest.port=8888
 
 ### Message store related settings
 
@@ -58,14 +61,17 @@ persistence.password=aquarium
 # another driver is in use
 mongo.connection.pool.size=20
 
+# Relative to AQUARIUM_HOME or an absolute path
+events.store.folder=../events-store
+
 #######
 # DO NOT TOUCH the following options, unless you know what you are doing
 #######
 
 # Actor subsystem
-actor.provider.class=gr.grnet.aquarium.actor.SimpleLocalActorProvider
+actor.provider.class=gr.grnet.aquarium.actor.provider.SimpleLocalActorProvider
 # Class that initializes the REST service
-rest.service.class=gr.grnet.aquarium.rest.actor.RESTActorService
+rest.service.class=gr.grnet.aquarium.service.RESTActorService
 # Store subsystem
 store.provider.class=gr.grnet.aquarium.store.mongodb.MongoDBStoreProvider
 # Override the user store (if present, it will not be given by the store provider above)
@@ -86,8 +92,14 @@ user.actors.LRU.upper.mark=1000
 # A time period in milliseconds for which we can tolerate stale data regarding user state.
 user.state.timestamp.threshold=10000
 
-# Comma separated list of exchanges known to aquarium
-amqp.exchanges=aquarium
+# Exchnage used by Aquarium to publish messages
+amqp.exchange=aquarium
 
 # The name of the DB schema to use
 persistence.db=aquarium
+
+# Save unparsed user events to user event store
+ack.unparsed.event.im=false
+
+# Administrative REST API authorization cookie
+admin.cookie=1
\ No newline at end of file