diff --git a/akka-rest/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME b/akka-http/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME similarity index 100% rename from akka-rest/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME rename to akka-http/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME diff --git a/akka-rest/src/main/scala/ActorComponentProvider.scala b/akka-http/src/main/scala/ActorComponentProvider.scala similarity index 100% rename from akka-rest/src/main/scala/ActorComponentProvider.scala rename to akka-http/src/main/scala/ActorComponentProvider.scala diff --git a/akka-rest/src/main/scala/ActorComponentProviderFactory.scala b/akka-http/src/main/scala/ActorComponentProviderFactory.scala similarity index 100% rename from akka-rest/src/main/scala/ActorComponentProviderFactory.scala rename to akka-http/src/main/scala/ActorComponentProviderFactory.scala diff --git a/akka-comet/src/main/scala/AkkaBroadcaster.scala b/akka-http/src/main/scala/AkkaBroadcaster.scala similarity index 100% rename from akka-comet/src/main/scala/AkkaBroadcaster.scala rename to akka-http/src/main/scala/AkkaBroadcaster.scala diff --git a/akka-comet/src/main/scala/AkkaClusterBroadcastFilter.scala b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala similarity index 100% rename from akka-comet/src/main/scala/AkkaClusterBroadcastFilter.scala rename to akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala diff --git a/akka-comet/src/main/scala/AkkaServlet.scala b/akka-http/src/main/scala/AkkaCometServlet.scala similarity index 100% rename from akka-comet/src/main/scala/AkkaServlet.scala rename to akka-http/src/main/scala/AkkaCometServlet.scala diff --git a/akka-servlet/src/main/scala/AkkaLoader.scala b/akka-http/src/main/scala/AkkaLoader.scala similarity index 100% rename from akka-servlet/src/main/scala/AkkaLoader.scala rename to akka-http/src/main/scala/AkkaLoader.scala diff --git a/akka-rest/src/main/scala/AkkaServlet.scala b/akka-http/src/main/scala/AkkaServlet.scala similarity index 100% rename from akka-rest/src/main/scala/AkkaServlet.scala rename to akka-http/src/main/scala/AkkaServlet.scala diff --git a/akka-comet/src/main/scala/BootableCometActorService.scala b/akka-http/src/main/scala/BootableCometActorService.scala similarity index 100% rename from akka-comet/src/main/scala/BootableCometActorService.scala rename to akka-http/src/main/scala/BootableCometActorService.scala diff --git a/akka-servlet/src/main/scala/Initializer.scala b/akka-http/src/main/scala/Initializer.scala similarity index 100% rename from akka-servlet/src/main/scala/Initializer.scala rename to akka-http/src/main/scala/Initializer.scala diff --git a/akka-rest/src/main/scala/ListWriter.scala b/akka-http/src/main/scala/ListWriter.scala similarity index 100% rename from akka-rest/src/main/scala/ListWriter.scala rename to akka-http/src/main/scala/ListWriter.scala diff --git a/akka-security/src/main/scala/Security.scala b/akka-http/src/main/scala/Security.scala similarity index 100% rename from akka-security/src/main/scala/Security.scala rename to akka-http/src/main/scala/Security.scala diff --git a/akka-security/src/test/scala/AllTest.scala b/akka-http/src/test/scala/AllTest.scala similarity index 100% rename from akka-security/src/test/scala/AllTest.scala rename to akka-http/src/test/scala/AllTest.scala diff --git a/akka-security/src/test/scala/SecuritySpec.scala b/akka-http/src/test/scala/SecuritySpec.scala similarity index 100% rename from akka-security/src/test/scala/SecuritySpec.scala rename to akka-http/src/test/scala/SecuritySpec.scala diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 6d317e5f08..a2831b852b 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -53,20 +53,16 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { 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_amqp = project("akka-amqp", "akka-amqp", new AkkaAMQPProject(_), akka_core) - lazy val akka_rest = project("akka-rest", "akka-rest", new AkkaRestProject(_), akka_core) - lazy val akka_comet = project("akka-comet", "akka-comet", new AkkaCometProject(_), akka_rest) + 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) lazy val akka_patterns = project("akka-patterns", "akka-patterns", new AkkaPatternsProject(_), akka_core) - lazy val akka_security = project("akka-security", "akka-security", new AkkaSecurityProject(_), akka_core) lazy val akka_persistence = project("akka-persistence", "akka-persistence", new AkkaPersistenceParentProject(_)) lazy val akka_cluster = project("akka-cluster", "akka-cluster", new AkkaClusterProject(_), akka_core) lazy val akka_spring = project("akka-spring", "akka-spring", new AkkaSpringProject(_), akka_core) lazy val akka_jta = project("akka-jta", "akka-jta", new AkkaJTAProject(_), akka_core) - lazy val akka_servlet = project("akka-servlet", "akka-servlet", new AkkaServletProject(_), - akka_core, akka_rest, akka_camel) lazy val akka_kernel = project("akka-kernel", "akka-kernel", new AkkaKernelProject(_), - akka_core, akka_rest, akka_spring, akka_camel, akka_persistence, - akka_cluster, akka_amqp, akka_security, akka_comet, akka_patterns, akka_servlet) + akka_core, akka_http, akka_spring, akka_camel, akka_persistence, + akka_cluster, akka_amqp, akka_patterns) // functional tests in java lazy val akka_fun_test = project("akka-fun-test-java", "akka-fun-test-java", new AkkaFunTestProject(_), akka_kernel) @@ -97,17 +93,14 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { " 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-rest_%s-%s.jar".format(buildScalaVersion, version) + - " dist/akka-comet_%s-%s.jar".format(buildScalaVersion, version) + + " dist/akka-http_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-camel_%s-%s.jar".format(buildScalaVersion, version) + - " dist/akka-security_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-amqp_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-patterns_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-persistence-common_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-persistence-redis_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-persistence-mongo_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-persistence-cassandra_%s-%s.jar".format(buildScalaVersion, version) + - " dist/akka-servlet_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-kernel_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-spring_%s-%s.jar".format(buildScalaVersion, version) + " dist/akka-jta_%s-%s.jar".format(buildScalaVersion, version) @@ -180,7 +173,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { val rabbit = "com.rabbitmq" % "amqp-client" % "1.7.2" % "compile" } - class AkkaRestProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { + class AkkaHttpProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val jackson_core_asl = "org.codehaus.jackson" % "jackson-core-asl" % "1.2.1" % "compile" val stax_api = "javax.xml.stream" % "stax-api" % "1.0-2" % "compile" val servlet = "javax.servlet" % "servlet-api" % "2.5" % "compile" @@ -189,14 +182,19 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { val jersey_json = "com.sun.jersey" % "jersey-json" % JERSEY_VERSION % "compile" val jersey_contrib = "com.sun.jersey.contribs" % "jersey-scala" % JERSEY_VERSION % "compile" val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" - } - - class AkkaCometProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val grizzly = "com.sun.grizzly" % "grizzly-comet-webserver" % "1.9.18-i" % "compile" - val servlet = "javax.servlet" % "servlet-api" % "2.5" % "compile" val atmo = "org.atmosphere" % "atmosphere-annotations" % ATMO_VERSION % "compile" val atmo_jersey = "org.atmosphere" % "atmosphere-jersey" % ATMO_VERSION % "compile" val atmo_runtime = "org.atmosphere" % "atmosphere-runtime" % ATMO_VERSION % "compile" + val commons_logging = "commons-logging" % "commons-logging" % "1.1.1" % "compile" + val annotation = "javax.annotation" % "jsr250-api" % "1.0" % "compile" + val lift_common = "net.liftweb" % "lift-common" % LIFT_VERSION % "compile" + val lift_util = "net.liftweb" % "lift-util" % LIFT_VERSION % "compile" + + // testing + val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test" + val junit = "junit" % "junit" % "4.5" % "test" + val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" } class AkkaCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { @@ -209,19 +207,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { val junit = "junit" % "junit" % "4.5" % "test" } - class AkkaSecurityProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { - val commons_logging = "commons-logging" % "commons-logging" % "1.1.1" % "compile" - val annotation = "javax.annotation" % "jsr250-api" % "1.0" % "compile" - val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" - val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" - val lift_common = "net.liftweb" % "lift-common" % LIFT_VERSION % "compile" - val lift_util = "net.liftweb" % "lift-util" % LIFT_VERSION % "compile" - // testing - val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test" - val junit = "junit" % "junit" % "4.5" % "test" - val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" - } - class AkkaPersistenceCommonProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val thrift = "com.facebook" % "thrift" % "1.0" % "compile" val commons_pool = "commons-pool" % "commons-pool" % "1.5.4" % "compile" @@ -265,8 +250,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { val jgroups = "jgroups" % "jgroups" % "2.8.0.CR7" % "compile" } - class AkkaServletProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) - class AkkaKernelProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) class AkkaSpringProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {