diff --git a/akka-amqp/src/main/scala/AMQP.scala b/akka-amqp/src/main/scala/AMQP.scala
index a45472ea12..faf271059c 100644
--- a/akka-amqp/src/main/scala/AMQP.scala
+++ b/akka-amqp/src/main/scala/AMQP.scala
@@ -102,6 +102,13 @@ object ExampleAMQPSession {
val PORT = 8787
val SERIALIZER = Serializer.Java
+ val messageConsumer = new Actor() {
+ def receive: PartialFunction[Any, Unit] = {
+ case Message(payload) => println("Received message: " + payload)
+ }
+ }
+ messageConsumer.start
+
val endpoint = new Endpoint(new ConnectionFactory(CONFIG), HOSTNAME, PORT) {
override def init(channel: Channel) = {
channel.exchangeDeclare(EXCHANGE, "direct")
@@ -117,13 +124,6 @@ object ExampleAMQPSession {
}
endpoint.start
- val messageConsumer = new Actor() {
- def receive: PartialFunction[Any, Unit] = {
- case Message(payload) => println("Received message: " + payload)
- }
- }
- messageConsumer.start
-
endpoint ! MessageConsumer(messageConsumer)
val client = new Client(new ConnectionFactory(CONFIG), HOSTNAME, PORT, EXCHANGE, ROUTING_KEY, SERIALIZER)
diff --git a/akka.ipr b/akka.ipr
index b5b5f4d0bd..175d776ea3 100644
--- a/akka.ipr
+++ b/akka.ipr
@@ -1648,116 +1648,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/akka.iws b/akka.iws
index 40e04b3073..9fc47e8b25 100644
--- a/akka.iws
+++ b/akka.iws
@@ -2,8 +2,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -86,6 +79,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103,8 +168,14 @@
@@ -135,6 +206,230 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
@@ -449,6 +730,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fun-test-java/akka-fun-test-java.iml b/fun-test-java/akka-fun-test-java.iml
index 2a4b679a7a..e09beb736b 100644
--- a/fun-test-java/akka-fun-test-java.iml
+++ b/fun-test-java/akka-fun-test-java.iml
@@ -28,6 +28,11 @@
+ * curl http://localhost:9998/persistentjavacount
+ *
+ * Or browse to the URL from a web browser.
+ */
+@Path("/persistentjavacount")
+@transactionrequired
+public class PersistentSimpleService {
+ private String KEY = "COUNTER";
+
+ private boolean hasStartedTicking = false;
+ private TransactionalState factory = new TransactionalState();
+ private TransactionalMap storage = factory.newPersistentMap(new CassandraStorageConfig());
+
+ @GET
+ @Produces({"application/html"})
+ public String count() {
+ if (!hasStartedTicking) {
+ storage.put(KEY, 0);
+ hasStartedTicking = true;
+ return "Tick: 0\n";
+ } else {
+ int counter = (Integer)storage.get(KEY).get() + 1;
+ storage.put(KEY, counter);
+ return "Tick: " + counter + "\n";
+ }
+ }
+
+ @prerestart
+ public void preRestart() {
+ System.out.println("Prepare for restart by supervisor");
+ }
+
+ @postrestart
+ public void postRestart() {
+ System.out.println("Reinitialize after restart by supervisor");
+ }
+}
\ No newline at end of file
diff --git a/samples-java/src/main/java/sample/java/SimpleService.java b/samples-java/src/main/java/sample/java/SimpleService.java
index 212ca61027..604d3d301d 100644
--- a/samples-java/src/main/java/sample/java/SimpleService.java
+++ b/samples-java/src/main/java/sample/java/SimpleService.java
@@ -29,7 +29,7 @@ public class SimpleService {
private boolean hasStartedTicking = false;
private TransactionalState factory = new TransactionalState();
- private TransactionalMap storage = factory.newPersistentMap(new CassandraStorageConfig());
+ private TransactionalMap storage = factory.newInMemoryMap();
@GET
@Produces({"application/json"})
diff --git a/samples-lift/akka-samples-lift.iml b/samples-lift/akka-samples-lift.iml
index bcdecef91a..5b3e6a796f 100644
--- a/samples-lift/akka-samples-lift.iml
+++ b/samples-lift/akka-samples-lift.iml
@@ -35,6 +35,11 @@
Error in counter )
+
+ override def receive: PartialFunction[Any, Unit] = {
+ case Tick => if (hasStartedTicking) {
+ val counter = storage.get(KEY).get.asInstanceOf[Integer].intValue
+ storage.put(KEY, new Integer(counter + 1))
+ reply(Tick: {counter + 1} )
+ } else {
+ storage.put(KEY, new Integer(0))
+ hasStartedTicking = true
+ reply(Tick: 0 )
+ }
+ }
+}
+
+/**
+ * Try service out by invoking (multiple times):
+ *
+ * curl http://localhost:9998/persistentliftcount
+ *
+ * Or browse to the URL from a web browser.
+ */
+@Path("/persistentliftcount")
+class PersistentSimpleService extends Actor {
+ makeTransactionRequired
+
case object Tick
private val KEY = "COUNTER";
private var hasStartedTicking = false;
diff --git a/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala
index 0cf98c8af4..1df1143d38 100644
--- a/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala
+++ b/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -40,11 +40,13 @@ class Boot {
override def getSupervisorConfig: SupervisorConfig = {
SupervisorConfig(
RestartStrategy(OneForOne, 3, 100),
- Supervise(
- new SimpleService,
- LifeCycle(Permanent, 100)
- )
- :: Nil)
+ Supervise(
+ new SimpleService,
+ LifeCycle(Permanent, 100)) ::
+ Supervise(
+ new SimpleService,
+ LifeCycle(Permanent, 100)) ::
+ Nil)
}
}
val supervisor = factory.newSupervisor
diff --git a/samples-scala/akka-samples-scala.iml b/samples-scala/akka-samples-scala.iml
index cea303267e..f88fe93371 100644
--- a/samples-scala/akka-samples-scala.iml
+++ b/samples-scala/akka-samples-scala.iml
@@ -33,6 +33,11 @@
Error in counter )
+
+ override def receive: PartialFunction[Any, Unit] = {
+ case Tick => if (hasStartedTicking) {
+ val counter = storage.get(KEY).get.asInstanceOf[Integer].intValue
+ storage.put(KEY, new Integer(counter + 1))
+ reply(Tick:{counter + 1} )
+ } else {
+ storage.put(KEY, new Integer(0))
+ hasStartedTicking = true
+ reply(Tick: 0 )
+ }
+ }
+}
+
+/**
+ * Try service out by invoking (multiple times):
+ *
+ * curl http://localhost:9998/persistentscalacount
+ *
+ * Or browse to the URL from a web browser.
+ */
+@Path("/persistentscalacount")
+class PersistentSimpleService extends Actor {
+ makeTransactionRequired
+
case object Tick
private val KEY = "COUNTER";
private var hasStartedTicking = false;