diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/configuration.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/configuration.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/consume.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/consume.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/consume.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/consume.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/immutable.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/immutable.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/immutable.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/immutable.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/inittransactionalstate.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/inittransactionalstate.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/inittransactionalstate.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/inittransactionalstate.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/oneway.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/oneway.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/oneway.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/oneway.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/postrestart.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/postrestart.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/postrestart.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/postrestart.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/prerestart.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/prerestart.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/prerestart.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/prerestart.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/state.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/state.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/state.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/state.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/transactionrequired.java b/akka-core/src/main/java/se/scalablesolutions/akka/annotation/transactionrequired.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/transactionrequired.java rename to akka-core/src/main/java/se/scalablesolutions/akka/annotation/transactionrequired.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/config/ActiveObjectGuiceModule.java b/akka-core/src/main/java/se/scalablesolutions/akka/config/ActiveObjectGuiceModule.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/config/ActiveObjectGuiceModule.java rename to akka-core/src/main/java/se/scalablesolutions/akka/config/ActiveObjectGuiceModule.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java b/akka-core/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java rename to akka-core/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.java b/akka-core/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.java similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.java rename to akka-core/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.java diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto b/akka-core/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto similarity index 100% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto rename to akka-core/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto diff --git a/akka-util/src/main/scala/Bootable.scala b/akka-core/src/main/scala/util/Bootable.scala similarity index 100% rename from akka-util/src/main/scala/Bootable.scala rename to akka-core/src/main/scala/util/Bootable.scala diff --git a/akka-util/src/main/scala/HashCode.scala b/akka-core/src/main/scala/util/HashCode.scala similarity index 100% rename from akka-util/src/main/scala/HashCode.scala rename to akka-core/src/main/scala/util/HashCode.scala diff --git a/akka-util/src/main/scala/Helpers.scala b/akka-core/src/main/scala/util/Helpers.scala similarity index 100% rename from akka-util/src/main/scala/Helpers.scala rename to akka-core/src/main/scala/util/Helpers.scala diff --git a/akka-util/src/main/scala/Logging.scala b/akka-core/src/main/scala/util/Logging.scala similarity index 100% rename from akka-util/src/main/scala/Logging.scala rename to akka-core/src/main/scala/util/Logging.scala diff --git a/akka-util/src/main/scala/Uuid.scala b/akka-core/src/main/scala/util/Uuid.scala similarity index 100% rename from akka-util/src/main/scala/Uuid.scala rename to akka-core/src/main/scala/util/Uuid.scala diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 7a72ba55c9..f96ff598e8 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -51,9 +51,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { // ------------------------------------------------------------ // project defintions - lazy val akka_java_util = project("akka-util-java", "akka-util-java", new AkkaJavaUtilProject(_)) - lazy val akka_util = project("akka-util", "akka-util", new AkkaUtilProject(_)) - lazy val akka_core = project("akka-core", "akka-core", new AkkaCoreProject(_), akka_util, akka_java_util) + lazy val akka_core = project("akka-core", "akka-core", new AkkaCoreProject(_)) lazy val akka_amqp = project("akka-amqp", "akka-amqp", new AkkaAMQPProject(_), akka_core) lazy val akka_http = project("akka-http", "akka-http", new AkkaHttpProject(_), akka_core, akka_camel) lazy val akka_camel = project("akka-camel", "akka-camel", new AkkaCamelProject(_), akka_core) @@ -90,8 +88,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { .map("lib_managed/scala_%s/compile/".format(buildScalaVersion) + _.getName) .mkString(" ") + " scala-library.jar" + - " dist/akka-util_%s-%s.jar".format(buildScalaVersion, version) + - " dist/akka-util-java_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-core_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-cluster%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-http_%s-%s.jar".format(buildScalaVersion, version) + @@ -151,21 +147,16 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { val h2_lzf = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile" val jsr166x = "jsr166x" % "jsr166x" % "1.0" % "compile" val jta_1_1 = "org.apache.geronimo.specs" % "geronimo-jta_1.1_spec" % "1.1.1" % "compile" - // testing - val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test" - val junit = "junit" % "junit" % "4.5" % "test" - } - - class AkkaUtilProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val werkz = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % "2.1" % "compile" val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % "2.1" % "compile" val configgy = "net.lag" % "configgy" % "2.8.0.Beta1-1.5-SNAPSHOT" % "compile" - } - - class AkkaJavaUtilProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val guicey = "org.guiceyfruit" % "guice-core" % "2.0-beta-4" % "compile" val protobuf = "com.google.protobuf" % "protobuf-java" % "2.2.0" % "compile" val multiverse = "org.multiverse" % "multiverse-alpha" % "0.5" % "compile" + + // testing + val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test" + val junit = "junit" % "junit" % "4.5" % "test" } class AkkaAMQPProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {