diff --git a/akka-core/pom.xml b/akka-core/pom.xml index c3bf03e79c..bc6e4c59fe 100644 --- a/akka-core/pom.xml +++ b/akka-core/pom.xml @@ -42,21 +42,6 @@ aspectwerkz-jdk5 2.1 - - org.multiverse - multiverse-core - 0.3 - - - org.multiverse - multiverse-alpha - 0.3 - - - net.lag - configgy - 1.4 - org.jboss.netty netty @@ -89,11 +74,6 @@ jackson-mapper-asl 1.2.1 - - com.google.protobuf - protobuf-java - 2.2.0 - sbinary sbinary diff --git a/akka-fun-test-java/pom.xml b/akka-fun-test-java/pom.xml index 8f8a6b41fc..d39a3e9385 100644 --- a/akka-fun-test-java/pom.xml +++ b/akka-fun-test-java/pom.xml @@ -21,16 +21,21 @@ ${project.version} - com.sun.grizzly - grizzly-servlet-webserver - ${grizzly.version} - test + ${project.groupId} + akka-persistence-cassandra + ${project.version} com.google.protobuf protobuf-java 2.2.0 + + com.sun.grizzly + grizzly-servlet-webserver + ${grizzly.version} + test + com.sun.jersey jersey-server diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml index a6d0c801a6..c7d0c3134e 100755 --- a/akka-kernel/pom.xml +++ b/akka-kernel/pom.xml @@ -22,11 +22,6 @@ ${project.groupId} ${project.version} - - akka-persistence - ${project.groupId} - ${project.version} - akka-rest ${project.groupId} @@ -42,6 +37,16 @@ ${project.groupId} ${project.version} + + akka-persistence-cassandra + ${project.groupId} + ${project.version} + + + akka-persistence-mongo + ${project.groupId} + ${project.version} + diff --git a/akka-persistence-common/pom.xml b/akka-persistence-common/pom.xml index 55a73e54bd..21c425b987 100644 --- a/akka-persistence-common/pom.xml +++ b/akka-persistence-common/pom.xml @@ -15,11 +15,6 @@ - - akka-util - ${project.groupId} - ${project.version} - akka-core ${project.groupId} diff --git a/akka-rest/pom.xml b/akka-rest/pom.xml index 834de3aca8..32fbad0997 100644 --- a/akka-rest/pom.xml +++ b/akka-rest/pom.xml @@ -17,11 +17,6 @@ - - akka-util - ${project.groupId} - ${project.version} - akka-core ${project.groupId} diff --git a/akka-samples-java/pom.xml b/akka-samples-java/pom.xml index 8dc34d9349..5f41981ad0 100644 --- a/akka-samples-java/pom.xml +++ b/akka-samples-java/pom.xml @@ -31,13 +31,13 @@ ${project.version} - akka-persistence + akka-rest ${project.groupId} ${project.version} - akka-rest ${project.groupId} + akka-persistence-cassandra ${project.version} diff --git a/akka-samples-lift/pom.xml b/akka-samples-lift/pom.xml index 7d4f292166..c29e73343e 100644 --- a/akka-samples-lift/pom.xml +++ b/akka-samples-lift/pom.xml @@ -35,8 +35,8 @@ ${project.version} - akka-persistence ${project.groupId} + akka-persistence-cassandra ${project.version} @@ -75,7 +75,6 @@ 2.5 provided - junit junit diff --git a/akka-samples-scala/pom.xml b/akka-samples-scala/pom.xml index 0d1658d315..0f21cec7b6 100644 --- a/akka-samples-scala/pom.xml +++ b/akka-samples-scala/pom.xml @@ -31,7 +31,7 @@ ${project.version} - akka-persistence + akka-persistence-cassandra ${project.groupId} ${project.version} diff --git a/akka-samples-security/pom.xml b/akka-samples-security/pom.xml index f2374a8c23..716dc1b175 100644 --- a/akka-samples-security/pom.xml +++ b/akka-samples-security/pom.xml @@ -15,11 +15,6 @@ - - akka-kernel - ${project.groupId} - ${project.version} - akka-util-java ${project.groupId} @@ -40,11 +35,6 @@ ${project.groupId} ${project.version} - - akka-persistence - ${project.groupId} - ${project.version} - javax.ws.rs jsr311-api diff --git a/akka-security/pom.xml b/akka-security/pom.xml index 2ef5d73531..ce29f2b9e6 100644 --- a/akka-security/pom.xml +++ b/akka-security/pom.xml @@ -20,26 +20,11 @@ scala-library ${scala.version} - akka-core ${project.groupId} ${project.version} - - akka-persistence - ${project.groupId} - ${project.version} - - - akka-util - ${project.groupId} - ${project.version} - javax.annotation jsr250-api @@ -80,8 +65,5 @@ 1.8.0 test - - - diff --git a/akka-util-java/pom.xml b/akka-util-java/pom.xml index 537a07fab4..2d2cbafec4 100755 --- a/akka-util-java/pom.xml +++ b/akka-util-java/pom.xml @@ -25,15 +25,33 @@ protobuf-java 2.2.0 - - org.multiverse - multiverse-core - 0.3-SNAPSHOT - org.multiverse multiverse-alpha - 0.3-SNAPSHOT + 0.3 + jar-with-dependencies + + + org.multiverse + multiverse-core + + + asm + asm-tree + + + asm + asm-analysis + + + asm + asm-commons + + + asm + asm-util + + diff --git a/config/akka-reference.conf b/config/akka-reference.conf index 5a04981390..7bdfa6b4f1 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -19,7 +19,9 @@ # FQN to the class doing initial active object/actor # supervisor bootstrap, should be defined in default constructor - boot = ["sample.java.Boot", "sample.scala.Boot", "se.scalablesolutions.akka.security.samples.Boot"] + boot = ["sample.java.Boot", + "sample.scala.Boot", + "se.scalablesolutions.akka.security.samples.Boot"] timeout = 5000 # default timeout for future based invocations @@ -36,9 +38,9 @@ compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6 - - name = "default" - actor = "se.scalablesolutions.akka.remote.JGroupsClusterActor" + + name = "default" + actor = "se.scalablesolutions.akka.remote.JGroupsClusterActor" diff --git a/config/akka.conf b/config/akka.conf index 7c428e89b9..94f630089a 100644 --- a/config/akka.conf +++ b/config/akka.conf @@ -1,4 +1,3 @@ - # This config import the Akka reference configuration. include "akka-reference.conf"