From dc89cd189f0f13df34bbd75b9fc0b1a35a90ae1a Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 5 Apr 2010 13:31:39 +0200 Subject: [PATCH] Changed module name, packagename and classnames :-) --- akka-kernel/src/main/scala/Kernel.scala | 2 +- .../src/main/scala/AkkaLoader.scala | 2 +- .../src/main/scala/Imitializer.scala | 12 ++++++++++-- project/build/AkkaProject.scala | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) rename {akka-jxee => akka-servlet}/src/main/scala/AkkaLoader.scala (97%) rename akka-jxee/src/main/scala/Jxee.scala => akka-servlet/src/main/scala/Imitializer.scala (76%) diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala index a4aa898088..cd343ebaca 100644 --- a/akka-kernel/src/main/scala/Kernel.scala +++ b/akka-kernel/src/main/scala/Kernel.scala @@ -4,7 +4,7 @@ package se.scalablesolutions.akka.kernel -import se.scalablesolutions.akka.jxee.AkkaLoader +import se.scalablesolutions.akka.servlet.AkkaLoader import se.scalablesolutions.akka.remote.BootableRemoteActorService import se.scalablesolutions.akka.comet.BootableCometActorService import se.scalablesolutions.akka.actor.BootableActorLoaderService diff --git a/akka-jxee/src/main/scala/AkkaLoader.scala b/akka-servlet/src/main/scala/AkkaLoader.scala similarity index 97% rename from akka-jxee/src/main/scala/AkkaLoader.scala rename to akka-servlet/src/main/scala/AkkaLoader.scala index de0c2d8e16..3d9af36dfd 100644 --- a/akka-jxee/src/main/scala/AkkaLoader.scala +++ b/akka-servlet/src/main/scala/AkkaLoader.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2010 Scalable Solutions AB */ -package se.scalablesolutions.akka.jxee +package se.scalablesolutions.akka.servlet import se.scalablesolutions.akka.config.Config import se.scalablesolutions.akka.util.{Logging, Bootable} diff --git a/akka-jxee/src/main/scala/Jxee.scala b/akka-servlet/src/main/scala/Imitializer.scala similarity index 76% rename from akka-jxee/src/main/scala/Jxee.scala rename to akka-servlet/src/main/scala/Imitializer.scala index f3c110d13e..809d5ec743 100644 --- a/akka-jxee/src/main/scala/Jxee.scala +++ b/akka-servlet/src/main/scala/Imitializer.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2010 Scalable Solutions AB */ -package se.scalablesolutions.akka.jxee +package se.scalablesolutions.akka.servlet import se.scalablesolutions.akka.remote.BootableRemoteActorService import se.scalablesolutions.akka.actor.BootableActorLoaderService @@ -14,8 +14,16 @@ import javax.servlet.{ServletContextListener, ServletContextEvent} /** * This class can be added to web.xml mappings as a listener to start and shutdown Akka. + * + * + * ... + * + * se.scalablesolutions.akka.servlet.Initializer + * + * ... + * */ -class AkkaJxEELifecycle extends ServletContextListener { +class Initializer extends ServletContextListener { lazy val loader = new AkkaLoader def contextDestroyed(e: ServletContextEvent): Unit = diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index d602468613..b0bdb4ab10 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -97,11 +97,11 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { lazy val akka_persistence = project("akka-persistence", "akka-persistence", new AkkaPersistenceParentProject(_)) lazy val akka_cluster = project("akka-cluster", "akka-cluster", new AkkaClusterParentProject(_)) lazy val akka_spring = project("akka-spring", "akka-spring", new AkkaSpringProject(_), akka_core) - lazy val akka_jxee = project("akka-jxee", "akka-jxee", new AkkaJxeeProject(_), + 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_jxee) + akka_cluster, akka_amqp, akka_security, akka_comet, akka_patterns, akka_servlet) // functional tests in java lazy val akka_fun_test = project("akka-fun-test-java", "akka-fun-test-java", new AkkaFunTestProject(_), akka_kernel) @@ -143,7 +143,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { " 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-jxee_%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) ) @@ -325,7 +325,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { new AkkaShoalProject(_), akka_core) } - class AkkaJxeeProject(info: ProjectInfo) extends DefaultProject(info) { + class AkkaServletProject(info: ProjectInfo) extends DefaultProject(info) { lazy val dist = deployTask(info, distPath, true, true, true) dependsOn(`package`, packageDocs, packageSrc) describedAs("Deploying") }