Merge branch 'master' of https://code.grnet.gr/git/aquarium

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

diff --git a/src/test/resources/aquarium.properties b/src/test/resources/aquarium.properties
index 23688d3..4047db9 100644 (file)
--- a/src/test/resources/aquarium.properties
+++ b/src/test/resources/aquarium.properties
@@ -1,13 +1,4 @@
-version = 0.0.2-SNAPSHOT
-
-# Location of the Aquarium accounting policy config file. If commented
-# out, Aquarium will look for the file policy.yaml first at the program
-# 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
+version = 0.2.0-SNAPSHOT
 
 ### Queue related settings
 
@@ -18,15 +9,17 @@ rabbitmq.reconnect.period.millis=1000
 # active-active mode.
 rabbitmq.servers=localhost
 
-# Comma separated list of rabbitmq servers to use. The servers must be in an
-# active-active mode.
+# Port for connecting to the AMQP server
 rabbitmq.port=5672
 
 # User name for connecting with the AMQP server
-rabbitmq.username=aquarium
+rabbitmq.username=guest
 
 # Passwd for connecting with the AMQP server
-rabbitmq.passwd=aquarium
+rabbitmq.passwd=guest
+
+# Exchnage used by Aquarium to publish messages
+rabbitmq.exchange=aquarium
 
 # Virtual host on the AMQP server
 rabbitmq.vhost=/
@@ -38,13 +31,16 @@ rabbitmq.rcevents.queues=pithos:pithos.resource.#:aquarium-pithos-rcevents,cycla
 # Queue declarations for receiving IM events, format is "exchange:routing.key:queue"
 rabbitmq.imevents.queues=astakos:astakos.user:aquarium-imevents
 
+# For sending credit modifications
+rabbitmq.imevents.credit=astakos:astakos-events-credit
+
 # REST service listening port
 rest.port=8888
 
 ### Message store related settings
 
 # Hostname for the persistence service
-mongodb.host=localhost
+mongodb.host=127.0.0.1
 
 # Port for connecting to the persistence service
 mongodb.port=27017
@@ -55,8 +51,8 @@ mongodb.username=aquarium
 # Password for connecting to the persistence service
 mongodb.password=aquarium
 
-# The name of the DB schema to use
-mongodb.dbschema=aquarium
+# The name of the MongoDB database to use
+mongodb.database=aquarium
 
 ### Performance options
 
@@ -65,54 +61,26 @@ mongodb.dbschema=aquarium
 mongodb.connection.pool.size=20
 
 # Relative to AQUARIUM_HOME or an absolute path
+# DO NOT set this in production
 events.store.folder=../events-store
 
-#######
-# DO NOT TOUCH the following options, unless you know what you are doing
-#######
+# Store resource events to events.store.folder as well
+events.store.save.rc.events=false
 
-# Actor subsystem
-actor.provider.class=gr.grnet.aquarium.service.SimpleLocalRoleableActorProviderService
+# Store IM events to events.store.folder as well
+events.store.save.im.events=false
 
-# Class that initializes the REST service
-rest.service.class=gr.grnet.aquarium.service.RESTActorService
+# How often do we attempt a reconnection to the store(s)?
+anystore.reconnect.period.millis=1000
 
+# Class that initializes the REST service
+rest.service.class=gr.grnet.aquarium.service.FinagleRESTService
+rest.shutdown.timeout.millis=2000
 # Store subsystem
-store.provider.class=gr.grnet.aquarium.store.mongodb.MemStore
-
-# Override the user store (if present, it will not be given by the store provider above)
-user.state.store.class=gr.grnet.aquarium.store.memory.MemStore
-
-# Override the event store (if present, it will not be given by the store provider above)
-resource.event.store.class=gr.grnet.aquarium.store.memory.MemStore
-
-# Override the WalletEntry store (if present, it will not be given by the store provider above)
-wallet.entry.store.class=gr.grnet.aquarium.store.memory.MemStore
-
-# Override the user event store (if present, it will not be given by the store provider above)
-user.event.store.class=gr.grnet.aquarium.store.memory.MemStore
-
-# Override the user event store (if present, it will not be given by the store provider above)
-policy.store.class=gr.grnet.aquarium.store.memory.MemStore
-
-# The lower mark for the UserActors' LRU.
-user.actor.LRU.lower.mark=800
-
-# The upper mark for the UserActors' LRU.
-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
-rabbitmq.exchange=aquarium
-
-# This is an absolute constant for the lifetime of an Aquarium installation.
-# 1 means that every second counts
-time.unit.in.seconds = 1
+store.provider.class=gr.grnet.aquarium.store.mongodb.MongoDBStoreProvider
 
-# Save unparsed user events to user event store
-ack.unparsed.event.im=false
+# A time period in milliseconds for which we can tolerate stale parts regarding user state.
+user.state.timestamp.threshold=1
 
 # Administrative REST API authorization cookie
 admin.cookie=1
\ No newline at end of file