diff --git a/akka-core/src/main/scala/actor/Supervisor.scala b/akka-core/src/main/scala/actor/Supervisor.scala index 632e849ad9..bcb7223ddd 100644 --- a/akka-core/src/main/scala/actor/Supervisor.scala +++ b/akka-core/src/main/scala/actor/Supervisor.scala @@ -90,8 +90,8 @@ sealed class Supervisor private[akka] (handler: FaultHandlingStrategy, trapExcep def getInstance[T](clazz: Class[T]): List[T] = actors.get(clazz.getName).asInstanceOf[List[T]] def getComponentInterfaces: List[Class[_]] = List.flatten( - actors.values.toArray.toList.asInstanceOf[List[List[Class[_]]]]).map(_.getClass) - + actors.values.toArray.toList.asInstanceOf[List[List[AnyRef]]]).map(_.getClass) + def isDefined(clazz: Class[_]): Boolean = actors.containsKey(clazz.getName) override def start: Actor = synchronized { diff --git a/akka-core/src/main/scala/config/Config.scala b/akka-core/src/main/scala/config/Config.scala index ecbdf33d81..82a1f54191 100644 --- a/akka-core/src/main/scala/config/Config.scala +++ b/akka-core/src/main/scala/config/Config.scala @@ -12,7 +12,7 @@ import net.lag.configgy.{Configgy, ParseException} * @author Jonas Bonér */ object Config extends Logging { - val VERSION = "0.7-SNAPSHOT" + val VERSION = "0.7" // Set Multiverse options for max speed System.setProperty("org.multiverse.MuliverseConstants.sanityChecks", "false") diff --git a/akka-fun-test-java/pom.xml b/akka-fun-test-java/pom.xml index 5c55cf0be5..c4851757c1 100644 --- a/akka-fun-test-java/pom.xml +++ b/akka-fun-test-java/pom.xml @@ -6,7 +6,7 @@ Akka Functional Tests in Java akka-fun-test-java se.scalablesolutions.akka - 0.7-SNAPSHOT + 0.7 jar @@ -18,14 +18,14 @@ - akka-kernel se.scalablesolutions.akka - 0.7-SNAPSHOT + akka-kernel_2.7.7 + 0.7 se.scalablesolutions.akka - akka-persistence-cassandra - 0.7-SNAPSHOT + akka-persistence-cassandra_2.7.7 + 0.7 com.google.protobuf @@ -128,7 +128,4 @@ - - - diff --git a/akka-spring/akka-spring-test-java/pom.xml b/akka-spring/akka-spring-test-java/pom.xml index 3a9474ab06..e6eac986bc 100644 --- a/akka-spring/akka-spring-test-java/pom.xml +++ b/akka-spring/akka-spring-test-java/pom.xml @@ -6,7 +6,7 @@ Akka Spring Tests in Java akka-spring-test-java se.scalablesolutions.akka - 0.7-SNAPSHOT + 0.7 jar @@ -131,68 +131,65 @@ - - - akka-core + + se.scalablesolutions.akka - 0.7-SNAPSHOT + akka-core_2.7.7 + 0.7 - akka-util se.scalablesolutions.akka - 0.7-SNAPSHOT + akka-util_2.7.7 + 0.7 - akka-util-java se.scalablesolutions.akka - 0.7-SNAPSHOT + akka-util-java_2.7.7 + 0.7 - akka-spring se.scalablesolutions.akka - 0.7-SNAPSHOT + akka-spring_2.7.7 + 0.7 - spring org.springframework + spring - - - - - org.springframework - spring-beans - 3.0.1.RELEASE - - - org.springframework - spring-context - 3.0.1.RELEASE - + + + org.springframework + spring-beans + 3.0.1.RELEASE + + + org.springframework + spring-context + 3.0.1.RELEASE + - net.lag - configgy - 1.4.7 + net.lag + configgy + 1.4.7 - org.codehaus.aspectwerkz - aspectwerkz-nodeps-jdk5 - 2.1 - + org.codehaus.aspectwerkz + aspectwerkz-nodeps-jdk5 + 2.1 + - org.codehaus.aspectwerkz - aspectwerkz-jdk5 - 2.1 - - + org.codehaus.aspectwerkz + aspectwerkz-jdk5 + 2.1 + - org.guiceyfruit - guice-core - 2.0-beta-4 - + org.guiceyfruit + guice-core + 2.0-beta-4 + com.google.protobuf protobuf-java @@ -259,19 +256,18 @@ javautils 2.7.4-0.1 - - org.scala-lang - scala-library - 2.7.7 - - - org.scala-lang - scala-library - 2.7.7 + org.scala-lang + scala-library + 2.7.7 + + + org.scala-lang + scala-library + 2.7.7 - + junit junit @@ -327,7 +323,4 @@ - - - diff --git a/akka-util-java/project/build.properties b/akka-util-java/project/build.properties deleted file mode 100644 index f9ec63abf2..0000000000 --- a/akka-util-java/project/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -project.organization=se.scalablesolutions.akka -project.name=akka-util-java -project.version=0.7-SNAPSHOT -scala.version=2.7.7 -sbt.version=0.7.1 -def.scala.version=2.7.7 -build.scala.versions=2.7.7 diff --git a/akka-util-java/project/build/AkkaJavaUtilProject.scala b/akka-util-java/project/build/AkkaJavaUtilProject.scala deleted file mode 100644 index 0376ff83d9..0000000000 --- a/akka-util-java/project/build/AkkaJavaUtilProject.scala +++ /dev/null @@ -1,17 +0,0 @@ -import sbt._ - -class AkkaJavaUtilProject(info: ProjectInfo) extends DefaultProject(info) { - - val databinder = "DataBinder" at "http://databinder.net/repo" - val configgy = "Configgy" at "http://www.lag.net/repo" - val multiverse = "Multiverse" at "http://multiverse.googlecode.com/svn/maven-repository/releases" - val jBoss = "jBoss" at "http://repository.jboss.org/maven2" - val guiceyfruit = "GuiceyFruit" at "http://guiceyfruit.googlecode.com/svn/repo/releases/" - - val guicey = "org.guiceyfruit" % "guice-core" % "2.0-beta-4" % "compile" - val proto = "com.google.protobuf" % "protobuf-java" % "2.2.0" % "compile" - val multi = "org.multiverse" % "multiverse-alpha" % "0.3" % "compile" - - override def packageDocsJar = defaultJarPath("-javadoc.jar") - override def packageSrcJar= defaultJarPath("-sources.jar") -} diff --git a/config/akka-reference.conf b/config/akka-reference.conf index e30478026c..5bdb644e75 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -8,14 +8,14 @@ filename = "./logs/akka.log" roll = "daily" # Options: never, hourly, daily, sunday/monday/... - level = "trace" # Options: fatal, critical, error, warning, info, debug, trace + level = "info" # Options: fatal, critical, error, warning, info, debug, trace console = on # syslog_host = "" # syslog_server_name = "" - version = "0.7-SNAPSHOT" + version = "0.7" # FQN to the class doing initial active object/actor # supervisor bootstrap, should be defined in default constructor diff --git a/project/build.properties b/project/build.properties index 9f7e717580..e4406e245f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,6 +1,6 @@ project.organization=se.scalablesolutions.akka project.name=akka -project.version=0.7-SNAPSHOT +project.version=0.7 scala.version=2.7.7 sbt.version=0.7.1 def.scala.version=2.7.7 diff --git a/scripts/run_akka.sh b/scripts/run_akka.sh index c07397adeb..8112894022 100755 --- a/scripts/run_akka.sh +++ b/scripts/run_akka.sh @@ -1,6 +1,6 @@ #!/bin/bash cd $AKKA_HOME -VERSION=akka_2.7.7-0.7-SNAPSHOT +VERSION=akka_2.7.7-0.7 TARGET_DIR=dist/$1 shift 1 VMARGS=$@