More detailed handling of admin requests

[aquarium] / src / test / resources / akka.conf

diff --git a/src/test/resources/akka.conf b/src/test/resources/akka.conf
index 7b49e66..8eef281 100644 (file)
--- a/src/test/resources/akka.conf
+++ b/src/test/resources/akka.conf
@@ -1,16 +1,9 @@
-####################
-# Akka Config File #
-####################
-
-# This file has all the default settings, so all these could be removed with no visible effect.
-# Modify as needed.
-
 akka {
-  version = "1.3-RC4"   # Akka version, checked against the runtime version of Akka.
+  version = "1.3.1"
 
-  enabled-modules = ["remote", "http", "amqp"]       # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]
+  enabled-modules = ["remote", "http", "amqp"]
 
-  time-unit = "seconds"      # Time unit for all timeout properties throughout the config
+  time-unit = "seconds"
 
   event-handlers = ["akka.event.EventHandler$DefaultListener", "akka.event.slf4j.Slf4jEventHandler"] # event handlers to register at boot time (EventHandler$DefaultListener logs to STDOUT)
   event-handler-level = "DEBUG" # Options: ERROR, WARNING, INFO, DEBUG
@@ -68,49 +61,7 @@ akka {
       lifecycle = "false"     # enable DEBUG logging of actor lifecycle changes
     }
 
-  http {
-    hostname = "localhost"
-    port = 9998
-
-    #If you are using akka.http.AkkaRestServlet
-    filters = ["akka.security.AkkaSecurityFilterFactory"] # List with all jersey filters to use
-    # resource-packages = ["sample.rest.scala",
-    #                      "sample.rest.java",
-    #                      "sample.security"] # List with all resource packages for your Jersey services
-    resource-packages = ["gr.grnet.aquarium.rest", "gr.grnet.aquarium.rest.service"]
-
-    # The authentication service to use. Need to be overridden (sample now)
-    # authenticator = "sample.security.BasicAuthenticationService"
-    authenticator = "N/A"
-
-    # Uncomment if you are using the KerberosAuthenticationActor
-    # kerberos {
-    #   servicePrincipal = "HTTP/localhost@EXAMPLE.COM"
-    #   keyTabLocation   = "URL to keytab"
-    #   kerberosDebug    = "true"
-    #   realm            = "EXAMPLE.COM"
-    # }
-    kerberos {
-      servicePrincipal = "N/A"
-      keyTabLocation   = "N/A"
-      kerberosDebug    = "N/A"
-      realm            = ""
-    }
-
-    #If you are using akka.http.AkkaMistServlet
-    mist-dispatcher {
-      #type = "GlobalExecutorBasedEventDriven" # Uncomment if you want to use a different dispatcher than the default one for Comet
-    }
-    connection-close = true                 # toggles the addition of the "Connection" response header with a "close" value
-    root-actor-id = "_httproot"             # the id of the actor to use as the root endpoint
-    root-actor-builtin = true               # toggles the use of the built-in root endpoint base class
-    timeout = 1000                          # the default timeout for all async requests (in ms)
-    expired-header-name = "Async-Timeout"   # the name of the response header to use when an async request expires
-    expired-header-value = "expired"        # the value of the response header to use when an async request expires
-  }
-
   remote {
-
     # secure-cookie = "050E0A0D0D06010A00000900040D060F0C09060B" # generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' or using 'Crypt.generateSecureCookie'
     secure-cookie = ""
 
@@ -152,9 +103,9 @@ akka {
 # spray-can config
 spray-can {
   server {
-    port = 8080
+    port = 8888
     service-actor-id = "spray-root-service"
     timeout-actor-id = "spray-root-service" # we want to handle timeouts with the same service actor
-    request-timeout = 2000 # require all requests to be completed within 2 seconds
+    request-timeout = 3000 # require all requests to be completed within 3 seconds
   }
 }