Refactor Aquarium to make it more configurable

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

diff --git a/src/test/resources/aquarium.properties b/src/test/resources/aquarium.properties
index c1f730a..def2921 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,8 +9,7 @@ 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
@@ -28,6 +18,9 @@ rabbitmq.username=guest
 # Passwd for connecting with the AMQP server
 rabbitmq.passwd=guest
 
+# Exchnage used by Aquarium to publish messages
+rabbitmq.exchange=aquarium
+
 # Virtual host on the AMQP server
 rabbitmq.vhost=/
 
@@ -65,13 +58,14 @@ mongodb.dbschema=aquarium
 mongodb.connection.pool.size=20
 
 # Relative to AQUARIUM_HOME or an absolute path
-events.store.folder=../events-store
+# DO NOT set this in production
+#events.store.folder=../events-store
 
 # Store resource events to events.store.folder as well
-events.store.save.rc.events=true
+events.store.save.rc.events=false
 
 # Store IM events to events.store.folder as well
-events.store.save.im.events=true
+events.store.save.im.events=false
 
 # How often do we attempt a reconnection to the store(s)?
 anystore.reconnect.period.millis=1000
@@ -82,43 +76,17 @@ anystore.reconnect.period.millis=1000
 
 # Actor subsystem
 actor.provider.class=gr.grnet.aquarium.service.SimpleLocalRoleableActorProviderService
-
 # Class that initializes the REST service
 rest.service.class=gr.grnet.aquarium.service.RESTActorService
-
 # Store subsystem
-store.provider.class=gr.grnet.aquarium.store.mongodb.MemStore
-
+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)
-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
-
+#user.state.store.class=gr.grnet.aquarium.store.memory.MemStorede the event store (if present, it will not be given by the store provider above)
+#resource.event.store.class=
 # 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
-
+#user.event.store.class=
 # 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
-
-# Save unparsed user events to user event store
-ack.unparsed.event.im=false
+#policy.store.class=
 
 # Administrative REST API authorization cookie
 admin.cookie=1
\ No newline at end of file