From b1d91818ef1f192618f6d878e610f6ae2539505a Mon Sep 17 00:00:00 2001 From: Jonas Boner Date: Sat, 9 May 2009 19:55:42 +0200 Subject: [PATCH] mid camel impl --- akka.iml | 26 +- akka.ipr | 139 +++++-- akka.iws | 339 +++++++----------- api-java/.classpath | 14 +- api-java/akka-api-java.iml | 2 +- api-java/api-java.iml | 57 ++- .../api/ActiveObjectGuiceConfigurator.java | 121 ------- .../ActiveObjectGuiceConfiguratorTest.java | 30 +- .../akka/api/InMemoryStateTest.java | 28 +- .../akka/api/PersistentStateTest.java | 32 +- buildfile | 10 +- kernel/.classpath | 3 +- kernel/akka-kernel.iml | 54 ++- kernel/pom.xml | 8 +- kernel/src/main/scala/ActiveObject.scala | 119 ++++-- kernel/src/main/scala/Boot.scala | 3 +- kernel/src/main/scala/Configuration.scala | 10 +- kernel/src/main/scala/GenericServer.scala | 1 + kernel/src/main/scala/Supervisor.scala | 26 +- kernel/src/main/scala/collection/Vector.scala | 2 +- ...ActiveObjectGuiceConfiguratorForJava.scala | 6 +- kernel/src/test/scala/SupervisorSpec.scala | 1 + .../src/test/scala/SupervisorStateSpec.scala | 3 + lib/cassandra-1.0.jar | Bin 1053719 -> 0 bytes lib/scala-library-2.7.3.zip | Bin 3690397 -> 0 bytes util-java/pom.xml | 13 + util-java/util-java.iml | 26 +- 27 files changed, 560 insertions(+), 513 deletions(-) delete mode 100755 api-java/src/main/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java delete mode 100644 lib/cassandra-1.0.jar delete mode 100644 lib/scala-library-2.7.3.zip diff --git a/akka.iml b/akka.iml index 90dae359a4..3e135f5603 100644 --- a/akka.iml +++ b/akka.iml @@ -1,26 +1,14 @@ - - - - - - - + + + + - + + + - - - - - - - - - - - diff --git a/akka.ipr b/akka.ipr index ffec188277..4102337677 100644 --- a/akka.ipr +++ b/akka.ipr @@ -140,7 +140,6 @@ - @@ -155,18 +154,44 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -180,14 +205,23 @@ - + + + + + + + + + + @@ -216,7 +250,7 @@