diff --git a/akka-amqp/pom.xml b/akka-amqp/pom.xml index 113b6917b1..d03ecad3e0 100644 --- a/akka-amqp/pom.xml +++ b/akka-amqp/pom.xml @@ -21,7 +21,7 @@ ${project.version} - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-actors/pom.xml b/akka-core/pom.xml similarity index 97% rename from akka-actors/pom.xml rename to akka-core/pom.xml index 14452ef266..910f792d5f 100644 --- a/akka-actors/pom.xml +++ b/akka-core/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - akka-actors - Akka Actors and STM Module + akka-core + Akka Actors, Remote Actors, Transactors and STM Module jar diff --git a/akka-actors/src/main/resources/META-INF/aop.xml b/akka-core/src/main/resources/META-INF/aop.xml similarity index 100% rename from akka-actors/src/main/resources/META-INF/aop.xml rename to akka-core/src/main/resources/META-INF/aop.xml diff --git a/akka-actors/src/main/scala/actor/ActiveObject.scala b/akka-core/src/main/scala/actor/ActiveObject.scala similarity index 100% rename from akka-actors/src/main/scala/actor/ActiveObject.scala rename to akka-core/src/main/scala/actor/ActiveObject.scala diff --git a/akka-actors/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala similarity index 100% rename from akka-actors/src/main/scala/actor/Actor.scala rename to akka-core/src/main/scala/actor/Actor.scala diff --git a/akka-actors/src/main/scala/actor/ActorRegistry.scala b/akka-core/src/main/scala/actor/ActorRegistry.scala similarity index 100% rename from akka-actors/src/main/scala/actor/ActorRegistry.scala rename to akka-core/src/main/scala/actor/ActorRegistry.scala diff --git a/akka-actors/src/main/scala/actor/Scheduler.scala b/akka-core/src/main/scala/actor/Scheduler.scala similarity index 100% rename from akka-actors/src/main/scala/actor/Scheduler.scala rename to akka-core/src/main/scala/actor/Scheduler.scala diff --git a/akka-actors/src/main/scala/actor/Supervisor.scala b/akka-core/src/main/scala/actor/Supervisor.scala similarity index 100% rename from akka-actors/src/main/scala/actor/Supervisor.scala rename to akka-core/src/main/scala/actor/Supervisor.scala diff --git a/akka-actors/src/main/scala/config/ActiveObjectConfigurator.scala b/akka-core/src/main/scala/config/ActiveObjectConfigurator.scala similarity index 100% rename from akka-actors/src/main/scala/config/ActiveObjectConfigurator.scala rename to akka-core/src/main/scala/config/ActiveObjectConfigurator.scala diff --git a/akka-actors/src/main/scala/config/ActiveObjectGuiceConfigurator.scala b/akka-core/src/main/scala/config/ActiveObjectGuiceConfigurator.scala similarity index 100% rename from akka-actors/src/main/scala/config/ActiveObjectGuiceConfigurator.scala rename to akka-core/src/main/scala/config/ActiveObjectGuiceConfigurator.scala diff --git a/akka-actors/src/main/scala/config/Config.scala b/akka-core/src/main/scala/config/Config.scala similarity index 100% rename from akka-actors/src/main/scala/config/Config.scala rename to akka-core/src/main/scala/config/Config.scala diff --git a/akka-actors/src/main/scala/config/Configuration.scala b/akka-core/src/main/scala/config/Configuration.scala similarity index 100% rename from akka-actors/src/main/scala/config/Configuration.scala rename to akka-core/src/main/scala/config/Configuration.scala diff --git a/akka-actors/src/main/scala/config/Configurator.scala b/akka-core/src/main/scala/config/Configurator.scala similarity index 100% rename from akka-actors/src/main/scala/config/Configurator.scala rename to akka-core/src/main/scala/config/Configurator.scala diff --git a/akka-actors/src/main/scala/config/ConfiguratorRepository.scala b/akka-core/src/main/scala/config/ConfiguratorRepository.scala similarity index 100% rename from akka-actors/src/main/scala/config/ConfiguratorRepository.scala rename to akka-core/src/main/scala/config/ConfiguratorRepository.scala diff --git a/akka-actors/src/main/scala/dispatch/AbstractReactorBasedEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/AbstractReactorBasedEventDrivenDispatcher.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/AbstractReactorBasedEventDrivenDispatcher.scala rename to akka-core/src/main/scala/dispatch/AbstractReactorBasedEventDrivenDispatcher.scala diff --git a/akka-actors/src/main/scala/dispatch/Dispatchers.scala b/akka-core/src/main/scala/dispatch/Dispatchers.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/Dispatchers.scala rename to akka-core/src/main/scala/dispatch/Dispatchers.scala diff --git a/akka-actors/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala rename to akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala diff --git a/akka-actors/src/main/scala/dispatch/Future.scala b/akka-core/src/main/scala/dispatch/Future.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/Future.scala rename to akka-core/src/main/scala/dispatch/Future.scala diff --git a/akka-actors/src/main/scala/dispatch/Reactor.scala b/akka-core/src/main/scala/dispatch/Reactor.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/Reactor.scala rename to akka-core/src/main/scala/dispatch/Reactor.scala diff --git a/akka-actors/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala rename to akka-core/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala diff --git a/akka-actors/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala rename to akka-core/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala diff --git a/akka-actors/src/main/scala/dispatch/ThreadBasedDispatcher.scala b/akka-core/src/main/scala/dispatch/ThreadBasedDispatcher.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/ThreadBasedDispatcher.scala rename to akka-core/src/main/scala/dispatch/ThreadBasedDispatcher.scala diff --git a/akka-actors/src/main/scala/dispatch/ThreadPoolBuilder.scala b/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala similarity index 100% rename from akka-actors/src/main/scala/dispatch/ThreadPoolBuilder.scala rename to akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala diff --git a/akka-actors/src/main/scala/remote/RemoteClient.scala b/akka-core/src/main/scala/remote/RemoteClient.scala similarity index 100% rename from akka-actors/src/main/scala/remote/RemoteClient.scala rename to akka-core/src/main/scala/remote/RemoteClient.scala diff --git a/akka-actors/src/main/scala/remote/RemoteProtocolBuilder.scala b/akka-core/src/main/scala/remote/RemoteProtocolBuilder.scala similarity index 100% rename from akka-actors/src/main/scala/remote/RemoteProtocolBuilder.scala rename to akka-core/src/main/scala/remote/RemoteProtocolBuilder.scala diff --git a/akka-actors/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala similarity index 100% rename from akka-actors/src/main/scala/remote/RemoteServer.scala rename to akka-core/src/main/scala/remote/RemoteServer.scala diff --git a/akka-actors/src/main/scala/remote/RequestReply.scala b/akka-core/src/main/scala/remote/RequestReply.scala similarity index 100% rename from akka-actors/src/main/scala/remote/RequestReply.scala rename to akka-core/src/main/scala/remote/RequestReply.scala diff --git a/akka-actors/src/main/scala/serialization/Binary.scala b/akka-core/src/main/scala/serialization/Binary.scala similarity index 100% rename from akka-actors/src/main/scala/serialization/Binary.scala rename to akka-core/src/main/scala/serialization/Binary.scala diff --git a/akka-actors/src/main/scala/serialization/Compression.scala b/akka-core/src/main/scala/serialization/Compression.scala similarity index 100% rename from akka-actors/src/main/scala/serialization/Compression.scala rename to akka-core/src/main/scala/serialization/Compression.scala diff --git a/akka-actors/src/main/scala/serialization/Serializable.scala b/akka-core/src/main/scala/serialization/Serializable.scala similarity index 100% rename from akka-actors/src/main/scala/serialization/Serializable.scala rename to akka-core/src/main/scala/serialization/Serializable.scala diff --git a/akka-actors/src/main/scala/serialization/Serializer.scala b/akka-core/src/main/scala/serialization/Serializer.scala similarity index 100% rename from akka-actors/src/main/scala/serialization/Serializer.scala rename to akka-core/src/main/scala/serialization/Serializer.scala diff --git a/akka-actors/src/main/scala/stm/DataFlowVariable.scala b/akka-core/src/main/scala/stm/DataFlowVariable.scala similarity index 100% rename from akka-actors/src/main/scala/stm/DataFlowVariable.scala rename to akka-core/src/main/scala/stm/DataFlowVariable.scala diff --git a/akka-actors/src/main/scala/stm/HashTrie.scala b/akka-core/src/main/scala/stm/HashTrie.scala similarity index 100% rename from akka-actors/src/main/scala/stm/HashTrie.scala rename to akka-core/src/main/scala/stm/HashTrie.scala diff --git a/akka-actors/src/main/scala/stm/ResultOrFailure.scala b/akka-core/src/main/scala/stm/ResultOrFailure.scala similarity index 100% rename from akka-actors/src/main/scala/stm/ResultOrFailure.scala rename to akka-core/src/main/scala/stm/ResultOrFailure.scala diff --git a/akka-actors/src/main/scala/stm/Transaction.scala b/akka-core/src/main/scala/stm/Transaction.scala similarity index 100% rename from akka-actors/src/main/scala/stm/Transaction.scala rename to akka-core/src/main/scala/stm/Transaction.scala diff --git a/akka-actors/src/main/scala/stm/TransactionManagement.scala b/akka-core/src/main/scala/stm/TransactionManagement.scala similarity index 100% rename from akka-actors/src/main/scala/stm/TransactionManagement.scala rename to akka-core/src/main/scala/stm/TransactionManagement.scala diff --git a/akka-actors/src/main/scala/stm/TransactionWatcher.scala b/akka-core/src/main/scala/stm/TransactionWatcher.scala similarity index 100% rename from akka-actors/src/main/scala/stm/TransactionWatcher.scala rename to akka-core/src/main/scala/stm/TransactionWatcher.scala diff --git a/akka-actors/src/main/scala/stm/TransactionalState.scala b/akka-core/src/main/scala/stm/TransactionalState.scala similarity index 100% rename from akka-actors/src/main/scala/stm/TransactionalState.scala rename to akka-core/src/main/scala/stm/TransactionalState.scala diff --git a/akka-actors/src/main/scala/stm/Vector.scala b/akka-core/src/main/scala/stm/Vector.scala similarity index 100% rename from akka-actors/src/main/scala/stm/Vector.scala rename to akka-core/src/main/scala/stm/Vector.scala diff --git a/akka-actors/src/test/scala/ActorFireForgetRequestReplyTest.scala b/akka-core/src/test/scala/ActorFireForgetRequestReplyTest.scala similarity index 100% rename from akka-actors/src/test/scala/ActorFireForgetRequestReplyTest.scala rename to akka-core/src/test/scala/ActorFireForgetRequestReplyTest.scala diff --git a/akka-actors/src/test/scala/AllSuite.scala b/akka-core/src/test/scala/AllSuite.scala similarity index 100% rename from akka-actors/src/test/scala/AllSuite.scala rename to akka-core/src/test/scala/AllSuite.scala diff --git a/akka-actors/src/test/scala/AllTest.scala b/akka-core/src/test/scala/AllTest.scala similarity index 100% rename from akka-actors/src/test/scala/AllTest.scala rename to akka-core/src/test/scala/AllTest.scala diff --git a/akka-actors/src/test/scala/ExecutorBasedEventDrivenDispatcherActorTest.scala b/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorTest.scala similarity index 100% rename from akka-actors/src/test/scala/ExecutorBasedEventDrivenDispatcherActorTest.scala rename to akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorTest.scala diff --git a/akka-actors/src/test/scala/InMemoryActorTest.scala b/akka-core/src/test/scala/InMemoryActorTest.scala similarity index 100% rename from akka-actors/src/test/scala/InMemoryActorTest.scala rename to akka-core/src/test/scala/InMemoryActorTest.scala diff --git a/akka-actors/src/test/scala/MemoryTest.scala b/akka-core/src/test/scala/MemoryTest.scala similarity index 100% rename from akka-actors/src/test/scala/MemoryTest.scala rename to akka-core/src/test/scala/MemoryTest.scala diff --git a/akka-actors/src/test/scala/Messages.scala b/akka-core/src/test/scala/Messages.scala similarity index 100% rename from akka-actors/src/test/scala/Messages.scala rename to akka-core/src/test/scala/Messages.scala diff --git a/akka-actors/src/test/scala/PerformanceTest.scala b/akka-core/src/test/scala/PerformanceTest.scala similarity index 100% rename from akka-actors/src/test/scala/PerformanceTest.scala rename to akka-core/src/test/scala/PerformanceTest.scala diff --git a/akka-actors/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorTest.scala b/akka-core/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorTest.scala similarity index 100% rename from akka-actors/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorTest.scala rename to akka-core/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorTest.scala diff --git a/akka-actors/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorTest.scala b/akka-core/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorTest.scala similarity index 100% rename from akka-actors/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorTest.scala rename to akka-core/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorTest.scala diff --git a/akka-actors/src/test/scala/RemoteActorTest.scala b/akka-core/src/test/scala/RemoteActorTest.scala similarity index 100% rename from akka-actors/src/test/scala/RemoteActorTest.scala rename to akka-core/src/test/scala/RemoteActorTest.scala diff --git a/akka-actors/src/test/scala/RemoteSupervisorTest.scala b/akka-core/src/test/scala/RemoteSupervisorTest.scala similarity index 100% rename from akka-actors/src/test/scala/RemoteSupervisorTest.scala rename to akka-core/src/test/scala/RemoteSupervisorTest.scala diff --git a/akka-actors/src/test/scala/SchedulerTest.scala b/akka-core/src/test/scala/SchedulerTest.scala similarity index 100% rename from akka-actors/src/test/scala/SchedulerTest.scala rename to akka-core/src/test/scala/SchedulerTest.scala diff --git a/akka-actors/src/test/scala/SupervisorTest.scala b/akka-core/src/test/scala/SupervisorTest.scala similarity index 100% rename from akka-actors/src/test/scala/SupervisorTest.scala rename to akka-core/src/test/scala/SupervisorTest.scala diff --git a/akka-actors/src/test/scala/ThreadBasedActorTest.scala b/akka-core/src/test/scala/ThreadBasedActorTest.scala similarity index 100% rename from akka-actors/src/test/scala/ThreadBasedActorTest.scala rename to akka-core/src/test/scala/ThreadBasedActorTest.scala diff --git a/akka-actors/src/test/scala/ThreadBasedDispatcherTest.scala b/akka-core/src/test/scala/ThreadBasedDispatcherTest.scala similarity index 100% rename from akka-actors/src/test/scala/ThreadBasedDispatcherTest.scala rename to akka-core/src/test/scala/ThreadBasedDispatcherTest.scala diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml index 4edc8ee5bf..a6d0c801a6 100755 --- a/akka-kernel/pom.xml +++ b/akka-kernel/pom.xml @@ -18,7 +18,7 @@ - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-persistence/pom.xml b/akka-persistence/pom.xml index e85bf912b3..6f0355b6f5 100644 --- a/akka-persistence/pom.xml +++ b/akka-persistence/pom.xml @@ -21,7 +21,7 @@ ${project.version} - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-rest/pom.xml b/akka-rest/pom.xml index 85f42b4aba..834de3aca8 100644 --- a/akka-rest/pom.xml +++ b/akka-rest/pom.xml @@ -23,7 +23,7 @@ ${project.version} - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-samples-java/pom.xml b/akka-samples-java/pom.xml index 9eb36bc01d..8dc34d9349 100644 --- a/akka-samples-java/pom.xml +++ b/akka-samples-java/pom.xml @@ -26,7 +26,7 @@ ${project.version} - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-samples-lift/pom.xml b/akka-samples-lift/pom.xml index ef47434b1a..7d4f292166 100644 --- a/akka-samples-lift/pom.xml +++ b/akka-samples-lift/pom.xml @@ -30,7 +30,7 @@ ${project.version} - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-samples-scala/pom.xml b/akka-samples-scala/pom.xml index 9739f3a07b..0d1658d315 100644 --- a/akka-samples-scala/pom.xml +++ b/akka-samples-scala/pom.xml @@ -26,7 +26,7 @@ ${project.version} - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-samples-security/pom.xml b/akka-samples-security/pom.xml index 5a3bd9adb8..f2374a8c23 100644 --- a/akka-samples-security/pom.xml +++ b/akka-samples-security/pom.xml @@ -31,7 +31,7 @@ ${project.version} - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/akka-security/pom.xml b/akka-security/pom.xml index 8758508fdd..2ef5d73531 100644 --- a/akka-security/pom.xml +++ b/akka-security/pom.xml @@ -26,7 +26,7 @@ ${project.version} --> - akka-actors + akka-core ${project.groupId} ${project.version} diff --git a/pom.xml b/pom.xml index 150dd4edba..8632352087 100755 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ akka-util-java akka-util - akka-actors + akka-core akka-persistence akka-rest akka-amqp