From cc8377ec44e3231684ea214b141c7594117e144d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Sat, 2 Jan 2010 22:53:11 +0100 Subject: [PATCH] Restructured persistence modules into its own submodule --- akka-amqp/pom.xml | 5 --- akka-comet/pom.xml | 36 +------------------ akka-kernel/pom.xml | 5 --- .../akka-persistence-cassandra}/pom.xml | 16 +-------- .../src/main/scala/CassandraSession.scala | 0 .../src/main/scala/CassandraStorage.scala | 0 .../main/scala/CassandraStorageBackend.scala | 0 .../scala/CassandraPersistentActorSpec.scala | 0 .../akka-persistence-common}/pom.xml | 22 +----------- .../src/main/scala/Pool.scala | 0 .../src/main/scala/Storage.scala | 0 .../src/main/scala/StorageBackend.scala | 0 .../akka-persistence-mongo/pom.xml | 31 ++++++++++++++++ .../src/main/scala/MongoStorage.scala | 0 .../src/main/scala/MongoStorageBackend.scala | 0 .../test/scala/MongoPersistentActorSpec.scala | 0 .../src/test/scala/MongoStorageSpec.scala | 0 .../akka-persistence-redis}/pom.xml | 18 ++-------- .../src/main/scala/RedisStorage.scala | 0 .../src/main/scala/RedisStorageBackend.scala | 0 .../test/scala/RedisPersistentActorSpec.scala | 0 .../test/scala/RedisStorageBackendSpec.scala | 0 .../pom.xml | 24 ++++++------- .../README | 0 .../pom.xml | 6 ++-- .../src/main/scala/ChatServer.scala | 0 .../config/akka.conf | 0 .../pom.xml | 4 +-- .../src/main/scala/akka/SimpleService.scala | 0 .../main/scala/bootstrap/liftweb/Boot.scala | 0 .../src/main/scala/comet/.keep | 0 .../src/main/scala/model/.keep | 0 .../src/main/scala/snippet/.keep | 0 .../src/main/scala/snippet/HelloWorld.scala | 0 .../src/main/scala/view/.keep | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.html | 0 .../main/webapp/templates-hidden/default.html | 0 .../src/test/scala/LiftConsole.scala | 0 .../src/test/scala/RunWebApp.scala | 0 .../pom.xml | 8 ++--- .../src/main/java/sample/java/Boot.java | 0 .../sample/java/PersistentSimpleService.java | 0 .../main/java/sample/java/SimpleService.java | 0 .../pom.xml | 8 ++--- .../src/main/scala/SimpleService.scala | 0 .../pom.xml | 6 ++-- .../src/main/resources/akka.conf | 0 .../src/main/scala/SimpleService.scala | 0 .../src/main/webapp/WEB-INF/web.xml | 0 akka-samples/pom.xml | 12 +++---- akka-security/pom.xml | 15 -------- pom.xml | 7 ++-- 53 files changed, 71 insertions(+), 152 deletions(-) rename {akka-persistence-cassandra => akka-persistence/akka-persistence-cassandra}/pom.xml (72%) rename {akka-persistence-cassandra => akka-persistence/akka-persistence-cassandra}/src/main/scala/CassandraSession.scala (100%) rename {akka-persistence-cassandra => akka-persistence/akka-persistence-cassandra}/src/main/scala/CassandraStorage.scala (100%) rename {akka-persistence-cassandra => akka-persistence/akka-persistence-cassandra}/src/main/scala/CassandraStorageBackend.scala (100%) rename {akka-persistence-cassandra => akka-persistence/akka-persistence-cassandra}/src/test/scala/CassandraPersistentActorSpec.scala (100%) rename {akka-persistence-common => akka-persistence/akka-persistence-common}/pom.xml (59%) rename {akka-persistence-common => akka-persistence/akka-persistence-common}/src/main/scala/Pool.scala (100%) rename {akka-persistence-common => akka-persistence/akka-persistence-common}/src/main/scala/Storage.scala (100%) rename {akka-persistence-common => akka-persistence/akka-persistence-common}/src/main/scala/StorageBackend.scala (100%) create mode 100644 akka-persistence/akka-persistence-mongo/pom.xml rename {akka-persistence-mongo => akka-persistence/akka-persistence-mongo}/src/main/scala/MongoStorage.scala (100%) rename {akka-persistence-mongo => akka-persistence/akka-persistence-mongo}/src/main/scala/MongoStorageBackend.scala (100%) rename {akka-persistence-mongo => akka-persistence/akka-persistence-mongo}/src/test/scala/MongoPersistentActorSpec.scala (100%) rename {akka-persistence-mongo => akka-persistence/akka-persistence-mongo}/src/test/scala/MongoStorageSpec.scala (100%) rename {akka-persistence-redis => akka-persistence/akka-persistence-redis}/pom.xml (67%) rename {akka-persistence-redis => akka-persistence/akka-persistence-redis}/src/main/scala/RedisStorage.scala (100%) rename {akka-persistence-redis => akka-persistence/akka-persistence-redis}/src/main/scala/RedisStorageBackend.scala (100%) rename {akka-persistence-redis => akka-persistence/akka-persistence-redis}/src/test/scala/RedisPersistentActorSpec.scala (100%) rename {akka-persistence-redis => akka-persistence/akka-persistence-redis}/src/test/scala/RedisStorageBackendSpec.scala (100%) rename {akka-persistence-mongo => akka-persistence}/pom.xml (71%) rename akka-samples/{akka-samples-chat => akka-sample-chat}/README (100%) rename akka-samples/{akka-samples-chat => akka-sample-chat}/pom.xml (82%) rename akka-samples/{akka-samples-chat => akka-sample-chat}/src/main/scala/ChatServer.scala (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/config/akka.conf (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/pom.xml (94%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/scala/akka/SimpleService.scala (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/scala/bootstrap/liftweb/Boot.scala (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/scala/comet/.keep (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/scala/model/.keep (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/scala/snippet/.keep (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/scala/snippet/HelloWorld.scala (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/scala/view/.keep (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/webapp/WEB-INF/web.xml (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/webapp/index.html (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/main/webapp/templates-hidden/default.html (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/test/scala/LiftConsole.scala (100%) rename akka-samples/{akka-samples-lift => akka-sample-lift}/src/test/scala/RunWebApp.scala (100%) rename akka-samples/{akka-samples-rest-java => akka-sample-rest-java}/pom.xml (82%) rename akka-samples/{akka-samples-rest-java => akka-sample-rest-java}/src/main/java/sample/java/Boot.java (100%) rename akka-samples/{akka-samples-rest-java => akka-sample-rest-java}/src/main/java/sample/java/PersistentSimpleService.java (100%) rename akka-samples/{akka-samples-rest-java => akka-sample-rest-java}/src/main/java/sample/java/SimpleService.java (100%) rename akka-samples/{akka-samples-rest-scala => akka-sample-rest-scala}/pom.xml (80%) rename akka-samples/{akka-samples-rest-scala => akka-sample-rest-scala}/src/main/scala/SimpleService.scala (100%) rename akka-samples/{akka-samples-security => akka-sample-security}/pom.xml (85%) rename akka-samples/{akka-samples-security => akka-sample-security}/src/main/resources/akka.conf (100%) rename akka-samples/{akka-samples-security => akka-sample-security}/src/main/scala/SimpleService.scala (100%) rename akka-samples/{akka-samples-security => akka-sample-security}/src/main/webapp/WEB-INF/web.xml (100%) diff --git a/akka-amqp/pom.xml b/akka-amqp/pom.xml index b1b37d26fe..f7067e56b8 100644 --- a/akka-amqp/pom.xml +++ b/akka-amqp/pom.xml @@ -14,11 +14,6 @@ - - akka-util - ${project.groupId} - ${project.version} - akka-core ${project.groupId} diff --git a/akka-comet/pom.xml b/akka-comet/pom.xml index 246a7cb9bc..ae64f166f3 100644 --- a/akka-comet/pom.xml +++ b/akka-comet/pom.xml @@ -16,11 +16,6 @@ - - akka-core - ${project.groupId} - ${project.version} - akka-rest ${project.groupId} @@ -33,11 +28,7 @@ grizzly-comet-webserver ${grizzly.version} - + javax.servlet @@ -59,30 +50,5 @@ atmosphere-runtime ${atmosphere.version} - - diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml index 43b23911f5..c0ccec2db9 100755 --- a/akka-kernel/pom.xml +++ b/akka-kernel/pom.xml @@ -16,11 +16,6 @@ - - akka-core - ${project.groupId} - ${project.version} - akka-rest ${project.groupId} diff --git a/akka-persistence-cassandra/pom.xml b/akka-persistence/akka-persistence-cassandra/pom.xml similarity index 72% rename from akka-persistence-cassandra/pom.xml rename to akka-persistence/akka-persistence-cassandra/pom.xml index a6f870c896..9abb616796 100644 --- a/akka-persistence-cassandra/pom.xml +++ b/akka-persistence/akka-persistence-cassandra/pom.xml @@ -8,7 +8,7 @@ jar - akka + akka-persistence-parent se.scalablesolutions.akka 0.6 @@ -31,20 +31,6 @@ log4j 1.2.13 - - - - org.scalatest - scalatest - 1.0 - test - - - junit - junit - 4.5 - test - diff --git a/akka-persistence-cassandra/src/main/scala/CassandraSession.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala similarity index 100% rename from akka-persistence-cassandra/src/main/scala/CassandraSession.scala rename to akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala diff --git a/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala similarity index 100% rename from akka-persistence-cassandra/src/main/scala/CassandraStorage.scala rename to akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala diff --git a/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala similarity index 100% rename from akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala rename to akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala diff --git a/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala similarity index 100% rename from akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala rename to akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala diff --git a/akka-persistence-common/pom.xml b/akka-persistence/akka-persistence-common/pom.xml similarity index 59% rename from akka-persistence-common/pom.xml rename to akka-persistence/akka-persistence-common/pom.xml index 5e673b4eb8..e260d3c5a9 100644 --- a/akka-persistence-common/pom.xml +++ b/akka-persistence/akka-persistence-common/pom.xml @@ -8,18 +8,12 @@ jar - akka + akka-persistence-parent se.scalablesolutions.akka 0.6 - - akka-core - ${project.groupId} - ${project.version} - - com.facebook thrift @@ -30,20 +24,6 @@ commons-pool 1.5.1 - - - - org.scalatest - scalatest - 1.0 - test - - - junit - junit - 4.5 - test - diff --git a/akka-persistence-common/src/main/scala/Pool.scala b/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala similarity index 100% rename from akka-persistence-common/src/main/scala/Pool.scala rename to akka-persistence/akka-persistence-common/src/main/scala/Pool.scala diff --git a/akka-persistence-common/src/main/scala/Storage.scala b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala similarity index 100% rename from akka-persistence-common/src/main/scala/Storage.scala rename to akka-persistence/akka-persistence-common/src/main/scala/Storage.scala diff --git a/akka-persistence-common/src/main/scala/StorageBackend.scala b/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala similarity index 100% rename from akka-persistence-common/src/main/scala/StorageBackend.scala rename to akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala diff --git a/akka-persistence/akka-persistence-mongo/pom.xml b/akka-persistence/akka-persistence-mongo/pom.xml new file mode 100644 index 0000000000..f8543cdd67 --- /dev/null +++ b/akka-persistence/akka-persistence-mongo/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + akka-persistence-mongo + Akka Persistence Mongo Module + + jar + + + akka-persistence-parent + se.scalablesolutions.akka + 0.6 + + + + + akka-persistence-common + ${project.groupId} + ${project.version} + + + + + org.mongodb + mongo-java-driver + 1.1 + + + + diff --git a/akka-persistence-mongo/src/main/scala/MongoStorage.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala similarity index 100% rename from akka-persistence-mongo/src/main/scala/MongoStorage.scala rename to akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala diff --git a/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala similarity index 100% rename from akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala rename to akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala diff --git a/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala similarity index 100% rename from akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala rename to akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala diff --git a/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala similarity index 100% rename from akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala rename to akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala diff --git a/akka-persistence-redis/pom.xml b/akka-persistence/akka-persistence-redis/pom.xml similarity index 67% rename from akka-persistence-redis/pom.xml rename to akka-persistence/akka-persistence-redis/pom.xml index 0ecb47b724..71b5db8920 100644 --- a/akka-persistence-redis/pom.xml +++ b/akka-persistence/akka-persistence-redis/pom.xml @@ -8,7 +8,7 @@ jar - akka + akka-persistence-parent se.scalablesolutions.akka 0.6 @@ -20,26 +20,12 @@ ${project.version} - + com.redis redisclient 1.0.1 - - - - org.scalatest - scalatest - 1.0 - test - - - junit - junit - 4.5 - test - diff --git a/akka-persistence-redis/src/main/scala/RedisStorage.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala similarity index 100% rename from akka-persistence-redis/src/main/scala/RedisStorage.scala rename to akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala diff --git a/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala similarity index 100% rename from akka-persistence-redis/src/main/scala/RedisStorageBackend.scala rename to akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala diff --git a/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala similarity index 100% rename from akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala rename to akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala diff --git a/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala similarity index 100% rename from akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala rename to akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala diff --git a/akka-persistence-mongo/pom.xml b/akka-persistence/pom.xml similarity index 71% rename from akka-persistence-mongo/pom.xml rename to akka-persistence/pom.xml index f6ced1e5cc..20f15f8aff 100644 --- a/akka-persistence-mongo/pom.xml +++ b/akka-persistence/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - akka-persistence-mongo - Akka Persistence Mongo Module + akka-persistence-parent + Akka Persistence Modules - jar + pom akka @@ -13,20 +13,19 @@ 0.6 + + akka-persistence-common + akka-persistence-redis + akka-persistence-mongo + akka-persistence-cassandra + + - akka-persistence-common + akka-core ${project.groupId} ${project.version} - - - - org.mongodb - mongo-java-driver - 1.1 - - org.scalatest @@ -41,5 +40,4 @@ test - diff --git a/akka-samples/akka-samples-chat/README b/akka-samples/akka-sample-chat/README similarity index 100% rename from akka-samples/akka-samples-chat/README rename to akka-samples/akka-sample-chat/README diff --git a/akka-samples/akka-samples-chat/pom.xml b/akka-samples/akka-sample-chat/pom.xml similarity index 82% rename from akka-samples/akka-samples-chat/pom.xml rename to akka-samples/akka-sample-chat/pom.xml index 31b4678f53..9648a1f867 100644 --- a/akka-samples/akka-samples-chat/pom.xml +++ b/akka-samples/akka-sample-chat/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - akka-samples-chat + akka-sample-chat Akka Chat Sample Module jar @@ -23,8 +23,8 @@ install - + diff --git a/akka-samples/akka-samples-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala similarity index 100% rename from akka-samples/akka-samples-chat/src/main/scala/ChatServer.scala rename to akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala diff --git a/akka-samples/akka-samples-lift/config/akka.conf b/akka-samples/akka-sample-lift/config/akka.conf similarity index 100% rename from akka-samples/akka-samples-lift/config/akka.conf rename to akka-samples/akka-sample-lift/config/akka.conf diff --git a/akka-samples/akka-samples-lift/pom.xml b/akka-samples/akka-sample-lift/pom.xml similarity index 94% rename from akka-samples/akka-samples-lift/pom.xml rename to akka-samples/akka-sample-lift/pom.xml index 4d86c07bef..bc9d1f8eaa 100644 --- a/akka-samples/akka-samples-lift/pom.xml +++ b/akka-samples/akka-sample-lift/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - akka-samples-lift - Akka Lift Samples Module + akka-sample-lift + Akka Lift Sample Module war diff --git a/akka-samples/akka-samples-lift/src/main/scala/akka/SimpleService.scala b/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala similarity index 100% rename from akka-samples/akka-samples-lift/src/main/scala/akka/SimpleService.scala rename to akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala diff --git a/akka-samples/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala similarity index 100% rename from akka-samples/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala rename to akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala diff --git a/akka-samples/akka-samples-lift/src/main/scala/comet/.keep b/akka-samples/akka-sample-lift/src/main/scala/comet/.keep similarity index 100% rename from akka-samples/akka-samples-lift/src/main/scala/comet/.keep rename to akka-samples/akka-sample-lift/src/main/scala/comet/.keep diff --git a/akka-samples/akka-samples-lift/src/main/scala/model/.keep b/akka-samples/akka-sample-lift/src/main/scala/model/.keep similarity index 100% rename from akka-samples/akka-samples-lift/src/main/scala/model/.keep rename to akka-samples/akka-sample-lift/src/main/scala/model/.keep diff --git a/akka-samples/akka-samples-lift/src/main/scala/snippet/.keep b/akka-samples/akka-sample-lift/src/main/scala/snippet/.keep similarity index 100% rename from akka-samples/akka-samples-lift/src/main/scala/snippet/.keep rename to akka-samples/akka-sample-lift/src/main/scala/snippet/.keep diff --git a/akka-samples/akka-samples-lift/src/main/scala/snippet/HelloWorld.scala b/akka-samples/akka-sample-lift/src/main/scala/snippet/HelloWorld.scala similarity index 100% rename from akka-samples/akka-samples-lift/src/main/scala/snippet/HelloWorld.scala rename to akka-samples/akka-sample-lift/src/main/scala/snippet/HelloWorld.scala diff --git a/akka-samples/akka-samples-lift/src/main/scala/view/.keep b/akka-samples/akka-sample-lift/src/main/scala/view/.keep similarity index 100% rename from akka-samples/akka-samples-lift/src/main/scala/view/.keep rename to akka-samples/akka-sample-lift/src/main/scala/view/.keep diff --git a/akka-samples/akka-samples-lift/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-sample-lift/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from akka-samples/akka-samples-lift/src/main/webapp/WEB-INF/web.xml rename to akka-samples/akka-sample-lift/src/main/webapp/WEB-INF/web.xml diff --git a/akka-samples/akka-samples-lift/src/main/webapp/index.html b/akka-samples/akka-sample-lift/src/main/webapp/index.html similarity index 100% rename from akka-samples/akka-samples-lift/src/main/webapp/index.html rename to akka-samples/akka-sample-lift/src/main/webapp/index.html diff --git a/akka-samples/akka-samples-lift/src/main/webapp/templates-hidden/default.html b/akka-samples/akka-sample-lift/src/main/webapp/templates-hidden/default.html similarity index 100% rename from akka-samples/akka-samples-lift/src/main/webapp/templates-hidden/default.html rename to akka-samples/akka-sample-lift/src/main/webapp/templates-hidden/default.html diff --git a/akka-samples/akka-samples-lift/src/test/scala/LiftConsole.scala b/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala similarity index 100% rename from akka-samples/akka-samples-lift/src/test/scala/LiftConsole.scala rename to akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala diff --git a/akka-samples/akka-samples-lift/src/test/scala/RunWebApp.scala b/akka-samples/akka-sample-lift/src/test/scala/RunWebApp.scala similarity index 100% rename from akka-samples/akka-samples-lift/src/test/scala/RunWebApp.scala rename to akka-samples/akka-sample-lift/src/test/scala/RunWebApp.scala diff --git a/akka-samples/akka-samples-rest-java/pom.xml b/akka-samples/akka-sample-rest-java/pom.xml similarity index 82% rename from akka-samples/akka-samples-rest-java/pom.xml rename to akka-samples/akka-sample-rest-java/pom.xml index ec782333cc..23ec858ff8 100644 --- a/akka-samples/akka-samples-rest-java/pom.xml +++ b/akka-samples/akka-sample-rest-java/pom.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - akka-samples-rest-java - Akka REST Java Samples Module + akka-sample-rest-java + Akka REST Java Sample Module jar @@ -34,8 +34,8 @@ install - + diff --git a/akka-samples/akka-samples-rest-java/src/main/java/sample/java/Boot.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/Boot.java similarity index 100% rename from akka-samples/akka-samples-rest-java/src/main/java/sample/java/Boot.java rename to akka-samples/akka-sample-rest-java/src/main/java/sample/java/Boot.java diff --git a/akka-samples/akka-samples-rest-java/src/main/java/sample/java/PersistentSimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java similarity index 100% rename from akka-samples/akka-samples-rest-java/src/main/java/sample/java/PersistentSimpleService.java rename to akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java diff --git a/akka-samples/akka-samples-rest-java/src/main/java/sample/java/SimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java similarity index 100% rename from akka-samples/akka-samples-rest-java/src/main/java/sample/java/SimpleService.java rename to akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java diff --git a/akka-samples/akka-samples-rest-scala/pom.xml b/akka-samples/akka-sample-rest-scala/pom.xml similarity index 80% rename from akka-samples/akka-samples-rest-scala/pom.xml rename to akka-samples/akka-sample-rest-scala/pom.xml index 11d9b65d12..b9268b76eb 100644 --- a/akka-samples/akka-samples-rest-scala/pom.xml +++ b/akka-samples/akka-sample-rest-scala/pom.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - akka-samples-rest-scala - Akka REST Scala Samples Module + akka-sample-rest-scala + Akka REST Scala Sample Module jar @@ -31,8 +31,8 @@ install - + diff --git a/akka-samples/akka-samples-rest-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala similarity index 100% rename from akka-samples/akka-samples-rest-scala/src/main/scala/SimpleService.scala rename to akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala diff --git a/akka-samples/akka-samples-security/pom.xml b/akka-samples/akka-sample-security/pom.xml similarity index 85% rename from akka-samples/akka-samples-security/pom.xml rename to akka-samples/akka-sample-security/pom.xml index f074b371be..4a2f44b3ae 100644 --- a/akka-samples/akka-samples-security/pom.xml +++ b/akka-samples/akka-sample-security/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - akka-samples-security + akka-sample-security Akka Sample Security Module jar @@ -37,8 +37,8 @@ install - + diff --git a/akka-samples/akka-samples-security/src/main/resources/akka.conf b/akka-samples/akka-sample-security/src/main/resources/akka.conf similarity index 100% rename from akka-samples/akka-samples-security/src/main/resources/akka.conf rename to akka-samples/akka-sample-security/src/main/resources/akka.conf diff --git a/akka-samples/akka-samples-security/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala similarity index 100% rename from akka-samples/akka-samples-security/src/main/scala/SimpleService.scala rename to akka-samples/akka-sample-security/src/main/scala/SimpleService.scala diff --git a/akka-samples/akka-samples-security/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from akka-samples/akka-samples-security/src/main/webapp/WEB-INF/web.xml rename to akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml diff --git a/akka-samples/pom.xml b/akka-samples/pom.xml index 236100f6ba..5b008bafde 100644 --- a/akka-samples/pom.xml +++ b/akka-samples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 akka-samples-parent - Akka Samples Module + Akka Sample Modules pom @@ -14,11 +14,11 @@ - akka-samples-chat - akka-samples-lift - akka-samples-security - akka-samples-rest-scala - akka-samples-rest-java + akka-sample-chat + akka-sample-lift + akka-sample-security + akka-sample-rest-scala + akka-sample-rest-java diff --git a/akka-security/pom.xml b/akka-security/pom.xml index 08f787a743..4b3dd43195 100644 --- a/akka-security/pom.xml +++ b/akka-security/pom.xml @@ -14,26 +14,11 @@ - - org.scala-lang - scala-library - ${scala.version} - akka-core ${project.groupId} ${project.version} - - akka-persistence-cassandra - ${project.groupId} - ${project.version} - - - akka-util - ${project.groupId} - ${project.version} - javax.annotation jsr250-api diff --git a/pom.xml b/pom.xml index c1f4c61884..f405169c8e 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - Akka Transactors + Akka Project akka se.scalablesolutions.akka 0.6 @@ -51,10 +51,7 @@ akka-util-java akka-util akka-core - akka-persistence-common - akka-persistence-cassandra - akka-persistence-mongo - akka-persistence-redis + akka-persistence akka-rest akka-comet akka-amqp