diff --git a/LICENSE b/LICENSE index c17d7ab321..70268d9fe2 100755 --- a/LICENSE +++ b/LICENSE @@ -17,4 +17,4 @@ the License. --------------- Licenses for dependency projects can be found here: -[http://wiki.github.com/jboner/akka/licenses] \ No newline at end of file +[http://doc.akkasource.org/licenses] \ No newline at end of file diff --git a/README.textile b/README.textile index 2acfb63e8e..ee2dfb967b 100755 --- a/README.textile +++ b/README.textile @@ -1,6 +1,4 @@ -h1. Akka Transactors - -h2. Distributed Transactional RESTful Persistent Actors +h1. Akka Project h3. "http://akkasource.org":http://akkasource.org @@ -15,25 +13,9 @@ Akka implements a unique hybrid of: * REST (JAX-RS) and Comet bindings. * Monitoring and Management -Akka can be used in two different ways: -* As a library: used by a web app, to be put into ‘WEB-INF/lib’ -* As a kernel: stand-alone kernel, embedding the servlet container - -See the "Use-case and Deployment Scenarios":http://wiki.github.com/jboner/akka/use-case-and-deployment-scenarios for details. - -h1. What's Akka all about? Why should I care? - -If you are new to Akka then I suggest you start with either the: - -* "High Level View":http://wiki.github.com/jboner/akka/modules-the-high-level-view; which is outlining the different modules in Akka. -* "Use-case and Deployment Scenarios":http://wiki.github.com/jboner/akka/use-case-and-deployment-scenarios; outlining how and in which use-case and deployment scenarios can I use Akka? -* "Examples":http://wiki.github.com/jboner/akka/examples; showing how to build a RESTful, transactional, persistent Active Object and Actor. - -After that you can dive into the "Reference Manual":http://wiki.github.com/jboner/akka/akka-reference-manual. - h1. Documentation -Akka has pretty thorough "reference documentation":https://github.com/jboner/akka/wikis. Covering examples, APIs and configuration. +Akka has pretty thorough "reference documentation":http://doc.akkasource.org. Covering examples, APIs and configuration. h1. Distribution diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java index b6753d3580..2e724f0324 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java @@ -8,7 +8,7 @@ public class AllTest extends TestCase { public static Test suite() { TestSuite suite = new TestSuite("All Java tests"); suite.addTestSuite(InMemoryStateTest.class); - suite.addTestSuite(InMemNestedStateTest.class); + //suite.addTestSuite(InMemNestedStateTest.class); suite.addTestSuite(RemoteInMemoryStateTest.class); suite.addTestSuite(ActiveObjectGuiceConfiguratorTest.class); //suite.addTestSuite(PersistentStateTest.class); 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 366403ef46..8a51feed6b 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 @@ -11,7 +11,7 @@ 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 { static String messageLog = ""; @@ -133,3 +133,4 @@ public class InMemNestedStateTest extends TestCase { assertEquals("init", nested.getRefState()); // check that state is == init state } } +*/ \ No newline at end of file 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 b25fcb8546..aa2704685f 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 @@ -93,7 +93,7 @@ public class InMemoryStateTest extends TestCase { } // expected assertEquals("init", stateful.getRefState()); // check that state is == init state } - /* +/* public void testNestedNonTransactionalMethodHangs() { InMemStateful stateful = conf.getInstance(InMemStateful.class); stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init"); // set init state diff --git a/akka-samples-java/pom.xml b/akka-samples-java/pom.xml deleted file mode 100644 index 5f41981ad0..0000000000 --- a/akka-samples-java/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - 4.0.0 - - akka-samples-java - Akka Java Samples Module - - jar - - - akka - se.scalablesolutions.akka - 0.6 - ../pom.xml - - - - - akka-util-java - ${project.groupId} - ${project.version} - - - akka-util - ${project.groupId} - ${project.version} - - - akka-core - ${project.groupId} - ${project.version} - - - akka-rest - ${project.groupId} - ${project.version} - - - ${project.groupId} - akka-persistence-cassandra - ${project.version} - - - akka-kernel - ${project.groupId} - ${project.version} - - - javax.ws.rs - jsr311-api - 1.0 - - - - - src/main/java - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - **/* - - - - - maven-antrun-plugin - - - install - - - - - - - run - - - - - - - diff --git a/akka-samples-lift/pom.xml b/akka-samples-lift/pom.xml deleted file mode 100644 index 938f2b14fd..0000000000 --- a/akka-samples-lift/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - 4.0.0 - - akka-samples-lift - Akka Lift Samples Module - - war - - - akka - se.scalablesolutions.akka - 0.6 - ../pom.xml - - - - 1.1-M6 - - - - - akka-util-java - ${project.groupId} - ${project.version} - - - akka-util - ${project.groupId} - ${project.version} - - - akka-core - ${project.groupId} - ${project.version} - - - akka-persistence-cassandra - ${project.groupId} - ${project.version} - - - akka-rest - ${project.groupId} - ${project.version} - - - akka-kernel - ${project.groupId} - ${project.version} - - - javax.ws.rs - jsr311-api - 1.0 - - - org.scala-lang - scala-library - ${scala.version} - - - net.liftweb - lift-util - ${lift.version} - - - net.liftweb - lift-webkit - ${lift.version} - - - javax.servlet - servlet-api - 2.5 - provided - - - junit - junit - 4.5 - test - - - org.mortbay.jetty - jetty - [6.1.6,) - test - - - org.scala-lang - scala-compiler - ${scala.version} - test - - - diff --git a/akka-samples-chat/README b/akka-samples/akka-samples-chat/README similarity index 100% rename from akka-samples-chat/README rename to akka-samples/akka-samples-chat/README diff --git a/akka-samples-chat/pom.xml b/akka-samples/akka-samples-chat/pom.xml similarity index 65% rename from akka-samples-chat/pom.xml rename to akka-samples/akka-samples-chat/pom.xml index 09f8eaaaf0..31b4678f53 100644 --- a/akka-samples-chat/pom.xml +++ b/akka-samples/akka-samples-chat/pom.xml @@ -8,25 +8,11 @@ jar - akka + akka-samples-parent se.scalablesolutions.akka 0.6 - ../pom.xml - - - akka-core - ${project.groupId} - ${project.version} - - - akka-persistence-redis - ${project.groupId} - ${project.version} - - - src/main/scala @@ -38,7 +24,7 @@ + tofile="../../deploy/akka-samples-chat-${project.version}.jar"/> diff --git a/akka-samples-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-samples-chat/src/main/scala/ChatServer.scala similarity index 100% rename from akka-samples-chat/src/main/scala/ChatServer.scala rename to akka-samples/akka-samples-chat/src/main/scala/ChatServer.scala diff --git a/akka-samples-lift/config/akka.conf b/akka-samples/akka-samples-lift/config/akka.conf similarity index 100% rename from akka-samples-lift/config/akka.conf rename to akka-samples/akka-samples-lift/config/akka.conf diff --git a/akka-samples/akka-samples-lift/pom.xml b/akka-samples/akka-samples-lift/pom.xml new file mode 100644 index 0000000000..4d86c07bef --- /dev/null +++ b/akka-samples/akka-samples-lift/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + akka-samples-lift + Akka Lift Samples Module + + war + + + akka-samples-parent + se.scalablesolutions.akka + 0.6 + + + + 1.1-M6 + + + + + net.liftweb + lift-util + ${lift.version} + + + net.liftweb + lift-webkit + ${lift.version} + + + javax.servlet + servlet-api + 2.5 + provided + + + junit + junit + 4.5 + test + + + org.mortbay.jetty + jetty + [6.1.6,) + test + + + diff --git a/akka-samples-lift/src/main/scala/akka/SimpleService.scala b/akka-samples/akka-samples-lift/src/main/scala/akka/SimpleService.scala similarity index 100% rename from akka-samples-lift/src/main/scala/akka/SimpleService.scala rename to akka-samples/akka-samples-lift/src/main/scala/akka/SimpleService.scala diff --git a/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/akka-samples/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala similarity index 100% rename from akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala rename to akka-samples/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala diff --git a/akka-samples-lift/src/main/scala/comet/.keep b/akka-samples/akka-samples-lift/src/main/scala/comet/.keep similarity index 100% rename from akka-samples-lift/src/main/scala/comet/.keep rename to akka-samples/akka-samples-lift/src/main/scala/comet/.keep diff --git a/akka-samples-lift/src/main/scala/model/.keep b/akka-samples/akka-samples-lift/src/main/scala/model/.keep similarity index 100% rename from akka-samples-lift/src/main/scala/model/.keep rename to akka-samples/akka-samples-lift/src/main/scala/model/.keep diff --git a/akka-samples-lift/src/main/scala/snippet/.keep b/akka-samples/akka-samples-lift/src/main/scala/snippet/.keep similarity index 100% rename from akka-samples-lift/src/main/scala/snippet/.keep rename to akka-samples/akka-samples-lift/src/main/scala/snippet/.keep diff --git a/akka-samples-lift/src/main/scala/snippet/HelloWorld.scala b/akka-samples/akka-samples-lift/src/main/scala/snippet/HelloWorld.scala similarity index 100% rename from akka-samples-lift/src/main/scala/snippet/HelloWorld.scala rename to akka-samples/akka-samples-lift/src/main/scala/snippet/HelloWorld.scala diff --git a/akka-samples-lift/src/main/scala/view/.keep b/akka-samples/akka-samples-lift/src/main/scala/view/.keep similarity index 100% rename from akka-samples-lift/src/main/scala/view/.keep rename to akka-samples/akka-samples-lift/src/main/scala/view/.keep diff --git a/akka-samples-lift/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-samples-lift/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from akka-samples-lift/src/main/webapp/WEB-INF/web.xml rename to akka-samples/akka-samples-lift/src/main/webapp/WEB-INF/web.xml diff --git a/akka-samples-lift/src/main/webapp/index.html b/akka-samples/akka-samples-lift/src/main/webapp/index.html similarity index 100% rename from akka-samples-lift/src/main/webapp/index.html rename to akka-samples/akka-samples-lift/src/main/webapp/index.html diff --git a/akka-samples-lift/src/main/webapp/templates-hidden/default.html b/akka-samples/akka-samples-lift/src/main/webapp/templates-hidden/default.html similarity index 100% rename from akka-samples-lift/src/main/webapp/templates-hidden/default.html rename to akka-samples/akka-samples-lift/src/main/webapp/templates-hidden/default.html diff --git a/akka-samples-lift/src/test/scala/LiftConsole.scala b/akka-samples/akka-samples-lift/src/test/scala/LiftConsole.scala similarity index 100% rename from akka-samples-lift/src/test/scala/LiftConsole.scala rename to akka-samples/akka-samples-lift/src/test/scala/LiftConsole.scala diff --git a/akka-samples-lift/src/test/scala/RunWebApp.scala b/akka-samples/akka-samples-lift/src/test/scala/RunWebApp.scala similarity index 100% rename from akka-samples-lift/src/test/scala/RunWebApp.scala rename to akka-samples/akka-samples-lift/src/test/scala/RunWebApp.scala diff --git a/akka-samples/akka-samples-rest-java/pom.xml b/akka-samples/akka-samples-rest-java/pom.xml new file mode 100644 index 0000000000..ec782333cc --- /dev/null +++ b/akka-samples/akka-samples-rest-java/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + akka-samples-rest-java + Akka REST Java Samples Module + + jar + + + akka-samples-parent + se.scalablesolutions.akka + 0.6 + + + + src/main/java + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + **/* + + + + + maven-antrun-plugin + + + install + + + + + + + run + + + + + + + diff --git a/akka-samples-java/src/main/java/sample/java/Boot.java b/akka-samples/akka-samples-rest-java/src/main/java/sample/java/Boot.java similarity index 100% rename from akka-samples-java/src/main/java/sample/java/Boot.java rename to akka-samples/akka-samples-rest-java/src/main/java/sample/java/Boot.java diff --git a/akka-samples-java/src/main/java/sample/java/PersistentSimpleService.java b/akka-samples/akka-samples-rest-java/src/main/java/sample/java/PersistentSimpleService.java similarity index 100% rename from akka-samples-java/src/main/java/sample/java/PersistentSimpleService.java rename to akka-samples/akka-samples-rest-java/src/main/java/sample/java/PersistentSimpleService.java diff --git a/akka-samples-java/src/main/java/sample/java/SimpleService.java b/akka-samples/akka-samples-rest-java/src/main/java/sample/java/SimpleService.java similarity index 100% rename from akka-samples-java/src/main/java/sample/java/SimpleService.java rename to akka-samples/akka-samples-rest-java/src/main/java/sample/java/SimpleService.java diff --git a/akka-samples/akka-samples-rest-scala/pom.xml b/akka-samples/akka-samples-rest-scala/pom.xml new file mode 100644 index 0000000000..11d9b65d12 --- /dev/null +++ b/akka-samples/akka-samples-rest-scala/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + + akka-samples-rest-scala + Akka REST Scala Samples Module + + jar + + + akka-samples-parent + se.scalablesolutions.akka + 0.6 + + + + + javax.ws.rs + jsr311-api + 1.0 + + + + + src/main/scala + + + maven-antrun-plugin + + + install + + + + + + + run + + + + + + + diff --git a/akka-samples-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-samples-rest-scala/src/main/scala/SimpleService.scala similarity index 100% rename from akka-samples-scala/src/main/scala/SimpleService.scala rename to akka-samples/akka-samples-rest-scala/src/main/scala/SimpleService.scala diff --git a/akka-samples-security/pom.xml b/akka-samples/akka-samples-security/pom.xml similarity index 57% rename from akka-samples-security/pom.xml rename to akka-samples/akka-samples-security/pom.xml index a94f8e7171..f074b371be 100644 --- a/akka-samples-security/pom.xml +++ b/akka-samples/akka-samples-security/pom.xml @@ -8,38 +8,12 @@ jar - akka + akka-samples-parent se.scalablesolutions.akka 0.6 - ../pom.xml - - akka-util-java - ${project.groupId} - ${project.version} - - - akka-util - ${project.groupId} - ${project.version} - - - akka-core - ${project.groupId} - ${project.version} - - - akka-security - ${project.groupId} - ${project.version} - - - akka-persistence-cassandra - ${project.groupId} - ${project.version} - javax.ws.rs jsr311-api @@ -64,7 +38,7 @@ + tofile="../../deploy/akka-samples-security-${project.version}.jar"/> diff --git a/akka-samples-security/src/main/resources/akka.conf b/akka-samples/akka-samples-security/src/main/resources/akka.conf similarity index 100% rename from akka-samples-security/src/main/resources/akka.conf rename to akka-samples/akka-samples-security/src/main/resources/akka.conf diff --git a/akka-samples-security/src/main/scala/SimpleService.scala b/akka-samples/akka-samples-security/src/main/scala/SimpleService.scala similarity index 100% rename from akka-samples-security/src/main/scala/SimpleService.scala rename to akka-samples/akka-samples-security/src/main/scala/SimpleService.scala diff --git a/akka-samples-security/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-samples-security/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from akka-samples-security/src/main/webapp/WEB-INF/web.xml rename to akka-samples/akka-samples-security/src/main/webapp/WEB-INF/web.xml diff --git a/akka-samples-scala/pom.xml b/akka-samples/pom.xml similarity index 54% rename from akka-samples-scala/pom.xml rename to akka-samples/pom.xml index 0f21cec7b6..236100f6ba 100644 --- a/akka-samples-scala/pom.xml +++ b/akka-samples/pom.xml @@ -2,29 +2,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - akka-samples-scala - Akka Scala Samples Module + akka-samples-parent + Akka Samples Module - jar + pom akka se.scalablesolutions.akka 0.6 - ../pom.xml + + akka-samples-chat + akka-samples-lift + akka-samples-security + akka-samples-rest-scala + akka-samples-rest-java + + - - akka-util-java - ${project.groupId} - ${project.version} - - - akka-util - ${project.groupId} - ${project.version} - akka-core ${project.groupId} @@ -35,43 +32,25 @@ ${project.groupId} ${project.version} + + akka-persistence-redis + ${project.groupId} + ${project.version} + akka-rest ${project.groupId} ${project.version} - akka-kernel + akka-comet ${project.groupId} ${project.version} - javax.ws.rs - jsr311-api - 1.0 + akka-security + ${project.groupId} + ${project.version} - - - src/main/scala - - - maven-antrun-plugin - - - install - - - - - - - run - - - - - - diff --git a/pom.xml b/pom.xml index c59044e37a..c1f4c61884 100755 --- a/pom.xml +++ b/pom.xml @@ -61,11 +61,7 @@ akka-security akka-kernel akka-fun-test-java - akka-samples-scala - akka-samples-lift - akka-samples-chat - akka-samples-java - akka-samples-security + akka-samples diff --git a/scripts/remove_trailing_whitespace.sh b/scripts/remove_trailing_whitespace.sh index 35038ae44d..16e19e4c97 100755 --- a/scripts/remove_trailing_whitespace.sh +++ b/scripts/remove_trailing_whitespace.sh @@ -1,4 +1,3 @@ #!/bin/sh echo "removing all trailing whitespace from all *.scala, *.html and *.xml files" -find . -type f -name '*.scala' -exec sed -i 's/[ \t]*$//' {} \; - +find . -type f -name '*.scala' -exec sed -i 's/[ \t]*$//' {} \; \ No newline at end of file