diff --git a/bin/start-akka-server.sh b/bin/start-akka-server.sh index d3bbb987a1..929353fe8a 100755 --- a/bin/start-akka-server.sh +++ b/bin/start-akka-server.sh @@ -49,6 +49,7 @@ CLASSPATH=$CLASSPATH:$BASE_DIR/lib/jersey-client-1.1.0-ea.jar CLASSPATH=$CLASSPATH:$BASE_DIR/lib/jersey-core-1.0.3.jar CLASSPATH=$CLASSPATH:$BASE_DIR/lib/jersey-json-1.0.3.jar CLASSPATH=$CLASSPATH:$BASE_DIR/lib/jersey-server-1.0.3.jar +CLASSPATH=$CLASSPATH:$BASE_DIR/lib/jersey-scala-1.1.2-ea-SNAPSHOT.jar CLASSPATH=$CLASSPATH:$BASE_DIR/lib/JSAP-2.1.jar CLASSPATH=$CLASSPATH:$BASE_DIR/lib/jsr250-api-1.0.jar CLASSPATH=$CLASSPATH:$BASE_DIR/lib/jsr311-api-1.0.jar diff --git a/deploy/akka-samples-java-0.5.jar b/deploy/akka-samples-java-0.5.jar new file mode 100644 index 0000000000..ba656cdbed Binary files /dev/null and b/deploy/akka-samples-java-0.5.jar differ diff --git a/deploy/akka-samples-scala-0.5.jar b/deploy/akka-samples-scala-0.5.jar new file mode 100644 index 0000000000..faf5c4e9c3 Binary files /dev/null and b/deploy/akka-samples-scala-0.5.jar differ diff --git a/kernel/pom.xml b/kernel/pom.xml index 977e6fb9f5..c220730b7e 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -125,6 +125,11 @@ jsr311-api 1.0 + + com.sun.jersey.contribs + jersey-scala + 1.1.2-ea-SNAPSHOT + @@ -192,7 +197,7 @@ -target:jvm-1.5 - -unchecked + ${scala.version} 1.1 diff --git a/lib/akka-kernel-0.5.jar b/lib/akka-kernel-0.5.jar index b480a98251..c1306e3952 100644 Binary files a/lib/akka-kernel-0.5.jar and b/lib/akka-kernel-0.5.jar differ diff --git a/lib/akka-util-java-0.5.jar b/lib/akka-util-java-0.5.jar index 4df2a41ea8..55c89e12bc 100644 Binary files a/lib/akka-util-java-0.5.jar and b/lib/akka-util-java-0.5.jar differ diff --git a/lib/jersey-scala-1.1.2-ea-SNAPSHOT.jar b/lib/jersey-scala-1.1.2-ea-SNAPSHOT.jar new file mode 100644 index 0000000000..a24bb19a7d Binary files /dev/null and b/lib/jersey-scala-1.1.2-ea-SNAPSHOT.jar differ diff --git a/samples-scala/src/main/scala/SimpleService.scala b/samples-scala/src/main/scala/SimpleService.scala index b29dbef6ec..6c7b27278d 100644 --- a/samples-scala/src/main/scala/SimpleService.scala +++ b/samples-scala/src/main/scala/SimpleService.scala @@ -38,20 +38,18 @@ class SimpleService extends Actor { private val storage = TransactionalState.newPersistentMap(CassandraStorageConfig()) @GET - @Produces(Array("application/json")) - def count = (this !! Tick).getOrElse("Error in counter") + @Produces(Array("application/xml")) + def count = (this !! Tick).getOrElse(Error in counter) override def receive: PartialFunction[Any, Unit] = { case Tick => if (hasStartedTicking) { val counter = storage.get(KEY).get.asInstanceOf[Integer].intValue storage.put(KEY, new Integer(counter + 1)) - //reply(

Tick: { counter + 1 }

) - reply("Tick: " + (counter + 1) + "\n") + reply(Tick: {counter + 1}) } else { storage.put(KEY, new Integer(0)) hasStartedTicking = true - //reply(

Tick: 0

) - reply("Tick: 0\n") + reply(Tick: 0) } }