diff --git a/akka-actors/src/main/scala/actor/ActiveObject.scala b/akka-actors/src/main/scala/actor/ActiveObject.scala index a5f9b298e0..be0b59c0d9 100644 --- a/akka-actors/src/main/scala/actor/ActiveObject.scala +++ b/akka-actors/src/main/scala/actor/ActiveObject.scala @@ -6,8 +6,8 @@ package se.scalablesolutions.akka.actor import java.net.InetSocketAddress -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest -import se.scalablesolutions.akka.nio.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest +import se.scalablesolutions.akka.remote.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.serialization.Serializer import se.scalablesolutions.akka.util._ diff --git a/akka-actors/src/main/scala/actor/Actor.scala b/akka-actors/src/main/scala/actor/Actor.scala index 683d6dc3f7..2ed1f26764 100644 --- a/akka-actors/src/main/scala/actor/Actor.scala +++ b/akka-actors/src/main/scala/actor/Actor.scala @@ -4,7 +4,6 @@ package se.scalablesolutions.akka.actor -import java.net.InetSocketAddress import se.scalablesolutions.akka.Config._ import se.scalablesolutions.akka.dispatch._ import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy} @@ -12,10 +11,9 @@ import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.stm.Transaction._ import se.scalablesolutions.akka.stm.TransactionManagement._ import se.scalablesolutions.akka.stm.{StmException, TransactionManagement} -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest -import se.scalablesolutions.akka.nio.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest +import se.scalablesolutions.akka.remote.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} import se.scalablesolutions.akka.serialization.Serializer -import se.scalablesolutions.akka.util.Helpers.ReadWriteLock import se.scalablesolutions.akka.util.{HashCode, Logging} import org.codehaus.aspectwerkz.proxy.Uuid @@ -24,6 +22,7 @@ import org.multiverse.api.ThreadLocalTransaction._ import java.util.{Queue, HashSet} import java.util.concurrent.ConcurrentLinkedQueue +import java.net.InetSocketAddress /** * Implements the Transactor abstraction. E.g. a transactional actor. diff --git a/akka-actors/src/main/scala/nio/LzfCompression.scala b/akka-actors/src/main/scala/remote/LzfCompression.scala similarity index 96% rename from akka-actors/src/main/scala/nio/LzfCompression.scala rename to akka-actors/src/main/scala/remote/LzfCompression.scala index d69e9856ee..04d2c615de 100644 --- a/akka-actors/src/main/scala/nio/LzfCompression.scala +++ b/akka-actors/src/main/scala/remote/LzfCompression.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import org.h2.compress.{LZFInputStream, LZFOutputStream} diff --git a/akka-actors/src/main/scala/nio/RemoteClient.scala b/akka-actors/src/main/scala/remote/RemoteClient.scala similarity index 98% rename from akka-actors/src/main/scala/nio/RemoteClient.scala rename to akka-actors/src/main/scala/remote/RemoteClient.scala index 1daca82a6b..adb8a65ce3 100644 --- a/akka-actors/src/main/scala/nio/RemoteClient.scala +++ b/akka-actors/src/main/scala/remote/RemoteClient.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import scala.collection.mutable.HashMap -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.{RemoteRequest, RemoteReply} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.{RemoteRequest, RemoteReply} import se.scalablesolutions.akka.actor.{Exit, Actor} import se.scalablesolutions.akka.dispatch.{DefaultCompletableFutureResult, CompletableFutureResult} import se.scalablesolutions.akka.util.Logging diff --git a/akka-actors/src/main/scala/nio/RemoteProtocolBuilder.scala b/akka-actors/src/main/scala/remote/RemoteProtocolBuilder.scala similarity index 98% rename from akka-actors/src/main/scala/nio/RemoteProtocolBuilder.scala rename to akka-actors/src/main/scala/remote/RemoteProtocolBuilder.scala index 18e2e62d9b..82213ad12c 100644 --- a/akka-actors/src/main/scala/nio/RemoteProtocolBuilder.scala +++ b/akka-actors/src/main/scala/remote/RemoteProtocolBuilder.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import se.scalablesolutions.akka.serialization.Serializable.SBinary import se.scalablesolutions.akka.serialization.{Serializer, Serializable, SerializationProtocol} -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.{RemoteRequest, RemoteReply} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.{RemoteRequest, RemoteReply} import com.google.protobuf.{Message, ByteString} diff --git a/akka-actors/src/main/scala/nio/RemoteServer.scala b/akka-actors/src/main/scala/remote/RemoteServer.scala similarity index 99% rename from akka-actors/src/main/scala/nio/RemoteServer.scala rename to akka-actors/src/main/scala/remote/RemoteServer.scala index d29087f828..f297475ad4 100755 --- a/akka-actors/src/main/scala/nio/RemoteServer.scala +++ b/akka-actors/src/main/scala/remote/RemoteServer.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import java.lang.reflect.InvocationTargetException import java.net.InetSocketAddress @@ -10,7 +10,7 @@ import java.util.concurrent.{ConcurrentHashMap, Executors} import se.scalablesolutions.akka.actor._ import se.scalablesolutions.akka.util._ -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.{RemoteReply, RemoteRequest} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.{RemoteReply, RemoteRequest} import se.scalablesolutions.akka.Config.config import org.jboss.netty.bootstrap.ServerBootstrap diff --git a/akka-actors/src/main/scala/nio/RequestReply.scala b/akka-actors/src/main/scala/remote/RequestReply.scala similarity index 99% rename from akka-actors/src/main/scala/nio/RequestReply.scala rename to akka-actors/src/main/scala/remote/RequestReply.scala index ce79653f06..a4a0cc8924 100644 --- a/akka-actors/src/main/scala/nio/RequestReply.scala +++ b/akka-actors/src/main/scala/remote/RequestReply.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import java.util.concurrent.atomic.AtomicLong import stm.Transaction diff --git a/akka-actors/src/test/scala/RemoteActorTest.scala b/akka-actors/src/test/scala/RemoteActorTest.scala index 51b1882342..e79b5cdd72 100644 --- a/akka-actors/src/test/scala/RemoteActorTest.scala +++ b/akka-actors/src/test/scala/RemoteActorTest.scala @@ -6,7 +6,7 @@ import junit.framework.TestCase import org.scalatest.junit.JUnitSuite import org.junit.{Test, Before, After} -import se.scalablesolutions.akka.nio.{RemoteServer, RemoteClient} +import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient} import se.scalablesolutions.akka.dispatch.Dispatchers object Global { diff --git a/akka-actors/src/test/scala/RemoteSupervisorTest.scala b/akka-actors/src/test/scala/RemoteSupervisorTest.scala index 06e212fa76..008bebed85 100644 --- a/akka-actors/src/test/scala/RemoteSupervisorTest.scala +++ b/akka-actors/src/test/scala/RemoteSupervisorTest.scala @@ -6,7 +6,7 @@ package se.scalablesolutions.akka.actor import se.scalablesolutions.akka.serialization.BinaryString import se.scalablesolutions.akka.config.ScalaConfig._ -import se.scalablesolutions.akka.nio.{RemoteNode, RemoteServer} +import se.scalablesolutions.akka.remote.{RemoteNode, RemoteServer} import se.scalablesolutions.akka.OneWay import se.scalablesolutions.akka.dispatch.Dispatchers diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java index de2c1dbd41..571d76e9ce 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java @@ -7,7 +7,7 @@ package se.scalablesolutions.akka.api; import se.scalablesolutions.akka.Config; import se.scalablesolutions.akka.actor.ActiveObject; import se.scalablesolutions.akka.config.ActiveObjectConfigurator; -import se.scalablesolutions.akka.nio.RemoteNode; +import se.scalablesolutions.akka.remote.RemoteNode; import junit.framework.TestCase; diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala index 4c4c444c08..8d684c4619 100644 --- a/akka-kernel/src/main/scala/Kernel.scala +++ b/akka-kernel/src/main/scala/Kernel.scala @@ -12,7 +12,7 @@ import javax.ws.rs.core.UriBuilder import java.io.File import java.net.URLClassLoader -import se.scalablesolutions.akka.nio.RemoteNode +import se.scalablesolutions.akka.remote.RemoteNode import se.scalablesolutions.akka.util.Logging import se.scalablesolutions.akka.actor.ActorRegistry diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.java b/akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.java similarity index 83% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.java rename to akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.java index 0386755ba5..f8ee893393 100644 --- a/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.java +++ b/akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.java @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -package se.scalablesolutions.akka.nio.protobuf; +package se.scalablesolutions.akka.remote.protobuf; public final class RemoteProtocol { private RemoteProtocol() {} @@ -23,12 +23,12 @@ public final class RemoteProtocol { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_descriptor; + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_fieldAccessorTable; + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteRequest_fieldAccessorTable; } // required uint64 id = 1; @@ -284,57 +284,57 @@ public final class RemoteProtocol { return size; } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom(byte[] data) + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom(java.io.InputStream input) + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseDelimitedFrom(java.io.InputStream input) + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeDelimitedFrom(input).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseDelimitedFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeDelimitedFrom(input, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -344,25 +344,25 @@ public final class RemoteProtocol { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest prototype) { + public static Builder newBuilder(se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { - private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest result; + private se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest result; - // Construct using se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.newBuilder() + // Construct using se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest(); + builder.result = new se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest(); return builder; } - protected se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest internalGetResult() { + protected se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest internalGetResult() { return result; } @@ -371,7 +371,7 @@ public final class RemoteProtocol { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest(); + result = new se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest(); return this; } @@ -381,24 +381,24 @@ public final class RemoteProtocol { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.getDescriptor(); + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest.getDescriptor(); } - public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest getDefaultInstanceForType() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.getDefaultInstance(); + public se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest getDefaultInstanceForType() { + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest build() { + public se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest buildParsed() + private se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -407,27 +407,27 @@ public final class RemoteProtocol { return buildPartial(); } - public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest buildPartial() { + public se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest returnMe = result; + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest returnMe = result; result = null; return returnMe; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest) { - return mergeFrom((se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest)other); + if (other instanceof se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest) { + return mergeFrom((se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest other) { - if (other == se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.getDefaultInstance()) return this; + public Builder mergeFrom(se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest other) { + if (other == se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -887,11 +887,11 @@ public final class RemoteProtocol { } static { - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.getDescriptor(); + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.getDescriptor(); } static { - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internalForceInit(); + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.internalForceInit(); } } @@ -911,12 +911,12 @@ public final class RemoteProtocol { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_descriptor; + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteReply_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_fieldAccessorTable; + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteReply_fieldAccessorTable; } // required uint64 id = 1; @@ -1054,57 +1054,57 @@ public final class RemoteProtocol { return size; } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom(byte[] data) + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom(java.io.InputStream input) + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseDelimitedFrom(java.io.InputStream input) + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeDelimitedFrom(input).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseDelimitedFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeDelimitedFrom(input, extensionRegistry) .buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( + public static se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1114,25 +1114,25 @@ public final class RemoteProtocol { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply prototype) { + public static Builder newBuilder(se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { - private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply result; + private se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply result; - // Construct using se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.newBuilder() + // Construct using se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply(); + builder.result = new se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply(); return builder; } - protected se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply internalGetResult() { + protected se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply internalGetResult() { return result; } @@ -1141,7 +1141,7 @@ public final class RemoteProtocol { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply(); + result = new se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply(); return this; } @@ -1151,24 +1151,24 @@ public final class RemoteProtocol { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.getDescriptor(); + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply.getDescriptor(); } - public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply getDefaultInstanceForType() { - return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.getDefaultInstance(); + public se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply getDefaultInstanceForType() { + return se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply build() { + public se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply buildParsed() + private se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -1177,27 +1177,27 @@ public final class RemoteProtocol { return buildPartial(); } - public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply buildPartial() { + public se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply returnMe = result; + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply returnMe = result; result = null; return returnMe; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply) { - return mergeFrom((se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply)other); + if (other instanceof se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply) { + return mergeFrom((se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply other) { - if (other == se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.getDefaultInstance()) return this; + public Builder mergeFrom(se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply other) { + if (other == se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -1442,24 +1442,24 @@ public final class RemoteProtocol { } static { - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.getDescriptor(); + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.getDescriptor(); } static { - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internalForceInit(); + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.internalForceInit(); } } private static com.google.protobuf.Descriptors.Descriptor - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_descriptor; + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteRequest_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_fieldAccessorTable; + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteRequest_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_descriptor; + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteReply_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_fieldAccessorTable; + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteReply_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1469,43 +1469,43 @@ public final class RemoteProtocol { descriptor; static { java.lang.String[] descriptorData = { - "\n;se/scalablesolutions/akka/nio/protobuf" + - "/RemoteProtocol.proto\022&se.scalablesoluti" + - "ons.akka.nio.protobuf\"\272\002\n\rRemoteRequest\022" + - "\n\n\002id\030\001 \002(\004\022\020\n\010protocol\030\002 \002(\r\022\017\n\007message" + - "\030\003 \002(\014\022\027\n\017messageManifest\030\004 \001(\014\022\016\n\006metho" + - "d\030\005 \001(\t\022\016\n\006target\030\006 \002(\t\022\014\n\004uuid\030\007 \002(\t\022\017\n" + - "\007timeout\030\010 \002(\004\022\026\n\016supervisorUuid\030\t \001(\t\022\017" + - "\n\007isActor\030\n \002(\010\022\020\n\010isOneWay\030\013 \002(\010\022\021\n\tisE" + - "scaped\030\014 \002(\010\022\026\n\016sourceHostname\030\r \001(\t\022\022\n\n" + - "sourcePort\030\016 \001(\r\022\024\n\014sourceTarget\030\017 \001(\t\022\022", - "\n\nsourceUuid\030\020 \001(\t\"\247\001\n\013RemoteReply\022\n\n\002id" + - "\030\001 \002(\004\022\020\n\010protocol\030\002 \001(\r\022\017\n\007message\030\003 \001(" + - "\014\022\027\n\017messageManifest\030\004 \001(\014\022\021\n\texception\030" + - "\005 \001(\t\022\026\n\016supervisorUuid\030\006 \001(\t\022\017\n\007isActor" + - "\030\007 \002(\010\022\024\n\014isSuccessful\030\010 \002(\010" + "\n>se/scalablesolutions/akka/remote/proto" + + "buf/RemoteProtocol.proto\022)se.scalablesol" + + "utions.akka.remote.protobuf\"\272\002\n\rRemoteRe" + + "quest\022\n\n\002id\030\001 \002(\004\022\020\n\010protocol\030\002 \002(\r\022\017\n\007m" + + "essage\030\003 \002(\014\022\027\n\017messageManifest\030\004 \001(\014\022\016\n" + + "\006method\030\005 \001(\t\022\016\n\006target\030\006 \002(\t\022\014\n\004uuid\030\007 " + + "\002(\t\022\017\n\007timeout\030\010 \002(\004\022\026\n\016supervisorUuid\030\t" + + " \001(\t\022\017\n\007isActor\030\n \002(\010\022\020\n\010isOneWay\030\013 \002(\010\022" + + "\021\n\tisEscaped\030\014 \002(\010\022\026\n\016sourceHostname\030\r \001" + + "(\t\022\022\n\nsourcePort\030\016 \001(\r\022\024\n\014sourceTarget\030\017", + " \001(\t\022\022\n\nsourceUuid\030\020 \001(\t\"\247\001\n\013RemoteReply" + + "\022\n\n\002id\030\001 \002(\004\022\020\n\010protocol\030\002 \001(\r\022\017\n\007messag" + + "e\030\003 \001(\014\022\027\n\017messageManifest\030\004 \001(\014\022\021\n\texce" + + "ption\030\005 \001(\t\022\026\n\016supervisorUuid\030\006 \001(\t\022\017\n\007i" + + "sActor\030\007 \002(\010\022\024\n\014isSuccessful\030\010 \002(\010" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor root) { descriptor = root; - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_descriptor = + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_fieldAccessorTable = new + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_descriptor, + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteRequest_descriptor, new java.lang.String[] { "Id", "Protocol", "Message", "MessageManifest", "Method", "Target", "Uuid", "Timeout", "SupervisorUuid", "IsActor", "IsOneWay", "IsEscaped", "SourceHostname", "SourcePort", "SourceTarget", "SourceUuid", }, - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.class, - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.Builder.class); - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_descriptor = + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest.class, + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest.Builder.class); + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteReply_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_fieldAccessorTable = new + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteReply_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_descriptor, + internal_static_se_scalablesolutions_akka_remote_protobuf_RemoteReply_descriptor, new java.lang.String[] { "Id", "Protocol", "Message", "MessageManifest", "Exception", "SupervisorUuid", "IsActor", "IsSuccessful", }, - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.class, - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.Builder.class); + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply.class, + se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteReply.Builder.class); return null; } }; diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.proto b/akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto similarity index 87% rename from akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.proto rename to akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto index b3d45beb6f..9db007fd5b 100644 --- a/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.proto +++ b/akka-util-java/src/main/java/se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto @@ -2,12 +2,12 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio.protobuf; +package se.scalablesolutions.akka.remote.protobuf; /* Compile with: cd ./akka-util-java/src/main/java - protoc se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.proto --java_out . + protoc se/scalablesolutions/akka/remote/protobuf/RemoteProtocol.proto --java_out . */ message RemoteRequest { diff --git a/docs/scaladocs-akka-actors/actor/ActiveObject.scala.html b/docs/scaladocs-akka-actors/actor/ActiveObject.scala.html index 2cc8b693e2..24138829b4 100644 --- a/docs/scaladocs-akka-actors/actor/ActiveObject.scala.html +++ b/docs/scaladocs-akka-actors/actor/ActiveObject.scala.html @@ -15,8 +15,8 @@ package se.scalablesolutions.akka.actor import java.net.InetSocketAddress import se.scalablesolutions.akka.dispatch.{MessageDispatcher, FutureResult} -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest -import se.scalablesolutions.akka.nio.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest +import se.scalablesolutions.akka.remote.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.util._ diff --git a/docs/scaladocs-akka-actors/actor/Actor.scala.html b/docs/scaladocs-akka-actors/actor/Actor.scala.html index 646df38c48..ab5ce9b293 100644 --- a/docs/scaladocs-akka-actors/actor/Actor.scala.html +++ b/docs/scaladocs-akka-actors/actor/Actor.scala.html @@ -21,8 +21,8 @@ import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.stm.Transaction._ import se.scalablesolutions.akka.stm.TransactionManagement._ import se.scalablesolutions.akka.stm.{StmException, TransactionManagement} -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest -import se.scalablesolutions.akka.nio.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.RemoteRequest +import se.scalablesolutions.akka.remote.{RemoteProtocolBuilder, RemoteClient, RemoteRequestIdFactory} import se.scalablesolutions.akka.serialization.Serializer import se.scalablesolutions.akka.util.Helpers.ReadWriteLock import se.scalablesolutions.akka.util.Logging diff --git a/docs/scaladocs-akka-actors/all-classes.html b/docs/scaladocs-akka-actors/all-classes.html index 6bc73b5105..edbb5c78a0 100644 --- a/docs/scaladocs-akka-actors/all-classes.html +++ b/docs/scaladocs-akka-actors/all-classes.html @@ -17,7 +17,7 @@

Filters

Class @@ -35,7 +35,7 @@

Classes

diff --git a/docs/scaladocs-akka-actors/nio/RemoteClient.scala.html b/docs/scaladocs-akka-actors/nio/RemoteClient.scala.html index 1fff78379b..9f1656a7df 100644 --- a/docs/scaladocs-akka-actors/nio/RemoteClient.scala.html +++ b/docs/scaladocs-akka-actors/nio/RemoteClient.scala.html @@ -10,7 +10,7 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import scala.collection.mutable.HashMap diff --git a/docs/scaladocs-akka-actors/nio/RemoteProtocolBuilder.scala.html b/docs/scaladocs-akka-actors/nio/RemoteProtocolBuilder.scala.html index 8afbfb65ee..8d628992a2 100644 --- a/docs/scaladocs-akka-actors/nio/RemoteProtocolBuilder.scala.html +++ b/docs/scaladocs-akka-actors/nio/RemoteProtocolBuilder.scala.html @@ -10,7 +10,7 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import akka.serialization.Serializable.SBinary import com.google.protobuf.{Message, ByteString} diff --git a/docs/scaladocs-akka-actors/nio/RemoteServer.scala.html b/docs/scaladocs-akka-actors/nio/RemoteServer.scala.html index 503b51a17e..8ee8d8c6e0 100644 --- a/docs/scaladocs-akka-actors/nio/RemoteServer.scala.html +++ b/docs/scaladocs-akka-actors/nio/RemoteServer.scala.html @@ -10,7 +10,7 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import java.lang.reflect.InvocationTargetException import java.net.InetSocketAddress @@ -18,7 +18,7 @@ import java.util.concurrent.{ConcurrentHashMap, Executors} import se.scalablesolutions.akka.actor._ import se.scalablesolutions.akka.util._ -import se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.{RemoteReply, RemoteRequest} +import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.{RemoteReply, RemoteRequest} import se.scalablesolutions.akka.Config.config import org.jboss.netty.bootstrap.ServerBootstrap diff --git a/docs/scaladocs-akka-actors/nio/RequestReply.scala.html b/docs/scaladocs-akka-actors/nio/RequestReply.scala.html index dd078d1953..a63d2dd08d 100644 --- a/docs/scaladocs-akka-actors/nio/RequestReply.scala.html +++ b/docs/scaladocs-akka-actors/nio/RequestReply.scala.html @@ -10,7 +10,7 @@ * Copyright (C) 2009 Scalable Solutions. */ -package se.scalablesolutions.akka.nio +package se.scalablesolutions.akka.remote import java.util.concurrent.atomic.AtomicLong import stm.Transaction diff --git a/docs/scaladocs-akka-actors/overview.html b/docs/scaladocs-akka-actors/overview.html index a7ab60ee38..eba3dd1aaf 100644 --- a/docs/scaladocs-akka-actors/overview.html +++ b/docs/scaladocs-akka-actors/overview.html @@ -64,7 +64,7 @@ -
se.scalablesolutions.akka.nio
+
se.scalablesolutions.akka.remote
diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient$object.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient$object.html index 74ae637dcc..229767a175 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient$object.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient$object.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteClient + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteClient @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteClient + se.scalablesolutions.akka.remote.RemoteClient

object RemoteClient

@@ -59,7 +59,7 @@


- Companion: RemoteClient

+ Companion: RemoteClient

Source: RemoteClient.scala(29)
@@ -213,7 +213,7 @@ - RemoteClient + RemoteClient @@ -440,7 +440,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient.html index 0ffff2010e..087759b398 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClient.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteClient + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteClient @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteClient + se.scalablesolutions.akka.remote.RemoteClient

class RemoteClient

@@ -59,7 +59,7 @@

- Companion: RemoteClient

+ Companion: RemoteClient

Source: RemoteClient.scala(54) @@ -388,10 +388,10 @@ - send.. + send.. - def send(request : RemoteRequest) + def send(request : RemoteRequest) @@ -496,7 +496,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientHandler.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientHandler.html index 4914547b53..5104d9cb58 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientHandler.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientHandler.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteClientHandler + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteClientHandler @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteClientHandler + se.scalablesolutions.akka.remote.RemoteClientHandler

class RemoteClientHandler

@@ -580,7 +580,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientPipelineFactory.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientPipelineFactory.html index 99dd289efd..9979755c4e 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientPipelineFactory.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteClientPipelineFactory.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteClientPipelineFactory + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteClientPipelineFactory @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteClientPipelineFactory + se.scalablesolutions.akka.remote.RemoteClientPipelineFactory

class RemoteClientPipelineFactory

@@ -390,7 +390,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteProtocolBuilder$object.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteProtocolBuilder$object.html index 23bfbb25b0..7414fc3fdb 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteProtocolBuilder$object.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteProtocolBuilder$object.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteProtocolBuilder + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteProtocolBuilder @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteProtocolBuilder + se.scalablesolutions.akka.remote.RemoteProtocolBuilder

object RemoteProtocolBuilder

@@ -224,10 +224,10 @@ - getMessage.. + getMessage.. - def getMessage(reply : RemoteReply) + def getMessage(reply : RemoteReply) @@ -238,10 +238,10 @@ - getMessage.. + getMessage.. - def getMessage(request : RemoteRequest) + def getMessage(request : RemoteRequest) @@ -322,28 +322,28 @@ - setMessage.. + setMessage.. - def setMessage(message : Object, builder : Builder) + def setMessage(message : Object, builder : Builder) - Builder + Builder - setMessage.. + setMessage.. - def setMessage(message : Object, builder : Builder) + def setMessage(message : Object, builder : Builder) - Builder + Builder @@ -430,7 +430,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteRequestIdFactory$object.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteRequestIdFactory$object.html index ac46ff8eb3..02f7ca5815 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteRequestIdFactory$object.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteRequestIdFactory$object.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteRequestIdFactory + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteRequestIdFactory @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteRequestIdFactory + se.scalablesolutions.akka.remote.RemoteRequestIdFactory

object RemoteRequestIdFactory

@@ -392,7 +392,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServer$object.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServer$object.html index ca03ada2f5..cb3620be25 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServer$object.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServer$object.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteServer + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteServer @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteServer + se.scalablesolutions.akka.remote.RemoteServer

object RemoteServer

@@ -510,7 +510,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerHandler.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerHandler.html index 70071c45c7..14d11d9fdb 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerHandler.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerHandler.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteServerHandler + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteServerHandler @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteServerHandler + se.scalablesolutions.akka.remote.RemoteServerHandler

class RemoteServerHandler

@@ -580,7 +580,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS diff --git a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerPipelineFactory.html b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerPipelineFactory.html index 53f1eb9b9d..d606bb3eaa 100644 --- a/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerPipelineFactory.html +++ b/docs/scaladocs-akka-actors/se/scalablesolutions/akka/nio/RemoteServerPipelineFactory.html @@ -2,7 +2,7 @@ - Akka Actors Module 0.6 API : se.scalablesolutions.akka.nio.RemoteServerPipelineFactory + Akka Actors Module 0.6 API : se.scalablesolutions.akka.remote.RemoteServerPipelineFactory @@ -23,7 +23,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS @@ -40,7 +40,7 @@

- se.scalablesolutions.akka.nio.RemoteServerPipelineFactory + se.scalablesolutions.akka.remote.RemoteServerPipelineFactory

class RemoteServerPipelineFactory

@@ -390,7 +390,7 @@ OVERVIEW |  - PACKAGE | + PACKAGE | CONSTR |  FIELDS |  METHODS