From f26110e55cf1cd39adf46df62fceff302e42ce00 Mon Sep 17 00:00:00 2001 From: jboner Date: Sat, 18 Jul 2009 00:16:32 +0200 Subject: [PATCH] completed protobuf protocol for remoting --- LICENSE | 15 + akka.ipr | 22 +- akka.iws | 592 +++++++++++++----- fun-test-java/akka-fun-test-java.iml | 1 + kernel/akka-kernel.iml | 2 +- kernel/pom.xml | 9 +- .../src/main/scala/actor/ActiveObject.scala | 55 +- kernel/src/main/scala/actor/Actor.scala | 86 +-- kernel/src/main/scala/nio/RemoteClient.scala | 93 ++- kernel/src/main/scala/nio/RemoteServer.scala | 148 +++-- kernel/src/main/scala/nio/RequestReply.scala | 2 +- kernel/src/main/scala/util/Serializer.scala | 28 +- kernel/src/test/scala/CamelSpec.scala | 4 +- kernel/src/test/scala/JerseySpec.scala | 4 +- kernel/src/test/scala/RemoteActorSpec.scala | 8 +- .../src/test/scala/RemoteSupervisorSpec.scala | 4 +- kernel/src/test/scala/SupervisorSpec.scala | 4 +- lib/akka-util-java-0.5.jar | Bin 25370 -> 25641 bytes lib/sbinary-0.3.jar | Bin 0 -> 135135 bytes samples-java/akka-samples-java.iml | 1 + samples-scala/akka-samples-scala.iml | 1 + .../kernel/nio/protobuf/RemoteProtocol.java | 84 ++- .../kernel/nio/protobuf/RemoteProtocol.proto | 17 +- 23 files changed, 795 insertions(+), 385 deletions(-) create mode 100644 LICENSE create mode 100644 lib/sbinary-0.3.jar diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..597eeaf9a7 --- /dev/null +++ b/LICENSE @@ -0,0 +1,15 @@ +This software is licensed under the Apache 2 license, quoted below. + +Copyright 2009 Scalable Solutions AB + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. \ No newline at end of file diff --git a/akka.ipr b/akka.ipr index 69a6d95917..40815ea19d 100644 --- a/akka.ipr +++ b/akka.ipr @@ -1202,17 +1202,6 @@ - - - - - - - - - - - @@ -1445,6 +1434,17 @@ + + + + + + + + + + + diff --git a/akka.iws b/akka.iws index e4f61efaf6..a03e559365 100644 --- a/akka.iws +++ b/akka.iws @@ -9,21 +9,24 @@ + + + + - + - - + - + @@ -44,7 +47,46 @@ - + + + + + + +