diff --git a/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.jar b/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.jar old mode 100644 new mode 100755 diff --git a/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.pom b/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.pom index 8b158c6808..bb23e206eb 100644 --- a/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.pom +++ b/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.pom @@ -1,8 +1,8 @@ - - - 4.0.0 - org.apache.cassandra - cassandra - 0.4.0-dev - jar + + + 4.0.0 + org.apache.cassandra + cassandra + 0.4.0-dev + jar \ No newline at end of file diff --git a/embedded-repo/org/apache/cassandra/cassandra/0.4.0-trunk/cassandra-0.4.0-trunk.jar b/embedded-repo/org/apache/cassandra/cassandra/0.4.0-trunk/cassandra-0.4.0-trunk.jar new file mode 100755 index 0000000000..44796086be Binary files /dev/null and b/embedded-repo/org/apache/cassandra/cassandra/0.4.0-trunk/cassandra-0.4.0-trunk.jar differ diff --git a/embedded-repo/org/apache/cassandra/cassandra/0.4.0-trunk/cassandra-0.4.0-trunk.pom b/embedded-repo/org/apache/cassandra/cassandra/0.4.0-trunk/cassandra-0.4.0-trunk.pom new file mode 100755 index 0000000000..9ef43c31cd --- /dev/null +++ b/embedded-repo/org/apache/cassandra/cassandra/0.4.0-trunk/cassandra-0.4.0-trunk.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + org.apache.cassandra + cassandra + 0.4.0-trunk + jar + \ No newline at end of file diff --git a/embedded-repo/org/apache/zookeeper/3.1.0/zookeeper-3.1.0.pom b/embedded-repo/org/apache/zookeeper/3.1.0/zookeeper-3.1.0.pom old mode 100644 new mode 100755 diff --git a/fun-test-java/pom.xml b/fun-test-java/pom.xml index 7e5a4fb729..36a4890ec7 100644 --- a/fun-test-java/pom.xml +++ b/fun-test-java/pom.xml @@ -65,7 +65,7 @@ - src/main + src/main/java src/test/java @@ -84,7 +84,6 @@ maven-surefire-plugin - **/Abstract* **/*Persistent* diff --git a/kernel/pom.xml b/kernel/pom.xml index 6a59a23632..43324bf14c 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -12,6 +12,7 @@ akka se.scalablesolutions.akka 0.5 + ../pom.xml @@ -41,11 +42,11 @@ configgy 1.3 - + org.guiceyfruit guice-core @@ -103,7 +104,7 @@ org.apache.cassandra cassandra - 0.4.0-dev + 0.4.0-trunk com.facebook @@ -115,7 +116,7 @@ fb303 1.0 - + + commons-pool commons-pool 1.5.1 - + com.sun.grizzly grizzly-comet-webserver @@ -208,74 +208,16 @@ 0.9.5 test - junit junit 4.5 test - - com.sun.jersey - jersey-client - 1.1.0-ea - - src/main/scala - src/test/scala - - org.scala-tools - maven-scala-plugin - - - - compile - testCompile - - - - - - -target:jvm-1.5 - - - 2.7.5 - 1.1 - - - - org.apache.maven.plugins - maven-eclipse-plugin - - true - - - ch.epfl.lamp.sdt.core.scalabuilder - - - - - ch.epfl.lamp.sdt.core.scalanature - - - - - org.eclipse.jdt.launching.JRE_CONTAINER - - - ch.epfl.lamp.sdt.launching.SCALA_CONTAINER - - - - maven-antrun-plugin @@ -294,33 +236,5 @@ - - - false - src/main/resources - - - false - src/main/scala - - ** - - - **/*.scala - - - - - - - org.scala-tools - maven-scala-plugin - - 1.1 - ${scala.version} - - - - diff --git a/kernel/src/main/scala/Kernel.scala b/kernel/src/main/scala/Kernel.scala index a17a59ad20..9ea0a46fb2 100644 --- a/kernel/src/main/scala/Kernel.scala +++ b/kernel/src/main/scala/Kernel.scala @@ -24,10 +24,15 @@ import kernel.management.Management * @author Jonas Bonér */ object Kernel extends Logging { - Boot.HOME val version = "0.6" - val config = setupConfig + val HOME = { + val home = System.getenv("AKKA_HOME") + if (home == null) None + else Some(home) + } + val config = setupConfig + val BOOT_CLASSES = config.getList("akka.boot") val RUN_REMOTE_SERVICE = config.getBool("akka.remote.service", true) val RUN_MANAGEMENT_SERVICE = config.getBool("akka.management.service", true) @@ -93,10 +98,8 @@ object Kernel extends Logging { case e: ParseException => throw new IllegalStateException("AKKA_HOME is not defined and no 'akka.conf' can be found on the classpath, aborting") } } - //val runtime = new RuntimeEnvironment(getClass) - //runtime.load(args) val config = Configgy.config - config.registerWithJmx("com.scalablesolutions.akka.config") + config.registerWithJmx("com.scalablesolutions.akka") // FIXME fix Configgy JMX subscription to allow management // config.subscribe { c => configure(c.getOrElse(new Config)) } config @@ -104,19 +107,20 @@ object Kernel extends Logging { private[akka] def runApplicationBootClasses = { new management.RestfulJMXBoot // add the REST/JMX service - val HOME = try { System.getenv("AKKA_HOME") } catch { case e: NullPointerException => throw new IllegalStateException("AKKA_HOME system variable needs to be set. Should point to the root of the Akka distribution.") } - //val CLASSES = HOME + "/kernel/target/classes" // FIXME remove for dist - //val LIB = HOME + "/lib" - val CONFIG = HOME + "/config" - val DEPLOY = HOME + "/deploy" - val DEPLOY_DIR = new File(DEPLOY) - if (!DEPLOY_DIR.exists) { log.error("Could not find a deploy directory at [" + DEPLOY + "]"); System.exit(-1) } - val toDeploy = for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL - log.info("Deploying applications from [%s]: [%s]", DEPLOY, toDeploy.toArray.toList) - val loader = new URLClassLoader(toDeploy.toArray, getClass.getClassLoader) - if (BOOT_CLASSES.isEmpty) throw new IllegalStateException("No boot class specificed. Add an application boot class to the 'akka.conf' file such as 'boot = \"com.biz.myapp.Boot\"") + val loader = + if (getClass.getClassLoader.getResourceAsStream("akka.conf") != null) getClass.getClassLoader + else if (HOME.isDefined) { + val CONFIG = HOME.get + "/config" + val DEPLOY = HOME.get + "/deploy" + val DEPLOY_DIR = new File(DEPLOY) + if (!DEPLOY_DIR.exists) { log.error("Could not find a deploy directory at [" + DEPLOY + "]"); System.exit(-1) } + val toDeploy = for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL + log.info("Deploying applications from [%s]: [%s]", DEPLOY, toDeploy.toArray.toList) + new URLClassLoader(toDeploy.toArray, getClass.getClassLoader) + } else throw new IllegalStateException("AKKA_HOME is not defined and no 'akka.conf' can be found on the classpath, aborting") for (clazz <- BOOT_CLASSES) { log.info("Loading boot class [%s]", clazz) + log.info("--------------- LOADER [%s]", loader) loader.loadClass(clazz).newInstance } applicationLoader = Some(loader) diff --git a/kernel/src/test/scala/JerseySpec.scala b/kernel/src/test/scala/JerseySpec.scala deleted file mode 100644 index 5f0147ea02..0000000000 --- a/kernel/src/test/scala/JerseySpec.scala +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright (C) 2009 Scalable Solutions. - */ - -package se.scalablesolutions.akka.kernel - -import akka.kernel.config.ActiveObjectGuiceConfigurator -import kernel.config.ScalaConfig._ - -import com.sun.grizzly.http.SelectorThread -import com.sun.jersey.api.client.Client -import com.sun.jersey.core.header.MediaTypes -import com.sun.jersey.api.container.grizzly.GrizzlyWebContainerFactory -import javax.ws.rs.core.UriBuilder -import javax.ws.rs.{Produces, Path, GET} - -import com.google.inject.{AbstractModule, Scopes} - -import org.scalatest.Spec -import org.scalatest.matchers.ShouldMatchers - -//simport com.jteigen.scalatest.JUnit4Runner -import org.junit.runner.RunWith -import org.junit.Test -import org.junit.Assert._ - -/** - * @author Jonas Bonér - */ -//@RunWith(classOf[JUnit4Runner]) -class JerseySpec extends Spec with ShouldMatchers { - - describe("A Jersey REST service") { - it("should ...") { - /* - val selector = startJersey - selector.start - val conf = new ActiveObjectGuiceConfigurator - conf.configure( - RestartStrategy(AllForOne, 3, 5000), - Component( - classOf[resource.JerseyFoo], - LifeCycle(Permanent, 1000), - 1000) :: - Nil).supervise - - conf.getInstance(classOf[resource.JerseyFoo]) - */ - - /* - val client = Client.create - val webResource = client.resource(UriBuilder.fromUri("http://localhost/").port(9998).build) - //val webResource = client.resource("http://localhost:9998/foo") - val responseMsg = webResource.get(classOf[String]) - responseMsg should equal ("Hello World") - selector.stopEndpoint - */ - } - } - - def startJersey: SelectorThread = { - val initParams = new java.util.HashMap[String, String] - initParams.put("com.sun.jersey.config.property.packages", "se.scalablesolutions.akka.kernel") - GrizzlyWebContainerFactory.create(UriBuilder.fromUri("http://localhost/").port(9998).build(), initParams) - } -} - -// @GET -// @Produces("application/json") -// @Path("/network/{id: [0-9]+}/{nid}") -// def getUserByNetworkId(@PathParam {val value = "id"} id: Int, @PathParam {val value = "nid"} networkId: String): User = { -// val q = em.createQuery("SELECT u FROM User u WHERE u.networkId = :id AND u.networkUserId = :nid") -// q.setParameter("id", id) -// q.setParameter("nid", networkId) -// q.getSingleResult.asInstanceOf[User] -// } - -package resource { - import javax.ws.rs.{Produces, Path, GET} - - class JerseyFoo { - @GET - @Produces(Array("application/json")) - def foo: String = { val ret = "JerseyFoo.foo"; println(ret); ret } - } - @Path("/foo") - class JerseyFooSub extends JerseyFoo - class JerseyBar { - def bar(msg: String) = msg + "return_bar " - } -} diff --git a/lib/guice-jsr250-2.0-SNAPSHOT.jar b/lib/guice-jsr250-2.0-SNAPSHOT.jar deleted file mode 100644 index f2be8ad48d..0000000000 Binary files a/lib/guice-jsr250-2.0-SNAPSHOT.jar and /dev/null differ diff --git a/lib/high-scale-lib.jar b/lib/high-scale-lib.jar deleted file mode 100644 index 421a436eed..0000000000 Binary files a/lib/high-scale-lib.jar and /dev/null differ diff --git a/lib/jersey-client-1.1.1-ea.jar b/lib/jersey-client-1.1.1-ea.jar deleted file mode 100644 index fae00c4665..0000000000 Binary files a/lib/jersey-client-1.1.1-ea.jar and /dev/null differ diff --git a/lib/jsr250-api-1.0.jar b/lib/jsr250-api-1.0.jar deleted file mode 100644 index c1f29bf844..0000000000 Binary files a/lib/jsr250-api-1.0.jar and /dev/null differ diff --git a/lib/junit-4.5.jar b/lib/junit-4.5.jar deleted file mode 100644 index 733921623d..0000000000 Binary files a/lib/junit-4.5.jar and /dev/null differ diff --git a/lib/junit4runner-1.0.jar b/lib/junit4runner-1.0.jar deleted file mode 100644 index 6f91bd8044..0000000000 Binary files a/lib/junit4runner-1.0.jar and /dev/null differ diff --git a/lib/scalatest-0.9.5.jar b/lib/scalatest-0.9.5.jar deleted file mode 100644 index adb241a55a..0000000000 Binary files a/lib/scalatest-0.9.5.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index f321ff0e88..eee1a6a2dd 100644 --- a/pom.xml +++ b/pom.xml @@ -117,6 +117,11 @@ false + + guice-maven + guice maven + http://guice-maven.googlecode.com/svn/trunk + google-maven-repository Google Maven Repository @@ -141,6 +146,10 @@ + + onejar-maven-plugin.googlecode.com + http://onejar-maven-plugin.googlecode.com/svn/mavenrepo + scala-tools.org Scala-Tools Maven2 Repository @@ -149,7 +158,24 @@ + src/main/scala + src/test/scala + + + org.apache.maven.wagon + wagon-webdav + 1.0-beta-2 + + + + org.mortbay.jetty + maven-jetty-plugin + + / + 5 + + org.apache.maven.plugins maven-antrun-plugin @@ -183,7 +209,236 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + org.scala-tools + maven-scala-plugin + 2.10.1 + + + + compile + testCompile + + + + + + -Xmx1024m + + + + -deprecation + -Xno-varargs-conversion + + ${scala.version} + + + + true + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-changes-plugin + 2.0 + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + ${pom.version} + + + + + + + + false + config + + akka.conf + akka-reference.conf + + + + + + + org.apache.felix + maven-bundle-plugin + 2.0.0 + true + + + J2SE-1.5 + <_versionpolicy>[$(@),$(version;=+;$(@))) + + + + + create-bundle + package + + bundle + + + + bundle-install + install + + install + + + + + + - + + + + maven-project-info-reports-plugin + + + org.scala-tools + maven-scala-plugin + 2.9 + + + -Xmx1024m + -DpackageLinkDefs=file://${basedir}/../vscaladocs-packageLinkDefs.properties + + + -unchecked + 1.2-SNAPSHOT + ${scala.version} + + + + org.apache.maven.plugins + maven-changes-plugin + 2.0-beta-3 + + + + changes-report + + + + + ${basedir}/src/changes/changes.xml + + + + maven-surefire-report-plugin + + + + + report-only + + + + + + + + + + + release + + + + scala-tools.org + http://nexus.scala-tools.org/content/repositories/releases + + + scala-tools.org + file://${user.home}/.m2/mvnsites/akka + + + + + hudson + + + hudson.scala-tools.org + file:///home/scala-tools.org/www/repo-snapshots + + + hudson.scala-tools.org + file:///home/scala-tools.org/www/repo-snapshots + false + + + hudson.scala-tools.org + file:///home/scala-tools.org/www/mvnsites-snapshots/akka + + + + diff --git a/samples-java/pom.xml b/samples-java/pom.xml index 9a230ab94a..fc6c4840f9 100644 --- a/samples-java/pom.xml +++ b/samples-java/pom.xml @@ -11,6 +11,7 @@ akka se.scalablesolutions.akka 0.5 + ../pom.xml diff --git a/samples-lift/pom.xml b/samples-lift/pom.xml index 220dd37cd5..a26ade154e 100644 --- a/samples-lift/pom.xml +++ b/samples-lift/pom.xml @@ -11,108 +11,14 @@ akka se.scalablesolutions.akka 0.5 + ../pom.xml 1.1-SNAPSHOT - - - repo1.maven - Maven Main Repository - http://repo1.maven.org/maven2 - - - project.embedded.module - Project Embedded Repository - file://${basedir}/../embedded-repo - - - scala-tools-snapshots - Scala-Tools Maven2 Snapshot Repository - http://scala-tools.org/repo-snapshots - - - scala-tools - Scala-Tools Maven2 Repository - http://scala-tools.org/repo-releases - - - lag - Configgy's' Repository - http://www.lag.net/repo - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2 - - - java.net - Java.net Legacy Repository for Maven - http://download.java.net/maven/1 - legacy - - - guiceyfruit.release - GuiceyFruit Release Repository - http://guiceyfruit.googlecode.com/svn/repo/releases/ - - false - - - true - - - - guiceyfruit.snapshot - GuiceyFruit Snapshot Repository - http://guiceyfruit.googlecode.com/svn/repo/snapshots/ - - true - - - false - - - - google-maven-repository - Google Maven Repository - http://google-maven-repository.googlecode.com/svn/repository/ - - - repository.codehaus.org - Codehaus Maven Repository - http://repository.codehaus.org - - true - - - - repository.jboss.org - JBoss Repository for Maven - http://repository.jboss.org/maven2 - - false - - - - - - - scala-tools.org - Scala-Tools Maven2 Repository - http://scala-tools.org/repo-releases - - - - - org.codehaus.aspectwerkz - aspectwerkz-nodeps-jdk5 - 2.1 - se.scalablesolutions.akka akka-kernel @@ -161,7 +67,6 @@ [6.1.6,) test - org.scala-lang scala-compiler @@ -169,68 +74,4 @@ test - - - src/main/scala - src/test/scala - - - org.scala-tools - maven-scala-plugin - - - - compile - testCompile - - - - - ${scala.version} - - - - org.mortbay.jetty - maven-jetty-plugin - - / - 5 - - - - net.sf.alchim - yuicompressor-maven-plugin - - - - compress - - - - - true - - - - - - false - config - - akka.conf - - - - - - - - org.scala-tools - maven-scala-plugin - - ${scala.version} - - - - diff --git a/samples-scala/pom.xml b/samples-scala/pom.xml index 7e02e9af1c..e14760003d 100644 --- a/samples-scala/pom.xml +++ b/samples-scala/pom.xml @@ -11,6 +11,7 @@ akka se.scalablesolutions.akka 0.5 + ../pom.xml @@ -33,53 +34,7 @@ src/main/scala - src/test/scala - - org.scala-tools - maven-scala-plugin - - - - compile - testCompile - - - - - - -target:jvm-1.5 - -unchecked - - 2.7.5 - 1.1 - - - - org.apache.maven.plugins - maven-eclipse-plugin - - true - - - ch.epfl.lamp.sdt.core.scalabuilder - - - - - ch.epfl.lamp.sdt.core.scalanature - - - - - org.eclipse.jdt.launching.JRE_CONTAINER - - - ch.epfl.lamp.sdt.launching.SCALA_CONTAINER - - - - maven-antrun-plugin @@ -98,21 +53,5 @@ - - - false - src/main/resources - - - false - src/main/scala - - ** - - - **/*.scala - - - diff --git a/scripts/remove_trailing_whitespace.sh b/scripts/remove_trailing_whitespace.sh index 7ea7480cf3..35038ae44d 100755 --- a/scripts/remove_trailing_whitespace.sh +++ b/scripts/remove_trailing_whitespace.sh @@ -1,5 +1,4 @@ #!/bin/sh echo "removing all trailing whitespace from all *.scala, *.html and *.xml files" -# find . -type f -name '*.scala' -exec sed -i 's/[ \t]*$//' {} \; - +find . -type f -name '*.scala' -exec sed -i 's/[ \t]*$//' {} \; diff --git a/util-java/pom.xml b/util-java/pom.xml index 658003e5e9..77565af204 100644 --- a/util-java/pom.xml +++ b/util-java/pom.xml @@ -17,12 +17,7 @@ org.guiceyfruit guice-core - 2.0-SNAPSHOT - - - org.guiceyfruit - guice-jsr250 - 2.0-SNAPSHOT + 2.0-beta-4 com.google.protobuf diff --git a/util-java/src/main/java/se/scalablesolutions/akka/kernel/config/ActiveObjectGuiceModule.java b/util-java/src/main/java/se/scalablesolutions/akka/kernel/config/ActiveObjectGuiceModule.java index 89632f5d79..052409d5fd 100644 --- a/util-java/src/main/java/se/scalablesolutions/akka/kernel/config/ActiveObjectGuiceModule.java +++ b/util-java/src/main/java/se/scalablesolutions/akka/kernel/config/ActiveObjectGuiceModule.java @@ -8,7 +8,7 @@ import java.util.List; import com.google.inject.AbstractModule; import com.google.inject.Singleton; -import com.google.inject.jsr250.ResourceProviderFactory; +//import com.google.inject.jsr250.ResourceProviderFactory; /** * @author Jonas Bonér @@ -21,7 +21,7 @@ public class ActiveObjectGuiceModule extends AbstractModule { } protected void configure() { - bind(ResourceProviderFactory.class); + //bind(ResourceProviderFactory.class); for (int i = 0; i < bindings.size(); i++) { final DependencyBinding db = bindings.get(i); //if (db.getInterface() != null) bind((Class) db.getInterface()).to((Class) db.getTarget()).in(Singleton.class);