From c73bb89f7cab3435289f200bc95a61120d0b7a2f Mon Sep 17 00:00:00 2001
From: jboner <jboner@darkstar.local>
Date: Fri, 16 Oct 2009 10:36:17 +0200
Subject: [PATCH] added wrong config by mistake

---
 config/akka.conf | 73 ++----------------------------------------------
 1 file changed, 3 insertions(+), 70 deletions(-)

diff --git a/config/akka.conf b/config/akka.conf
index 6a07601c16..c674817033 100644
--- a/config/akka.conf
+++ b/config/akka.conf
@@ -1,72 +1,5 @@
-####################
-# Akka Config File #
-####################
- 
-# This file has all the default settings, so all these could be remove with no visible effect.
-# Modify as needed.
- 
-<log>
-  filename = "./logs/akka.log"
-  roll = "daily"  # Options: never, hourly, daily, sunday/monday/...
-  level = "debug" # Options: fatal, critical, error, warning, info, debug, trace
-  console = on
-  # syslog_host = ""
-  # syslog_server_name = ""
-</log>
- 
-<akka>
-  version = "0.6"
- 
-  # FQN to the class doing initial active object/actor
-  # supervisor bootstrap, should be defined in default constructor
-  boot = ["training.ships.akka_rest.Boot", "training.ships.akka_persistence.Boot"]
+include "akka-reference.conf"
 
-  <actor>
-    timeout = 5000           # default timeout for future based invocations
-    serialize-messages = off # does a deep clone of (non-primitive) messages to ensure immutability
-  </actor>
+# This config import the Akka reference configuration. 
+# In this file you can override any option defined in the 'akka-reference.conf' file.
 
-  <stm>
-    service = on
-    restart-on-collision = off # (not implemented yet) if 'on' then it reschedules the transaction,
-                               # if 'off' then throws an exception or rollback for user to handle
-    wait-for-completion = 100  # how long time in millis a transaction should be given time to complete when a collision is detected
-    wait-nr-of-times = 3       # the number of times it should check for completion of a pending transaction upon collision
-    distributed = off          # not implemented yet
-  </stm>
-
-  <remote>
-    service = on
-    hostname = "localhost"
-    port = 9999
-    connection-timeout = 1000 # in millis
-  </remote>
- 
-  <rest>
-    service = on
-    hostname = "localhost"
-    port = 9998
-    filters = "se.scalablesolutions.akka.security.AkkaSecurityFilterFactory;org.atmosphere.core.AtmosphereFilter"
-    authenticator = "sample.secure.SimpleAuthenticationService"
-  </rest>
-  
-  <storage>
-    system = "mongodb"            # Options: cassandra, mongodb 
- 
-    <cassandra>
-      service = on
-      hostname = "127.0.0.1"        # IP address or hostname of one of the Cassandra cluster's seeds
-      port = 9160
-      storage-format = "java"       # Options: java, scala-json, java-json, protobuf
-      consistency-level = 1 
-    </cassandra>
-
-    <mongodb>
-      service = on
-      hostname = "127.0.0.1"        # IP address or hostname of the MongoDB DB instance
-      port = 27017
-      dbname = "mydb"
-      storage-format = "scala-json" # Options: java, scala-json, java-json, protobuf
-    </mongodb>
-  </storage>
-</akka>