In memory store for tests, change property files search to /etc/aquarium

diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala
index 9fa1319..74d4849 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurator.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala
@@ -234,7 +234,7 @@ object Configurator {
   /**
    * The venerable /etc resource context
    */
   /**
    * The venerable /etc resource context
    */

-  val SlashEtcResourceContext = new FileStreamResourceContext("/etc")
+  val SlashEtcResourceContext = new FileStreamResourceContext("/etc/aquarium")

 
   /**
    * Class loader resource context.
 
   /**
    * Class loader resource context.

diff --git a/src/test/resources/aquarium.properties b/src/test/resources/aquarium.properties
new file mode 100644 (file)
index 0000000..fd27664
--- /dev/null
+++ b/src/test/resources/aquarium.properties
@@ -0,0 +1,99 @@
+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
+
+### 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.
+amqp.port=5672
+
+# User name for connecting with the AMQP server
+amqp.username=aquarium
+
+# Passwd for connecting with the AMQP server
+amqp.passwd=aquarium
+
+# Virtual host on the AMQP server
+amqp.vhost=/
+
+# REST service listening port
+rest.port=8080
+
+### Message store related settings
+
+# Provider for persistence services.
+# Currently one of: mongo
+persistence.provider=mongodb
+
+# Hostname for the persistence service
+persistence.host=localhost
+
+# Port for connecting to the persistence service
+persistence.port=27017
+
+# Username for connecting to the persistence service
+persistence.username=aquarium
+
+# Password for connecting to the persistence service
+persistence.password=aquarium
+
+### Performance options
+
+# Maximum number of open connections to MongoDB. Has no effect if
+# another driver is in use
+mongo.connection.pool.size=20
+
+#######
+# DO NOT TOUCH the following options, unless you know what you are doing
+#######
+
+# Actor subsystem
+actor.provider.class=gr.grnet.aquarium.actor.SimpleLocalActorProvider
+
+# Class that initializes the REST service
+rest.service.class=gr.grnet.aquarium.rest.actor.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)
+user.state.store.class=gr.grnet.aquarium.store.memory.MemUserStateStore
+
+# 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.MemUserStateStore
+
+# 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.MemUserStateStore
+
+# 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.MemUserStateStore
+
+# 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.MemUserStateStore
+
+# The lower mark for the UserActors' LRU, managed by UserActorManager.
+user.actor.LRU.lower.mark=800
+
+# The upper mark for the UserActors' LRU, managed by UserActorManager.
+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
+
+# The name of the DB schema to use
+persistence.db=aquarium
+
+# This is an absolute constant for the lifetime of an Aquarium installation.
+# 1 means that every second counts
+time.unit.in.seconds = 1
\ No newline at end of file