- */
-
-package se.scalablesolutions.akka.api;
-
-import se.scalablesolutions.akka.config.*;
-import static se.scalablesolutions.akka.config.JavaConfig.*;
-
-import junit.framework.TestCase;
-
-public class RemotePersistentStateTest extends TestCase {
- static String messageLog = "";
-
- final private ActiveObjectConfigurator conf = new ActiveObjectConfigurator();
-
- protected void setUp() {
- PersistenceManager.init();
- conf.configure(
- new RestartStrategy(new AllForOne(), 3, 5000, new Class[]{Exception.class}),
- new Component[] {
- new Component(PersistentStateful.class, new LifeCycle(new Permanent()), 1000000, new RemoteAddress("localhost", 9999)),
- new Component(PersistentFailer.class, new LifeCycle(new Permanent()), 1000000, new RemoteAddress("localhost", 9999))
- }).supervise();
- }
-
- protected void tearDown() {
- conf.stop();
- }
-
- public void testShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
- PersistentStateful stateful = conf.getInstance(PersistentStateful.class);
- stateful.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init"); // set init state
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // transactionrequired
- assertEquals("new state", stateful.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess"));
- }
-
- public void testMapShouldRollbackStateForStatefulServerInCaseOfFailure() {
- PersistentStateful stateful = conf.getInstance(PersistentStateful.class);
- stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init"); // set init state
- PersistentFailer failer = conf.getInstance(PersistentFailer.class);
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "MapShouldRollBack", failer); // call failing transactionrequired method
- fail("should have thrown an exception");
- } catch (RuntimeException e) {
- } // expected
- assertEquals("init", stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure")); // check that state is == init state
- }
-
- public void testVectorShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
- PersistentStateful stateful = conf.getInstance(PersistentStateful.class);
- int init = stateful.getVectorLength();
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "VectorShouldNotRollback"); // transactionrequired
- assertEquals(init + 1, stateful.getVectorLength());
- }
-
- public void testVectorShouldRollbackStateForStatefulServerInCaseOfFailure() {
- PersistentStateful stateful = conf.getInstance(PersistentStateful.class);
- int init = stateful.getVectorLength();
- PersistentFailer failer = conf.getInstance(PersistentFailer.class);
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer); // call failing transactionrequired method
- fail("should have thrown an exception");
- } catch (RuntimeException e) {
- } // expected
- assertEquals(init, stateful.getVectorLength());
- }
-
- public void testRefShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
- PersistentStateful stateful = conf.getInstance(PersistentStateful.class);
- stateful.setRefState("init"); // set init state
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // transactionrequired
- assertEquals("new state", stateful.getRefState());
- }
-
- public void testRefShouldRollbackStateForStatefulServerInCaseOfFailure() {
- PersistentStateful stateful = conf.getInstance(PersistentStateful.class);
- stateful.setRefState("init"); // set init state
- PersistentFailer failer = conf.getInstance(PersistentFailer.class);
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer); // call failing transactionrequired method
- fail("should have thrown an exception");
- } catch (RuntimeException e) {
- } // expected
- assertEquals("init", stateful.getRefState()); // check that state is == init state
- }
-
-}
\ No newline at end of file
diff --git a/akka-fun-test-java/testng.xml b/akka-fun-test-java/testng.xml
deleted file mode 100644
index b894d3880b..0000000000
--- a/akka-fun-test-java/testng.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/akka-http/src/main/scala/AkkaLoader.scala b/akka-http/src/main/scala/AkkaLoader.scala
index 431758e2c7..886c2c0688 100644
--- a/akka-http/src/main/scala/AkkaLoader.scala
+++ b/akka-http/src/main/scala/AkkaLoader.scala
@@ -47,29 +47,29 @@ class AkkaLoader extends Logging {
private def printBanner = {
log.info(
"""
- t
- t t t
- t t tt t
- tt t t tt t
- t ttttttt t ttt t
- t tt ttt t ttt t
- t t ttt t ttt t t
- tt t ttt ttt ttt t
- t t ttt ttt t tt t
- t ttt ttt t t
- tt ttt ttt t
- ttt ttt
- tttttttt ttt ttt ttt ttt tttttttt
- ttt tt ttt ttt ttt ttt ttt ttt
- ttt ttt ttt ttt ttt ttt ttt ttt
- ttt ttt ttt ttt ttt tt ttt ttt
- tttt ttttttttt tttttttt tttt
- ttttttttt ttt ttt ttt ttt ttttttttt
- ttt ttt ttt ttt ttt ttt ttt ttt
- ttt ttt ttt ttt ttt ttt ttt ttt
- ttt tt ttt ttt ttt ttt ttt ttt
+ t
+ t t t
+ t t tt t
+ tt t t tt t
+ t ttttttt t ttt t
+ t tt ttt t ttt t
+ t t ttt t ttt t t
+ tt t ttt ttt ttt t
+ t t ttt ttt t tt t
+ t ttt ttt t t
+ tt ttt ttt t
+ ttt ttt
tttttttt ttt ttt ttt ttt tttttttt
-
+ ttt tt ttt ttt ttt ttt ttt ttt
+ ttt ttt ttt ttt ttt ttt ttt ttt
+ ttt ttt ttt ttt ttt tt ttt ttt
+ tttt ttttttttt tttttttt tttt
+ ttttttttt ttt ttt ttt ttt ttttttttt
+ ttt ttt ttt ttt ttt ttt ttt ttt
+ ttt ttt ttt ttt ttt ttt ttt ttt
+ ttt tt ttt ttt ttt ttt ttt ttt
+ tttttttt ttt ttt ttt ttt tttttttt
+
==================================================
""")
log.info(" Running version %s", Config.VERSION)
diff --git a/akka-kernel/src/main/scala/EmbeddedAppServer.scala b/akka-kernel/src/main/scala/EmbeddedAppServer.scala
index 41e6dd44ae..8d9982c7e2 100644
--- a/akka-kernel/src/main/scala/EmbeddedAppServer.scala
+++ b/akka-kernel/src/main/scala/EmbeddedAppServer.scala
@@ -50,14 +50,14 @@ trait EmbeddedAppServer extends Bootable with Logging {
Thread.currentThread.setContextClassLoader(applicationLoader.get)
super.init(sc)
}
- finally {
+ finally {
Thread.currentThread.setContextClassLoader(cl)
}
}
})
adapter.setContextPath(uri.getPath)
- adapter.addInitParameter("cometSupport",
+ adapter.addInitParameter("cometSupport",
"org.atmosphere.container.GrizzlyCometSupport")
adapter.addInitParameter("com.sun.jersey.config.property.resourceConfigClass",
"com.sun.jersey.api.core.PackagesResourceConfig")
@@ -65,7 +65,7 @@ trait EmbeddedAppServer extends Bootable with Logging {
config.getList("akka.rest.resource_packages").mkString(";")
)
adapter.addInitParameter("com.sun.jersey.spi.container.ResourceFilters",
- config.getList("akka.rest.filters").mkString(",")
+ config.getList("akka.rest.filters").mkString(",")
)
if (HOME.isDefined) adapter.addRootFolder(HOME.get + "/deploy/root")
diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
index b67a0e9256..f393f4a162 100644
--- a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
+++ b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
@@ -42,7 +42,7 @@ private[akka] object CassandraStorageBackend extends
case "ALL" => ConsistencyLevel.ALL
case "ANY" => ConsistencyLevel.ANY
case unknown => throw new IllegalArgumentException(
- "Cassandra consistency level [" + unknown + "] is not supported." +
+ "Cassandra consistency level [" + unknown + "] is not supported." +
"\n\tExpected one of [ZERO, ONE, QUORUM, DCQUORUM, DCQUORUMSYNC, ALL, ANY] in the akka.conf configuration file.")
}
}
@@ -105,9 +105,9 @@ private[akka] object CassandraStorageBackend extends
}
}
- def insertVectorStorageEntriesFor(name: String, elements: List[Array[Byte]]) =
+ def insertVectorStorageEntriesFor(name: String, elements: List[Array[Byte]]) =
elements.foreach(insertVectorStorageEntryFor(name, _))
-
+
def updateVectorStorageEntryFor(name: String, index: Int, elem: Array[Byte]) = {
val columnPath = new ColumnPath(VECTOR_COLUMN_PARENT.getColumn_family)
columnPath.setColumn(intToBytes(index))
diff --git a/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
index 6746fca529..648dec2be3 100644
--- a/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
+++ b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
@@ -171,4 +171,4 @@ object EmbeddedCassandraService {
def start: Unit = {}
}
-*/
\ No newline at end of file
+*/
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
index bcfb2c1025..6a0eb9a8d8 100644
--- a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
+++ b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
@@ -30,7 +30,7 @@ class StorageException(message: String) extends RuntimeException(message)
*
* val myMap = CassandraStorage.getMap(id)
*
- *
+ *
* Example Java usage:
*
* PersistentMap myMap = MongoStorage.newMap();
@@ -72,7 +72,7 @@ trait Storage {
}
/**
- * Implementation of PersistentMap for every concrete
+ * Implementation of PersistentMap for every concrete
* storage will have the same workflow. This abstracts the workflow.
*
* Subclasses just need to provide the actual concrete instance for the
@@ -117,23 +117,23 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V]
put(key, value)
this
}
-
+
override def put(key: K, value: V): Option[V] = {
register
newAndUpdatedEntries.put(key, value)
}
-
- override def update(key: K, value: V) = {
+
+ override def update(key: K, value: V) = {
register
newAndUpdatedEntries.update(key, value)
}
-
+
override def remove(key: K) = {
register
removedEntries.add(key)
newAndUpdatedEntries.get(key)
}
-
+
def slice(start: Option[K], count: Int): List[Tuple2[K, V]] =
slice(start, None, count)
@@ -141,11 +141,11 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V]
storage.getMapStorageRangeFor(uuid, start, finish, count)
} catch { case e: Exception => Nil }
- override def clear = {
+ override def clear = {
register
shouldClearOnCommit.swap(true)
}
-
+
override def contains(key: K): Boolean = try {
newAndUpdatedEntries.contains(key) ||
storage.getMapStorageEntryFor(uuid, key).isDefined
@@ -163,9 +163,9 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V]
storage.getMapStorageEntryFor(uuid, key)
} catch { case e: Exception => None }
}
-
+
def iterator = elements
-
+
override def elements: Iterator[Tuple2[K, V]] = {
new Iterator[Tuple2[K, V]] {
private val originalList: List[Tuple2[K, V]] = try {
@@ -173,10 +173,10 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V]
} catch {
case e: Throwable => Nil
}
- private var elements = newAndUpdatedEntries.toList union originalList.reverse
+ private var elements = newAndUpdatedEntries.toList union originalList.reverse
override def next: Tuple2[K, V]= synchronized {
val element = elements.head
- elements = elements.tail
+ elements = elements.tail
element
}
override def hasNext: Boolean = synchronized { !elements.isEmpty }
@@ -217,12 +217,12 @@ trait PersistentVector[T] extends IndexedSeq[T] with Transactional with Committa
}
def +(elem: T) = add(elem)
-
+
def add(elem: T) = {
register
newElems + elem
}
-
+
def apply(index: Int): T = get(index)
def get(index: Int): T = {
@@ -231,7 +231,7 @@ trait PersistentVector[T] extends IndexedSeq[T] with Transactional with Committa
}
override def slice(start: Int, finish: Int): IndexedSeq[T] = slice(Some(start), Some(finish))
-
+
def slice(start: Option[Int], finish: Option[Int], count: Int = 0): IndexedSeq[T] = {
val buffer = new scala.collection.mutable.ArrayBuffer[T]
storage.getVectorStorageRangeFor(uuid, start, finish, count).foreach(buffer.append(_))
@@ -277,21 +277,21 @@ trait PersistentVector[T] extends IndexedSeq[T] with Transactional with Committa
*/
trait PersistentRef[T] extends Transactional with Committable with Abortable {
protected val ref = new TransactionalRef[T]
-
+
val storage: RefStorageBackend[T]
def commit = if (ref.isDefined) {
storage.insertRefStorageFor(uuid, ref.get.get)
- ref.swap(null.asInstanceOf[T])
+ ref.swap(null.asInstanceOf[T])
}
- def abort = ref.swap(null.asInstanceOf[T])
+ def abort = ref.swap(null.asInstanceOf[T])
def swap(elem: T) = {
register
ref.swap(elem)
}
-
+
def get: Option[T] = if (ref.isDefined) ref.get else storage.getRefStorageFor(uuid)
def isDefined: Boolean = ref.isDefined || storage.getRefStorageFor(uuid).isDefined
@@ -309,7 +309,7 @@ trait PersistentRef[T] extends Transactional with Committable with Abortable {
}
/**
- * Implementation of PersistentQueue for every concrete
+ * Implementation of PersistentQueue for every concrete
* storage will have the same workflow. This abstracts the workflow.
*
* Enqueue is simpler, we just have to record the operation in a local
@@ -410,13 +410,13 @@ trait PersistentQueue[A] extends scala.collection.mutable.Queue[A]
}
}
- override def clear = {
+ override def clear = {
register
shouldClearOnCommit.swap(true)
localQ.swap(Queue.empty)
pickMeForDQ.swap(0)
}
-
+
override def size: Int = try {
storage.size(uuid) + localQ.get.get.length
} catch { case e: Exception => 0 }
@@ -424,11 +424,11 @@ trait PersistentQueue[A] extends scala.collection.mutable.Queue[A]
override def isEmpty: Boolean =
size == 0
- override def +=(elem: A) = {
+ override def +=(elem: A) = {
enqueue(elem)
this
}
- def ++=(elems: Iterator[A]) = {
+ def ++=(elems: Iterator[A]) = {
enqueue(elems.toList: _*)
this
}
@@ -450,7 +450,7 @@ trait PersistentQueue[A] extends scala.collection.mutable.Queue[A]
* Implements a template for a concrete persistent transactional sorted set based storage.
*
* Sorting is done based on a zscore. But the computation of zscore has been kept
- * outside the abstraction.
+ * outside the abstraction.
*
* zscore can be implemented in a variety of ways by the calling class:
*
@@ -467,7 +467,7 @@ trait PersistentQueue[A] extends scala.collection.mutable.Queue[A]
* class Foo {
* //..
* }
- *
+ *
* implicit def Foo2Scorable(foo: Foo): ZScorable = new ZScorable {
* def toZScore = {
* //..
@@ -526,7 +526,7 @@ trait PersistentSortedSet[A] extends Transactional with Committable with Abortab
}
}
}
-
+
def size: Int = newElems.size + storage.zcard(uuid) - removedElems.size
def zscore(elem: A): Float = {
@@ -541,9 +541,9 @@ trait PersistentSortedSet[A] extends Transactional with Committable with Abortab
implicit def order(x: (A, Float)) = new Ordered[(A, Float)] {
def compare(that: (A, Float)) = x._2 compare that._2
}
-
+
implicit def ordering = new scala.math.Ordering[(A,Float)] {
- def compare(x: (A, Float),y : (A,Float)) = x._2 compare y._2
+ def compare(x: (A, Float),y : (A,Float)) = x._2 compare y._2
}
@@ -556,7 +556,7 @@ trait PersistentSortedSet[A] extends Transactional with Committable with Abortab
// -1 means the last element, -2 means the second last
val s = if (start < 0) start + l else start
- val e =
+ val e =
if (end < 0) end + l
else if (end >= l) (l - 1)
else end
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala b/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
index ab0cfaf4d3..a5226eb1a4 100644
--- a/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
+++ b/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
@@ -26,7 +26,7 @@ trait VectorStorageBackend[T] extends StorageBackend {
def updateVectorStorageEntryFor(name: String, index: Int, elem: T)
def getVectorStorageEntryFor(name: String, index: Int): T
def getVectorStorageRangeFor(name: String, start: Option[Int], finish: Option[Int], count: Int): List[T]
- def getVectorStorageSizeFor(name: String): Int
+ def getVectorStorageSizeFor(name: String): Int
}
// for Ref
@@ -47,17 +47,17 @@ trait RefStorageBackend[T] extends StorageBackend {
trait QueueStorageBackend[T] extends StorageBackend {
// add to the end of the queue
def enqueue(name: String, item: T): Boolean
-
+
// pop from the front of the queue
def dequeue(name: String): Option[T]
-
+
// get the size of the queue
def size(name: String): Int
-
+
// return an array of items currently stored in the queue
// start is the item to begin, count is how many items to return
def peek(name: String, start: Int, count: Int): List[T]
-
+
// completely delete the queue
def remove(name: String): Boolean
}
@@ -65,19 +65,19 @@ trait QueueStorageBackend[T] extends StorageBackend {
trait SortedSetStorageBackend[T] extends StorageBackend {
// add item to sorted set identified by name
def zadd(name: String, zscore: String, item: T): Boolean
-
+
// remove item from sorted set identified by name
def zrem(name: String, item: T): Boolean
-
+
// cardinality of the set identified by name
def zcard(name: String): Int
-
+
// zscore of the item from sorted set identified by name
def zscore(name: String, item: T): Option[Float]
-
+
// zrange from the sorted set identified by name
def zrange(name: String, start: Int, end: Int): List[T]
// zrange with score from the sorted set identified by name
- def zrangeWithScore(name: String, start: Int, end: Int): List[(T, Float)]
+ def zrangeWithScore(name: String, start: Int, end: Int): List[(T, Float)]
}
diff --git a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
index 49f46db134..d5581b373b 100644
--- a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
+++ b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
@@ -280,7 +280,7 @@ private[akka] object MongoStorageBackend extends
}
val currentList = dbobj.get(VALUE).asInstanceOf[JArrayList[AnyRef]]
currentList.set(index, serializer.out(elem))
- coll.update(q,
+ coll.update(q,
new BasicDBObject().append(KEY, name).append(VALUE, currentList))
}
diff --git a/akka-samples/akka-sample-ants/src/main/scala/Ants.scala b/akka-samples/akka-sample-ants/src/main/scala/Ants.scala
index 85757f25e8..05fe245b10 100644
--- a/akka-samples/akka-sample-ants/src/main/scala/Ants.scala
+++ b/akka-samples/akka-sample-ants/src/main/scala/Ants.scala
@@ -87,7 +87,7 @@ object World {
pingEvery(evaporator, EvapMillis)
}
- private def pingEvery(actor: ActorRef, millis: Long) =
+ private def pingEvery(actor: ActorRef, millis: Long) =
Scheduler.schedule(actor, "ping", Config.StartDelay, millis, TimeUnit.MILLISECONDS)
}
diff --git a/akka-samples/akka-sample-camel/src/main/scala/Application1.scala b/akka-samples/akka-sample-camel/src/main/scala/Application1.scala
index dfff0e0539..6dcb437992 100644
--- a/akka-samples/akka-sample-camel/src/main/scala/Application1.scala
+++ b/akka-samples/akka-sample-camel/src/main/scala/Application1.scala
@@ -26,4 +26,4 @@ object Application1 {
println(actor2 !! Message("actor2"))
}
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-camel/src/main/scala/Application2.scala b/akka-samples/akka-sample-camel/src/main/scala/Application2.scala
index e01b510a71..8a789d13bf 100644
--- a/akka-samples/akka-sample-camel/src/main/scala/Application2.scala
+++ b/akka-samples/akka-sample-camel/src/main/scala/Application2.scala
@@ -19,4 +19,4 @@ object Application2 {
RemoteNode.start("localhost", 7777)
RemoteNode.register("remote2", actorOf[RemoteActor2].start)
}
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-camel/src/main/scala/Boot.scala b/akka-samples/akka-sample-camel/src/main/scala/Boot.scala
index 5b08e15a1a..206661c8fd 100644
--- a/akka-samples/akka-sample-camel/src/main/scala/Boot.scala
+++ b/akka-samples/akka-sample-camel/src/main/scala/Boot.scala
@@ -74,4 +74,4 @@ class CustomRouteBuilder extends RouteBuilder {
}
})
}
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-chat/README b/akka-samples/akka-sample-chat/README
index fec39724e1..475cb60015 100644
--- a/akka-samples/akka-sample-chat/README
+++ b/akka-samples/akka-sample-chat/README
@@ -18,8 +18,8 @@ Then to run the sample:
- Run 'sbt console' to start up a REPL (interpreter).
4. In the first REPL you get execute:
- scala> import sample.chat._
- - scala> import se.scalablesolutions.akka.actor.Actor._
- - scala> val chatService = actorOf[ChatService].start
+ - scala> import se.scalablesolutions.akka.actor.Actor
+ - scala> val chatService = Actor.actorOf[ChatService].start
5. In the second REPL you get execute:
- scala> import sample.chat._
- scala> Runner.run
diff --git a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
index f193efd217..f244f8eeef 100644
--- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
+++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
@@ -27,17 +27,17 @@ First we need to download, build and start up Redis:
4. Run: ‘./redis-server’.
For details on how to set up Redis server have a look at http://code.google.com/p/redis/wiki/QuickStart.
-Then to run the sample:
+Then to run the sample:
1. Fire up two shells. For each of them:
- Step down into to the root of the Akka distribution.
- Set 'export AKKA_HOME=.
- Run 'sbt console' to start up a REPL (interpreter).
-2. In the first REPL you get execute:
+2. In the first REPL you get execute:
- scala> import sample.chat._
- scala> import se.scalablesolutions.akka.actor.Actor._
- scala> val chatService = actorOf[ChatService].start
-3. In the second REPL you get execute:
+3. In the second REPL you get execute:
- scala> import sample.chat._
- scala> Runner.run
4. See the chat simulation run.
@@ -60,12 +60,12 @@ case class ChatMessage(from: String, message: String) extends Event
/**
* Chat client.
*/
-class ChatClient(val name: String) {
+class ChatClient(val name: String) {
val chat = RemoteClient.actorFor("chat:service", "localhost", 9999)
- def login = chat ! Login(name)
- def logout = chat ! Logout(name)
- def post(message: String) = chat ! ChatMessage(name, name + ": " + message)
+ def login = chat ! Login(name)
+ def logout = chat ! Logout(name)
+ def post(message: String) = chat ! ChatMessage(name, name + ": " + message)
def chatLog: ChatLog = (chat !! GetChatLog(name)).getOrElse(throw new Exception("Couldn't get the chat log from ChatServer"))
}
@@ -75,15 +75,15 @@ class ChatClient(val name: String) {
class Session(user: String, storage: ActorRef) extends Actor {
private val loginTime = System.currentTimeMillis
private var userLog: List[String] = Nil
-
+
log.info("New session for user [%s] has been created at [%s]", user, loginTime)
def receive = {
- case msg @ ChatMessage(from, message) =>
+ case msg @ ChatMessage(from, message) =>
userLog ::= message
storage ! msg
-
- case msg @ GetChatLog(_) =>
+
+ case msg @ GetChatLog(_) =>
storage forward msg
}
}
@@ -97,24 +97,24 @@ trait ChatStorage extends Actor
* Redis-backed chat storage implementation.
*/
class RedisChatStorage extends ChatStorage {
- self.lifeCycle = Some(LifeCycle(Permanent))
+ self.lifeCycle = Some(LifeCycle(Permanent))
val CHAT_LOG = "akka.chat.log"
-
+
private var chatLog = atomic { RedisStorage.getVector(CHAT_LOG) }
log.info("Redis-based chat storage is starting up...")
def receive = {
- case msg @ ChatMessage(from, message) =>
+ case msg @ ChatMessage(from, message) =>
log.debug("New chat message [%s]", message)
atomic { chatLog + message.getBytes("UTF-8") }
- case GetChatLog(_) =>
+ case GetChatLog(_) =>
val messageList = atomic { chatLog.map(bytes => new String(bytes, "UTF-8")).toList }
self.reply(ChatLog(messageList))
}
-
- override def postRestart(reason: Throwable) = chatLog = RedisStorage.getVector(CHAT_LOG)
+
+ override def postRestart(reason: Throwable) = chatLog = RedisStorage.getVector(CHAT_LOG)
}
/**
@@ -122,27 +122,27 @@ class RedisChatStorage extends ChatStorage {
*
* Uses self-type annotation (this: Actor =>) to declare that it needs to be mixed in with an Actor.
*/
-trait SessionManagement { this: Actor =>
-
+trait SessionManagement { this: Actor =>
+
val storage: ActorRef // needs someone to provide the ChatStorage
val sessions = new HashMap[String, ActorRef]
-
+
protected def sessionManagement: Receive = {
- case Login(username) =>
+ case Login(username) =>
log.info("User [%s] has logged in", username)
val session = actorOf(new Session(username, storage))
session.start
sessions += (username -> session)
-
- case Logout(username) =>
+
+ case Logout(username) =>
log.info("User [%s] has logged out", username)
val session = sessions(username)
session.stop
- sessions -= username
- }
-
- protected def shutdownSessions =
- sessions.foreach { case (_, session) => session.stop }
+ sessions -= username
+ }
+
+ protected def shutdownSessions =
+ sessions.foreach { case (_, session) => session.stop }
}
/**
@@ -152,7 +152,7 @@ trait SessionManagement { this: Actor =>
*/
trait ChatManagement { this: Actor =>
val sessions: HashMap[String, ActorRef] // needs someone to provide the Session map
-
+
protected def chatManagement: Receive = {
case msg @ ChatMessage(from, _) => sessions(from) ! msg
case msg @ GetChatLog(from) => sessions(from) forward msg
@@ -172,20 +172,20 @@ trait RedisChatStorageFactory { this: Actor =>
trait ChatServer extends Actor {
self.faultHandler = Some(OneForOneStrategy(5, 5000))
self.trapExit = List(classOf[Exception])
-
+
val storage: ActorRef
log.info("Chat server is starting up...")
// actor message handler
def receive = sessionManagement orElse chatManagement
-
+
// abstract methods to be defined somewhere else
protected def chatManagement: Receive
- protected def sessionManagement: Receive
+ protected def sessionManagement: Receive
protected def shutdownSessions: Unit
- override def shutdown = {
+ override def shutdown = {
log.info("Chat server is shutting down...")
shutdownSessions
self.unlink(storage)
@@ -200,10 +200,10 @@ trait ChatServer extends Actor {
* val chatService = Actor.actorOf[ChatService].start
*
*/
-class ChatService extends
- ChatServer with
- SessionManagement with
- ChatManagement with
+class ChatService extends
+ ChatServer with
+ SessionManagement with
+ ChatManagement with
RedisChatStorageFactory {
override def init = {
RemoteNode.start("localhost", 9999)
@@ -217,7 +217,7 @@ class ChatService extends
object Runner {
def run = {
val client = new ChatClient("jonas")
-
+
client.login
client.post("Hi there")
@@ -228,4 +228,4 @@ object Runner {
client.logout
}
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala
index f8e4f15bd9..0f4a0e9020 100644
--- a/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala
+++ b/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -23,7 +23,7 @@ class Boot extends Logging {
def boot {
// where to search snippet
LiftRules.addToPackages("sample.lift")
-
+
LiftRules.httpAuthProtectedResource.prepend {
case (Req("liftcount" :: Nil, _, _)) => Full(AuthRole("admin"))
}
@@ -35,9 +35,9 @@ class Boot extends Logging {
true
}
}
-
+
LiftRules.passNotFoundToChain = true
-
+
val factory = SupervisorFactory(
SupervisorConfig(
RestartStrategy(OneForOne, 3, 100, List(classOf[Exception])),
@@ -49,7 +49,7 @@ class Boot extends Logging {
LifeCycle(Permanent)) ::
Nil))
factory.newInstance.start
-
+
// Build SiteMap
// val entries = Menu(Loc("Home", List("index"), "Home")) :: Nil
// LiftRules.setSiteMap(SiteMap(entries:_*))
diff --git a/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala b/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala
index a5aa1698e8..43296bc1f4 100644
--- a/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala
+++ b/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala
@@ -13,4 +13,4 @@ object LiftConsole {
exit(0)
}
}
-*/
\ No newline at end of file
+*/
diff --git a/akka-samples/akka-sample-pubsub/src/main/scala/RedisPubSub.scala b/akka-samples/akka-sample-pubsub/src/main/scala/RedisPubSub.scala
index 44366d31a4..ca3148aab7 100644
--- a/akka-samples/akka-sample-pubsub/src/main/scala/RedisPubSub.scala
+++ b/akka-samples/akka-sample-pubsub/src/main/scala/RedisPubSub.scala
@@ -10,7 +10,7 @@ import se.scalablesolutions.akka.actor.Actor._
/**
* Sample Akka application for Redis PubSub
- *
+ *
* Prerequisite: Need Redis Server running (the version that supports pubsub)
*
* 1. Download redis from http://github.com/antirez/redis
@@ -65,7 +65,7 @@ object Sub {
val r = new RedisClient("localhost", 6379)
val s = actorOf(new Subscriber(r))
s.start
- s ! Register(callback)
+ s ! Register(callback)
def sub(channels: String*) = {
s ! Subscribe(channels.toArray)
@@ -78,29 +78,29 @@ object Sub {
def callback(pubsub: PubSubMessage) = pubsub match {
case S(channel, no) => println("subscribed to " + channel + " and count = " + no)
case U(channel, no) => println("unsubscribed from " + channel + " and count = " + no)
- case M(channel, msg) =>
+ case M(channel, msg) =>
msg match {
// exit will unsubscribe from all channels and stop subscription service
- case "exit" =>
+ case "exit" =>
println("unsubscribe all ..")
r.unsubscribe
// message "+x" will subscribe to channel x
- case x if x startsWith "+" =>
+ case x if x startsWith "+" =>
val s: Seq[Char] = x
s match {
case Seq('+', rest @ _*) => r.subscribe(rest.toString){ m => }
}
// message "-x" will unsubscribe from channel x
- case x if x startsWith "-" =>
+ case x if x startsWith "-" =>
val s: Seq[Char] = x
s match {
case Seq('-', rest @ _*) => r.unsubscribe(rest.toString)
}
// other message receive
- case x =>
+ case x =>
println("received message on channel " + channel + " as : " + x)
}
}
diff --git a/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala b/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala
index 9070d4a7f8..24f81872f7 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala
@@ -11,7 +11,7 @@ import se.scalablesolutions.akka.util.Logging
class RemoteHelloWorldActor extends RemoteActor("localhost", 9999) {
def receive = {
- case "Hello" =>
+ case "Hello" =>
log.info("Received 'Hello'")
self.reply("World")
}
@@ -27,7 +27,7 @@ object ClientManagedRemoteActorServer extends Logging {
}
object ClientManagedRemoteActorClient extends Logging {
-
+
def run = {
val actor = actorOf[RemoteHelloWorldActor].start
log.info("Remote actor created, moved to the server")
diff --git a/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala b/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala
index 87253af24b..2671d9e25e 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala
@@ -11,7 +11,7 @@ import se.scalablesolutions.akka.util.Logging
class HelloWorldActor extends Actor {
def receive = {
- case "Hello" =>
+ case "Hello" =>
log.info("Received 'Hello'")
self.reply("World")
}
@@ -30,7 +30,7 @@ object ServerManagedRemoteActorServer extends Logging {
}
object ServerManagedRemoteActorClient extends Logging {
-
+
def run = {
val actor = RemoteClient.actorFor("hello-service", "localhost", 9999)
log.info("Remote client created")
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/Boot.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/Boot.java
index 2f97b4ce92..60eb4f11af 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/Boot.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/Boot.java
@@ -1,13 +1,16 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB
+ */
+
package sample.rest.java;
import se.scalablesolutions.akka.config.ActiveObjectConfigurator;
import static se.scalablesolutions.akka.config.JavaConfig.*;
public class Boot {
- final private ActiveObjectConfigurator manager = new ActiveObjectConfigurator();
-
- public Boot() throws Exception {
- manager.configure(
+ public final static ActiveObjectConfigurator configurator = new ActiveObjectConfigurator();
+ static {
+ configurator.configure(
new RestartStrategy(new OneForOne(), 3, 5000, new Class[]{Exception.class}),
new Component[] {
new Component(
@@ -19,5 +22,5 @@ public class Boot {
new LifeCycle(new Permanent()),
1000)
}).supervise();
- }
+ }
}
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java
index 82d4bc5ea5..1108fcdb63 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java
@@ -4,10 +4,6 @@
package sample.rest.java;
-import javax.ws.rs.Path;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
import se.scalablesolutions.akka.actor.annotation.prerestart;
import se.scalablesolutions.akka.actor.annotation.postrestart;
@@ -16,14 +12,6 @@ import se.scalablesolutions.akka.persistence.cassandra.CassandraStorage;
import java.nio.ByteBuffer;
-/**
- * Try service out by invoking (multiple times):
- *
- * curl http://localhost:9998/persistentjavacount
- *
- * Or browse to the URL from a web browser.
- */
-@Path("/persistentjavacount")
@transactionrequired
public class PersistentSimpleService {
private String KEY = "COUNTER";
@@ -31,8 +19,6 @@ public class PersistentSimpleService {
private boolean hasStartedTicking = false;
private PersistentMap storage;
- @GET
- @Produces({"application/html"})
public String count() {
if (storage == null) storage = CassandraStorage.newMap();
if (!hasStartedTicking) {
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceRest.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceRest.java
new file mode 100644
index 0000000000..dc2d2d5aee
--- /dev/null
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceRest.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB
+ */
+
+package sample.rest.java;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+
+/**
+ * Try service out by invoking (multiple times):
+ *
+ * curl http://localhost:9998/persistentjavacount
+ *
+ * Or browse to the URL from a web browser.
+ */
+@Path("/persistentjavacount")
+public class PersistentSimpleServiceRest {
+ private PersistentSimpleService service = (PersistentSimpleService) Boot.configurator.getInstance(PersistentSimpleService.class);
+
+ @GET
+ @Produces({"application/json"})
+ public String count() {
+ return service.count();
+ }
+}
\ No newline at end of file
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java
index 260df02a3e..44d23e873c 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java
@@ -4,10 +4,6 @@
package sample.rest.java;
-import javax.ws.rs.Path;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-
import se.scalablesolutions.akka.actor.ActiveObject;
import se.scalablesolutions.akka.actor.ActiveObjectContext;
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
@@ -16,14 +12,6 @@ import se.scalablesolutions.akka.actor.annotation.postrestart;
import se.scalablesolutions.akka.stm.TransactionalState;
import se.scalablesolutions.akka.stm.TransactionalMap;
-/**
- * Try service out by invoking (multiple times):
- *
- * curl http://localhost:9998/javacount
- *
- * Or browse to the URL from a web browser.
- */
-@Path("/javacount")
@transactionrequired
public class SimpleService {
private String KEY = "COUNTER";
@@ -32,8 +20,6 @@ public class SimpleService {
private TransactionalMap storage;
private Receiver receiver = ActiveObject.newInstance(Receiver.class);
- @GET
- @Produces({"application/json"})
public String count() {
if (storage == null) storage = TransactionalState.newMap();
if (!hasStartedTicking) {
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceRest.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceRest.java
new file mode 100644
index 0000000000..ed048f25dc
--- /dev/null
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceRest.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB
+ */
+
+package sample.rest.java;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+
+/**
+ * Try service out by invoking (multiple times):
+ *
+ * curl http://localhost:9998/javacount
+ *
+ * Or browse to the URL from a web browser.
+ */
+@Path("/javacount")
+public class SimpleServiceRest {
+ private SimpleService service = (SimpleService) Boot.configurator.getInstance(SimpleService.class);
+
+ @GET
+ @Produces({"application/json"})
+ public String count() {
+ return service.count();
+ }
+}
\ No newline at end of file
diff --git a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
index e8f3576e9f..f31e10861d 100644
--- a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
+++ b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
@@ -51,14 +51,15 @@ class SimpleService {
@GET
@Produces(Array("text/html"))
def count = {
- //Fetch the first actor of type SimpleServiceActor
- //Send it the "Tick" message and expect a NdeSeq back
- val result = for{a <- actorsFor(classOf[SimpleServiceActor]).headOption
- r <- a.!![NodeSeq]("Tick")} yield r
- //Return either the resulting NodeSeq or a default one
- result getOrElse Error in counter
+ //Fetch the first actor of type SimpleServiceActor
+ //Send it the "Tick" message and expect a NodeSeq back
+ val result = for{a <- actorsFor(classOf[SimpleServiceActor]).headOption
+ r <- a.!![NodeSeq]("Tick")} yield r
+ //Return either the resulting NodeSeq or a default one
+ result getOrElse Error in counter
}
}
+
class SimpleServiceActor extends Transactor {
private val KEY = "COUNTER"
private var hasStartedTicking = false
@@ -105,12 +106,12 @@ class PersistentSimpleService {
@GET
@Produces(Array("text/html"))
def count = {
- //Fetch the first actor of type PersistentSimpleServiceActor
- //Send it the "Tick" message and expect a NdeSeq back
- val result = for{a <- actorsFor(classOf[PersistentSimpleServiceActor]).headOption
- r <- a.!![NodeSeq]("Tick")} yield r
- //Return either the resulting NodeSeq or a default one
- result getOrElse Error in counter
+ //Fetch the first actor of type PersistentSimpleServiceActor
+ //Send it the "Tick" message and expect a NodeSeq back
+ val result = for{a <- actorsFor(classOf[PersistentSimpleServiceActor]).headOption
+ r <- a.!![NodeSeq]("Tick")} yield r
+ //Return either the resulting NodeSeq or a default one
+ result getOrElse Error in counter
}
}
@@ -147,18 +148,18 @@ class Chat {
@Consumes(Array("application/x-www-form-urlencoded"))
@Produces(Array("text/html"))
def publishMessage(form: MultivaluedMap[String, String]) = {
- val msg = ChatMsg(form.getFirst("name"),form.getFirst("action"),form.getFirst("message"))
+ val msg = ChatMsg(form.getFirst("name"),form.getFirst("action"),form.getFirst("message"))
//Fetch the first actor of type ChatActor
- //Send it the "Tick" message and expect a NdeSeq back
- val result = for{a <- actorsFor(classOf[ChatActor]).headOption
- r <- a.!} yield r
- //Return either the resulting String or a default one
- result getOrElse "System__error"
+ //Send it the "Tick" message and expect a NodeSeq back
+ val result = for{a <- actorsFor(classOf[ChatActor]).headOption
+ r <- a.!} yield r
+ //Return either the resulting String or a default one
+ result getOrElse "System__error"
}
}
object ChatActor {
- case class ChatMsg(val who: String, val what: String, val msg: String)
+ case class ChatMsg(val who: String, val what: String, val msg: String)
}
class ChatActor extends Actor with Logging {
diff --git a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
index 4fd5a8a63d..e6892c7b62 100644
--- a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
+++ b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
@@ -120,12 +120,12 @@ class SecureTickService {
def paranoiaTick = tick
def tick = {
- //Fetch the first actor of type PersistentSimpleServiceActor
- //Send it the "Tick" message and expect a NdeSeq back
- val result = for{a <- actorsFor(classOf[SecureTickActor]).headOption
- r <- a.!![Integer]("Tick")} yield r
- //Return either the resulting NodeSeq or a default one
- result match {
+ //Fetch the first actor of type PersistentSimpleServiceActor
+ //Send it the "Tick" message and expect a NdeSeq back
+ val result = for{a <- actorsFor(classOf[SecureTickActor]).headOption
+ r <- a.!![Integer]("Tick")} yield r
+ //Return either the resulting NodeSeq or a default one
+ result match {
case (Some(counter)) => (Tick: {counter})
case _ => (Error in counter)
}
@@ -147,4 +147,4 @@ class SecureTickActor extends Transactor with Logging {
self.reply(new Integer(0))
}
}
-}
\ No newline at end of file
+}
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 83c35d143f..25aa0998a3 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -1,10 +1,10 @@
####################
# Akka Config File #
####################
-
+
# This file has all the default settings, so all these could be removed with no visible effect.
# Modify as needed.
-
+
filename = "./logs/akka.log"
roll = "daily" # Options: never, hourly, daily, sunday/monday/...
@@ -13,25 +13,22 @@
# syslog_host = ""
# syslog_server_name = ""
-
+
version = "0.9"
-
+
# FQN (Fully Qualified Name) to the class doing initial active object/actor
# supervisor bootstrap, should be defined in default constructor
boot = ["sample.camel.Boot",
- "sample.rest.java.Boot",
+ "sample.rest.java.Boot",
"sample.rest.scala.Boot",
"sample.security.Boot"]
- timeout = 5000 # default timeout for future based invocations
- serialize-messages = off # does a deep clone of (non-primitive) messages to ensure immutability
-
-
-
+ timeout = 5000 # default timeout for future based invocations
+ serialize-messages = off # does a deep clone of (non-primitive) messages to ensure immutability
throughput = 5 # default throughput for ExecutorBasedEventDrivenDispatcher
-
+
service = on
@@ -41,10 +38,10 @@
jta-aware = off # 'on' means that if there JTA Transaction Manager available then the STM will
# begin (or join), commit or rollback the JTA transaction. Default is 'off'.
-
+
- provider = "from-jndi" # Options: "from-jndi" (means that Akka will try to detect a TransactionManager in the JNDI)
- # "atomikos" (means that Akka will use the Atomikos based JTA impl in 'akka-jta',
+ provider = "from-jndi" # Options: "from-jndi" (means that Akka will try to detect a TransactionManager in the JNDI)
+ # "atomikos" (means that Akka will use the Atomikos based JTA impl in 'akka-jta',
# e.g. you need the akka-jta JARs on classpath).
timeout = 60000
@@ -56,7 +53,7 @@
filters = ["se.scalablesolutions.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
authenticator = "sample.security.BasicAuthenticationService" # The authentication service to use. Need to be overridden (uses sample now)
-
+
#IF you are using a KerberosAuthenticationActor
#
# servicePrincipal = "HTTP/localhost@EXAMPLE.COM"
@@ -75,8 +72,8 @@
name = "default" # The name of the cluster
serializer = "se.scalablesolutions.akka.serialization.Serializer$Java$" # FQN of the serializer class
-
-
+
+
service = on
hostname = "localhost"
port = 9999
@@ -88,14 +85,14 @@
read-timeout = 10000 # in millis (10 sec default)
-
+
hostname = "127.0.0.1" # IP address or hostname of one of the Cassandra cluster's seeds
port = 9160
consistency-level = "QUORUM" # Options: ZERO, ONE, QUORUM, DCQUORUM, DCQUORUMSYNC, ALL, ANY
-
+
hostname = "127.0.0.1" # IP address or hostname of the MongoDB DB instance
port = 27017
diff --git a/config/log4j.properties b/config/log4j.properties
index 903ccd16af..76d3661163 100755
--- a/config/log4j.properties
+++ b/config/log4j.properties
@@ -1,20 +1,20 @@
-# for production, you should probably set the root to INFO
-# and the pattern to %c instead of %l. (%l is slower.)
-
-# output messages into a rolling log file as well as stdout
-log4j.rootLogger=INFO,stdout,R
-
-# stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
-
-# rolling log file ("system.log
-log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.R.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
-
-# Edit the next line to point to your logs directory
-log4j.appender.R.File=./logs/akka.log
-
-log4j.logger.org.atmosphere=DEBUG
+# for production, you should probably set the root to INFO
+# and the pattern to %c instead of %l. (%l is slower.)
+
+# output messages into a rolling log file as well as stdout
+log4j.rootLogger=INFO,stdout,R
+
+# stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
+
+# rolling log file ("system.log
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.R.DatePattern='.'yyyy-MM-dd-HH
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
+
+# Edit the next line to point to your logs directory
+log4j.appender.R.File=./logs/akka.log
+
+log4j.logger.org.atmosphere=DEBUG
diff --git a/config/storage-conf.xml b/config/storage-conf.xml
index 06ba8007a2..2647fdcd0e 100644
--- a/config/storage-conf.xml
+++ b/config/storage-conf.xml
@@ -21,15 +21,15 @@
-
akka
-
-
-
org.apache.cassandra.locator.EndPointSnitch
-
+
@@ -158,7 +158,7 @@
~ Authenticator: any IAuthenticator may be used, including your own as long
~ as it is on the classpath. Out of the box, Cassandra provides
~ org.apache.cassandra.auth.AllowAllAuthenticator and,
- ~ org.apache.cassandra.auth.SimpleAuthenticator
+ ~ org.apache.cassandra.auth.SimpleAuthenticator
~ (SimpleAuthenticator uses access.properties and passwd.properties by
~ default).
~
@@ -188,7 +188,7 @@
~ are sent to the node with the "closest" token, so distributing your
~ tokens equally along the key distribution space will spread keys
~ evenly across your cluster.) This setting is only checked the first
- ~ time a node is started.
+ ~ time a node is started.
~ This can also be useful with RandomPartitioner to force equal spacing
~ of tokens around the hash space, especially for clusters with a small
@@ -227,9 +227,9 @@
-
9160
-
false
@@ -285,16 +285,16 @@
64
@@ -314,7 +314,7 @@
-
+