From 83ada023d3fd3f9a09e88caca74e36f2f4bbce2f Mon Sep 17 00:00:00 2001 From: Jonas Boner Date: Fri, 3 Jul 2009 17:15:36 +0200 Subject: [PATCH] added configuration system based on Configgy, now JMX enabled + fixed a couple of bugs --- akka.ipr | 181 +- akka.iws | 1693 ++++++++++++----- bin/start-akka-server.sh | 13 +- config/log4j.properties | 2 +- fun-test-java/akka-fun-test-java.iml | 13 +- .../ActiveObjectGuiceConfiguratorTest.java | 20 +- .../akka/api/InMemNestedStateTest.java | 15 +- .../akka/api/InMemStateful.java | 14 +- .../akka/api/InMemStatefulNested.java | 21 +- .../akka/api/InMemoryStateTest.java | 24 +- .../akka/api/PersistentNestedStateTest.java | 13 +- .../akka/api/PersistentStateTest.java | 17 +- .../akka/api/PersistentStateful.java | 24 +- .../akka/api/PersistentStatefulNested.java | 22 +- .../akka/api/RemoteInMemoryStateTest.java | 16 +- .../akka/api/RemotePersistentStateTest.java | 20 +- .../scalablesolutions/akka/api/RestTest.java | 31 +- kernel/akka-kernel.iml | 14 +- kernel/pom.xml | 548 +++--- kernel/src/main/scala/Boot.scala | 3 +- kernel/src/main/scala/Kernel.scala | 210 +- .../src/main/scala/actor/ActiveObject.scala | 14 +- kernel/src/main/scala/actor/Actor.scala | 16 +- .../config/ActiveObjectConfigurator.scala | 48 +- .../ActiveObjectGuiceConfigurator.scala | 10 +- ...ActiveObjectGuiceConfiguratorForJava.scala | 4 +- .../ActiveObjectComponentProvider.scala | 15 +- ...ActiveObjectComponentProviderFactory.scala | 8 +- .../src/main/scala/jersey/AkkaServlet.scala | 19 +- kernel/src/main/scala/nio/RemoteClient.scala | 2 +- kernel/src/main/scala/nio/RemoteServer.scala | 9 +- .../EventBasedThreadPoolDispatcher.scala | 10 +- .../scala/reactor/MessageDispatcherBase.scala | 4 + ...andraNode.scala => CassandraStorage.scala} | 88 +- kernel/src/main/scala/state/State.scala | 35 +- .../scala/stm/TransactionManagement.scala | 2 +- .../main/scala/stm/TransactionWatcher.scala | 105 + kernel/src/main/scala/util/Logging.scala | 2 +- kernel/src/test/scala/InMemoryActorSpec.scala | 24 +- .../src/test/scala/PersistentActorSpec.scala | 12 +- kernel/src/test/scala/RemoteActorSpec.scala | 1 + .../src/test/scala/RemoteSupervisorSpec.scala | 5 +- lib/cassandra-0.3.0-dev.jar | Bin 1147629 -> 0 bytes pom.xml | 2 +- ...actional.java => transactionrequired.java} | 4 +- 45 files changed, 2100 insertions(+), 1253 deletions(-) rename kernel/src/main/scala/state/{CassandraNode.scala => CassandraStorage.scala} (70%) create mode 100644 kernel/src/main/scala/stm/TransactionWatcher.scala mode change 100755 => 100644 kernel/src/main/scala/util/Logging.scala delete mode 100644 lib/cassandra-0.3.0-dev.jar rename util-java/src/main/java/se/scalablesolutions/akka/annotation/{transactional.java => transactionrequired.java} (71%) diff --git a/akka.ipr b/akka.ipr index 8cb30124e6..10621d8129 100644 --- a/akka.ipr +++ b/akka.ipr @@ -562,7 +562,7 @@