From 46cff1a0a13b580025b9bb47c515202d52884d61 Mon Sep 17 00:00:00 2001 From: jboner Date: Fri, 4 Sep 2009 09:47:32 +0200 Subject: [PATCH] adapted fun tests to new module layout --- akka-amqp/src/main/scala/ExampleSession.scala | 2 +- .../ActiveObjectGuiceConfiguratorTest.java | 11 +++++----- .../akka/api/InMemNestedStateTest.java | 11 +++++----- .../akka/api/InMemStateful.java | 8 +++---- .../akka/api/InMemStatefulNested.java | 8 +++---- .../akka/api/InMemoryStateTest.java | 11 +++++----- .../akka/api/PersistenceManager.java | 2 +- .../akka/api/PersistentClasher.java | 4 ++-- .../akka/api/PersistentNestedStateTest.java | 8 +++---- .../akka/api/PersistentStateTest.java | 8 +++---- .../akka/api/PersistentStateful.java | 10 ++++----- .../akka/api/PersistentStatefulNested.java | 10 ++++----- .../akka/api/RemoteInMemoryStateTest.java | 10 +++++---- .../akka/api/RemotePersistentStateTest.java | 8 +++---- .../scalablesolutions/akka/api/RestTest.java | 6 ++--- akka-kernel/pom.xml | 1 - .../src/main/webapp/WEB-INF/web.xml | 22 +++++++++++++++++++ changes.xml | 2 +- 18 files changed, 84 insertions(+), 58 deletions(-) create mode 100755 akka-samples-lift/src/main/webapp/WEB-INF/web.xml diff --git a/akka-amqp/src/main/scala/ExampleSession.scala b/akka-amqp/src/main/scala/ExampleSession.scala index 52ea00e671..b3ec9a22c1 100644 --- a/akka-amqp/src/main/scala/ExampleSession.scala +++ b/akka-amqp/src/main/scala/ExampleSession.scala @@ -6,7 +6,7 @@ package se.scalablesolutions.akka.amqp import akka.serialization.Serializer import com.rabbitmq.client.ConnectionParameters -import kernel.actor.Actor +import actor.Actor object ExampleSession { import AMQP._ diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java index fdc2a48c98..46538d0c48 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java @@ -9,18 +9,19 @@ import com.google.inject.Scopes; import junit.framework.TestCase; -import se.scalablesolutions.akka.kernel.reactor.EventBasedThreadPoolDispatcher; -import static se.scalablesolutions.akka.kernel.config.JavaConfig.*; +import se.scalablesolutions.akka.Config; +import se.scalablesolutions.akka.reactor.EventBasedThreadPoolDispatcher; +import static se.scalablesolutions.akka.config.JavaConfig.*; import java.util.concurrent.ThreadPoolExecutor; public class ActiveObjectGuiceConfiguratorTest extends TestCase { static String messageLog = ""; - final private se.scalablesolutions.akka.kernel.config.ActiveObjectManager conf = new se.scalablesolutions.akka.kernel.config.ActiveObjectManager(); + final private se.scalablesolutions.akka.config.ActiveObjectManager conf = new se.scalablesolutions.akka.config.ActiveObjectManager(); protected void setUp() { - se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config(); + Config.config(); EventBasedThreadPoolDispatcher dispatcher = new EventBasedThreadPoolDispatcher("name"); dispatcher .withNewThreadPoolWithBoundedBlockingQueue(100) @@ -103,7 +104,7 @@ public class ActiveObjectGuiceConfiguratorTest extends TestCase { try { foo.longRunning(); fail("exception should have been thrown"); - } catch (se.scalablesolutions.akka.kernel.reactor.FutureTimeoutException e) { + } catch (se.scalablesolutions.akka.reactor.FutureTimeoutException e) { } } diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java index 965637ca73..91f097036a 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java @@ -4,10 +4,11 @@ package se.scalablesolutions.akka.api; -import se.scalablesolutions.akka.kernel.config.*; -import static se.scalablesolutions.akka.kernel.config.JavaConfig.*; -import se.scalablesolutions.akka.kernel.actor.*; -import se.scalablesolutions.akka.kernel.Kernel; +import se.scalablesolutions.akka.Config; +import se.scalablesolutions.akka.config.*; +import static se.scalablesolutions.akka.config.JavaConfig.*; +import se.scalablesolutions.akka.actor.*; +import se.scalablesolutions.akka.Kernel; import junit.framework.TestCase; public class InMemNestedStateTest extends TestCase { @@ -26,7 +27,7 @@ public class InMemNestedStateTest extends TestCase { new Component(InMemFailer.class, new LifeCycle(new Permanent(), 1000), 1000) //new Component("inmem-clasher", InMemClasher.class, InMemClasherImpl.class, new LifeCycle(new Permanent(), 1000), 100000) }).inject().supervise(); - se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config(); + Config.config(); } protected void tearDown() { diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java index 2ee03a893e..5f836942ba 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java @@ -3,14 +3,14 @@ package se.scalablesolutions.akka.api; import se.scalablesolutions.akka.annotation.transactionrequired; import se.scalablesolutions.akka.annotation.prerestart; import se.scalablesolutions.akka.annotation.postrestart; -import se.scalablesolutions.akka.kernel.state.*; +import se.scalablesolutions.akka.state.*; @transactionrequired public class InMemStateful { private TransactionalState factory = new TransactionalState(); - private TransactionalMap mapState = factory.newInMemoryMap(); - private TransactionalVector vectorState = factory.newInMemoryVector(); - private TransactionalRef refState = factory.newInMemoryRef(); + private TransactionalMap mapState = factory.newMap(); + private TransactionalVector vectorState = factory.newVector(); + private TransactionalRef refState = factory.newRef(); public String getMapState(String key) { return (String)mapState.get(key).get(); diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java index 0f6921f28b..ba13be243c 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java @@ -1,14 +1,14 @@ package se.scalablesolutions.akka.api; import se.scalablesolutions.akka.annotation.transactionrequired; -import se.scalablesolutions.akka.kernel.state.*; +import se.scalablesolutions.akka.state.*; @transactionrequired public class InMemStatefulNested { private TransactionalState factory = new TransactionalState(); - private TransactionalMap mapState = factory.newInMemoryMap(); - private TransactionalVector vectorState = factory.newInMemoryVector(); - private TransactionalRef refState = factory.newInMemoryRef(); + private TransactionalMap mapState = factory.newMap(); + private TransactionalVector vectorState = factory.newVector(); + private TransactionalRef refState = factory.newRef(); public String getMapState(String key) { diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java index 866070a47e..ff1c789e1d 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java @@ -6,10 +6,11 @@ package se.scalablesolutions.akka.api; import junit.framework.TestCase; -import se.scalablesolutions.akka.kernel.config.*; -import static se.scalablesolutions.akka.kernel.config.JavaConfig.*; -import se.scalablesolutions.akka.kernel.actor.*; -import se.scalablesolutions.akka.kernel.Kernel; +import se.scalablesolutions.akka.Config; +import se.scalablesolutions.akka.config.*; +import static se.scalablesolutions.akka.config.JavaConfig.*; +import se.scalablesolutions.akka.actor.*; +import se.scalablesolutions.akka.Kernel; public class InMemoryStateTest extends TestCase { static String messageLog = ""; @@ -18,7 +19,7 @@ public class InMemoryStateTest extends TestCase { protected void setUp() { - se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config(); + Config.config(); conf.configure( new RestartStrategy(new AllForOne(), 3, 5000), new Component[]{ diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java index b059c81657..49cc8c0d0a 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java @@ -4,7 +4,7 @@ public class PersistenceManager { private static volatile boolean isRunning = false; public static void init() { if (!isRunning) { - se.scalablesolutions.akka.kernel.Kernel.startRemoteService(); + se.scalablesolutions.akka.Kernel.startRemoteService(); isRunning = true; } } diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java index cf6cce7e68..1787548806 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java @@ -1,7 +1,7 @@ package se.scalablesolutions.akka.api; -import se.scalablesolutions.akka.kernel.state.TransactionalMap; -import se.scalablesolutions.akka.kernel.state.CassandraPersistentTransactionalMap; +import se.scalablesolutions.akka.state.TransactionalMap; +import se.scalablesolutions.akka.state.CassandraPersistentTransactionalMap; public class PersistentClasher { private TransactionalMap state = new CassandraPersistentTransactionalMap(); diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java index 04b6d47673..03e06fb7b0 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java @@ -4,10 +4,10 @@ package se.scalablesolutions.akka.api; -import se.scalablesolutions.akka.kernel.config.*; -import static se.scalablesolutions.akka.kernel.config.JavaConfig.*; -import se.scalablesolutions.akka.kernel.actor.*; -import se.scalablesolutions.akka.kernel.Kernel; +import se.scalablesolutions.akka.config.*; +import static se.scalablesolutions.akka.config.JavaConfig.*; +import se.scalablesolutions.akka.actor.*; + import se.scalablesolutions.akka.Kernel; import junit.framework.TestCase; diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java index 1145a68389..98b6b0d892 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java @@ -4,10 +4,10 @@ package se.scalablesolutions.akka.api; -import se.scalablesolutions.akka.kernel.config.*; -import static se.scalablesolutions.akka.kernel.config.JavaConfig.*; -import se.scalablesolutions.akka.kernel.actor.*; -import se.scalablesolutions.akka.kernel.Kernel; +import se.scalablesolutions.akka.config.*; +import static se.scalablesolutions.akka.config.JavaConfig.*; +import se.scalablesolutions.akka.actor.*; +import se.scalablesolutions.akka.Kernel; import junit.framework.TestCase; diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java index 7561099270..3acf773644 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java @@ -1,14 +1,14 @@ package se.scalablesolutions.akka.api; import se.scalablesolutions.akka.annotation.transactionrequired; -import se.scalablesolutions.akka.kernel.state.*; +import se.scalablesolutions.akka.state.*; @transactionrequired public class PersistentStateful { - private TransactionalState factory = new TransactionalState(); - private TransactionalMap mapState = factory.newPersistentMap(new CassandraStorageConfig()); - private TransactionalVector vectorState = factory.newPersistentVector(new CassandraStorageConfig());; - private TransactionalRef refState = factory.newPersistentRef(new CassandraStorageConfig()); + private PersistentState factory = new PersistentState(); + private TransactionalMap mapState = factory.newMap(new CassandraStorageConfig()); + private TransactionalVector vectorState = factory.newVector(new CassandraStorageConfig());; + private TransactionalRef refState = factory.newRef(new CassandraStorageConfig()); public String getMapState(String key) { diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java index ac46efb051..6f26427118 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java @@ -1,14 +1,14 @@ package se.scalablesolutions.akka.api; import se.scalablesolutions.akka.annotation.transactionrequired; -import se.scalablesolutions.akka.kernel.state.*; +import se.scalablesolutions.akka.state.*; @transactionrequired public class PersistentStatefulNested { - private TransactionalState factory = new TransactionalState(); - private TransactionalMap mapState = factory.newPersistentMap(new CassandraStorageConfig()); - private TransactionalVector vectorState = factory.newPersistentVector(new CassandraStorageConfig());; - private TransactionalRef refState = factory.newPersistentRef(new CassandraStorageConfig()); + private PersistentState factory = new PersistentState(); + private TransactionalMap mapState = factory.newMap(new CassandraStorageConfig()); + private TransactionalVector vectorState = factory.newVector(new CassandraStorageConfig());; + private TransactionalRef refState = factory.newRef(new CassandraStorageConfig()); public String getMapState(String key) { diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java index 5dd75cf826..b663cf7903 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java @@ -4,8 +4,10 @@ package se.scalablesolutions.akka.api; -import se.scalablesolutions.akka.kernel.actor.ActiveObjectFactory; -import se.scalablesolutions.akka.kernel.nio.RemoteServer; +import se.scalablesolutions.akka.Config; +import se.scalablesolutions.akka.actor.ActiveObjectFactory; +import se.scalablesolutions.akka.config.ActiveObjectManager; +import se.scalablesolutions.akka.nio.RemoteServer; import junit.framework.TestCase; public class RemoteInMemoryStateTest extends TestCase { @@ -19,9 +21,9 @@ public class RemoteInMemoryStateTest extends TestCase { } }).start(); try { Thread.currentThread().sleep(1000); } catch (Exception e) {} - se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config(); + Config.config(); } - final private se.scalablesolutions.akka.kernel.config.ActiveObjectManager conf = new se.scalablesolutions.akka.kernel.config.ActiveObjectManager(); + final ActiveObjectManager conf = new ActiveObjectManager(); final private ActiveObjectFactory factory = new ActiveObjectFactory(); protected void tearDown() { diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java index 970a072135..3c4c15dc30 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java @@ -4,10 +4,10 @@ package se.scalablesolutions.akka.api; -import se.scalablesolutions.akka.kernel.config.*; -import static se.scalablesolutions.akka.kernel.config.JavaConfig.*; -import se.scalablesolutions.akka.kernel.actor.*; -import se.scalablesolutions.akka.kernel.Kernel; +import se.scalablesolutions.akka.config.*; +import static se.scalablesolutions.akka.config.JavaConfig.*; +import se.scalablesolutions.akka.actor.*; +import se.scalablesolutions.akka.Kernel; import junit.framework.TestCase; diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java index 7032aa3043..5dbe454b0b 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java @@ -25,8 +25,8 @@ import java.net.URI; import java.util.Map; import java.util.HashMap; -import se.scalablesolutions.akka.kernel.config.*; -import static se.scalablesolutions.akka.kernel.config.JavaConfig.*; +import se.scalablesolutions.akka.config.*; +import static se.scalablesolutions.akka.config.JavaConfig.*; public class RestTest extends TestCase { @@ -67,7 +67,7 @@ public class RestTest extends TestCase { */ private static SelectorThread startJersey() { try { - Servlet servlet = new se.scalablesolutions.akka.kernel.rest.AkkaServlet(); + Servlet servlet = new se.scalablesolutions.akka.rest.AkkaServlet(); ServletAdapter adapter = new ServletAdapter(); adapter.setServletInstance(servlet); adapter.setContextPath(URI.getPath()); diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml index baf38d9c5a..136d94d8ff 100644 --- a/akka-kernel/pom.xml +++ b/akka-kernel/pom.xml @@ -42,7 +42,6 @@ se.scalablesolutions.akka 0.6 - diff --git a/akka-samples-lift/src/main/webapp/WEB-INF/web.xml b/akka-samples-lift/src/main/webapp/WEB-INF/web.xml new file mode 100755 index 0000000000..d474da1ca1 --- /dev/null +++ b/akka-samples-lift/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,22 @@ + + + + + LiftFilter + Lift Filter + The Filter that intercepts lift calls + net.liftweb.http.LiftFilter + + + LiftFilter + /* + + + AkkaServlet + se.scalablesolutions.akka.kernel.rest.AkkaServlet + + + AkkaServlet + /* + + diff --git a/changes.xml b/changes.xml index 5b13aabcba..2c5de6e2dc 100644 --- a/changes.xml +++ b/changes.xml @@ -25,7 +25,7 @@ see http://maven.apache.org/plugins/maven-changes-plugin/usage.html for full gui Support for using Scala XML tags in RESTful Actors (scala-jersey) Support for Comet Actors using Atmosphere AMQP module; abstracted as an Actor - Modularization of distribution into core and submodules + Modularization of distribution into a core and several submodules JSON serialization for Java objects (using Jackson) JSON serialization for Scala objects (using scala-json) Protobuf serialization for Java and Scala objects