Refactor Aquarium to make it more configurable

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

diff --git a/src/main/resources/aquarium.properties b/src/main/resources/aquarium.properties
index eab7427..def2921 100644 (file)
--- a/src/main/resources/aquarium.properties
+++ b/src/main/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
 
@@ -27,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=/
 
@@ -94,19 +88,5 @@ store.provider.class=gr.grnet.aquarium.store.mongodb.MongoDBStoreProvider
 # Override the user event store (if present, it will not be given by the store provider above)
 #policy.store.class=
 
-# 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
-
-# Exchnage used by Aquarium to publish messages
-rabbitmq.exchange=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