diff --git a/changes.xml b/changes.xml old mode 100755 new mode 100644 index c49d0071b7..80382698a0 --- a/changes.xml +++ b/changes.xml @@ -31,7 +31,9 @@ see http://maven.apache.org/plugins/maven-changes-plugin/usage.html for full gui Added CassandraSession API (with socket pooling) wrapping Cassandra's Thrift API in Scala and Java APIs CassandraStorage is now works with external Cassandra cluster Removed embedded Cassandra mode + Removed startup scripts and lib dir ActorRegistry for retrieving Actor instances + Now start up kernel with 'java -jar dist/akka-0.6.jar' Concurrent mode is now per actor basis Made Akka Web App aware, does not require AKKA_HOME when using it as a library Fixed dispatcher bug diff --git a/pom.xml b/pom.xml index 0a100b4187..49364b494a 100644 --- a/pom.xml +++ b/pom.xml @@ -195,9 +195,9 @@ -Xmx1024m - -unchecked + ${scala.version} @@ -226,7 +226,7 @@ - ${pom.version} + ${akka.version} @@ -234,35 +234,6 @@ org.apache.maven.plugins maven-antrun-plugin - - - - - - @@ -327,7 +298,8 @@ -DpackageLinkDefs=file://${basedir}/../vscaladocs-packageLinkDefs.properties - -unchecked + -unchecked + 1.2-SNAPSHOT ${scala.version} @@ -365,30 +337,6 @@ release - scala-tools.org diff --git a/util-java/pom.xml b/util-java/pom.xml index 77565af204..643a25f74f 100644 --- a/util-java/pom.xml +++ b/util-java/pom.xml @@ -11,13 +11,14 @@ akka se.scalablesolutions.akka 0.5 + ../pom.xml org.guiceyfruit guice-core - 2.0-beta-4 + 2.0-SNAPSHOT com.google.protobuf @@ -41,23 +42,6 @@ - - maven-antrun-plugin - - - install - - - - - - - run - - - -