+ */
+
+package se.scalablesolutions.akka.actor
+
+import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
+import se.scalablesolutions.akka.config.ScalaConfig._
+import se.scalablesolutions.akka.stm.global._
+import se.scalablesolutions.akka.stm.TransactionManagement._
+import se.scalablesolutions.akka.stm.TransactionManagement
+import se.scalablesolutions.akka.remote.protocol.RemoteProtocol._
+import se.scalablesolutions.akka.remote.{RemoteServer, RemoteRequestProtocolIdFactory, MessageSerializer}
+import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType._
+import se.scalablesolutions.akka.serialization.Serializer
+
+import com.google.protobuf.ByteString
+
+/**
+ * Type class definition for Actor Serialization
+ */
+trait FromBinary[T <: Actor] {
+ def fromBinary(bytes: Array[Byte], act: T): T
+}
+
+trait ToBinary[T <: Actor] {
+ def toBinary(t: T): Array[Byte]
+}
+
+// client needs to implement Format[] for the respective actor
+trait Format[T <: Actor] extends FromBinary[T] with ToBinary[T]
+
+/**
+ * A default implementation for a stateless actor
+ *
+ * Create a Format object with the client actor as the implementation of the type class
+ *
+ *
+ * object BinaryFormatMyStatelessActor {
+ * implicit object MyStatelessActorFormat extends StatelessActorFormat[MyStatelessActor]
+ * }
+ *
+ */
+trait StatelessActorFormat[T <: Actor] extends Format[T] {
+ def fromBinary(bytes: Array[Byte], act: T) = act
+ def toBinary(ac: T) = Array.empty[Byte]
+}
+
+/**
+ * A default implementation of the type class for a Format that specifies a serializer
+ *
+ * Create a Format object with the client actor as the implementation of the type class and
+ * a serializer object
+ *
+ *
+ * object BinaryFormatMyJavaSerializableActor {
+ * implicit object MyJavaSerializableActorFormat extends SerializerBasedActorFormat[MyJavaSerializableActor] {
+ * val serializer = Serializer.Java
+ * }
+ * }
+ *
+ */
+trait SerializerBasedActorFormat[T <: Actor] extends Format[T] {
+ val serializer: Serializer
+ def fromBinary(bytes: Array[Byte], act: T) = serializer.fromBinary(bytes, Some(act.self.actorClass)).asInstanceOf[T]
+ def toBinary(ac: T) = serializer.toBinary(ac)
+}
+
+/**
+ * Module for local actor serialization
+ */
+object ActorSerialization {
+
+ def fromBinary[T <: Actor](bytes: Array[Byte])(implicit format: Format[T]): ActorRef =
+ fromBinaryToLocalActorRef(bytes, format)
+
+ def toBinary[T <: Actor](a: ActorRef)(implicit format: Format[T]): Array[Byte] =
+ toSerializedActorRefProtocol(a, format).toByteArray
+
+ // wrapper for implicits to be used by Java
+ def fromBinaryJ[T <: Actor](bytes: Array[Byte], format: Format[T]): ActorRef =
+ fromBinary(bytes)(format)
+
+ // wrapper for implicits to be used by Java
+ def toBinaryJ[T <: Actor](a: ActorRef, format: Format[T]): Array[Byte] =
+ toBinary(a)(format)
+
+ private def toSerializedActorRefProtocol[T <: Actor](
+ actorRef: ActorRef, format: Format[T]): SerializedActorRefProtocol = {
+ val lifeCycleProtocol: Option[LifeCycleProtocol] = {
+ def setScope(builder: LifeCycleProtocol.Builder, scope: Scope) = scope match {
+ case Permanent => builder.setLifeCycle(LifeCycleType.PERMANENT)
+ case Temporary => builder.setLifeCycle(LifeCycleType.TEMPORARY)
+ }
+ val builder = LifeCycleProtocol.newBuilder
+ actorRef.lifeCycle match {
+ case Some(LifeCycle(scope)) =>
+ setScope(builder, scope)
+ Some(builder.build)
+ case None => None
+ }
+ }
+
+ val originalAddress = AddressProtocol.newBuilder
+ .setHostname(actorRef.homeAddress.getHostName)
+ .setPort(actorRef.homeAddress.getPort)
+ .build
+
+ val builder = SerializedActorRefProtocol.newBuilder
+ .setUuid(actorRef.uuid)
+ .setId(actorRef.id)
+ .setActorClassname(actorRef.actorClass.getName)
+ .setOriginalAddress(originalAddress)
+ .setIsTransactor(actorRef.isTransactor)
+ .setTimeout(actorRef.timeout)
+
+ actorRef.receiveTimeout.foreach(builder.setReceiveTimeout(_))
+ builder.setActorInstance(ByteString.copyFrom(format.toBinary(actorRef.actor.asInstanceOf[T])))
+ lifeCycleProtocol.foreach(builder.setLifeCycle(_))
+ actorRef.supervisor.foreach(s => builder.setSupervisor(RemoteActorSerialization.toRemoteActorRefProtocol(s)))
+ // FIXME: how to serialize the hotswap PartialFunction ??
+ //hotswap.foreach(builder.setHotswapStack(_))
+ builder.build
+ }
+
+ private def fromBinaryToLocalActorRef[T <: Actor](bytes: Array[Byte], format: Format[T]): ActorRef =
+ fromProtobufToLocalActorRef(SerializedActorRefProtocol.newBuilder.mergeFrom(bytes).build, format, None)
+
+ private def fromProtobufToLocalActorRef[T <: Actor](
+ protocol: SerializedActorRefProtocol, format: Format[T], loader: Option[ClassLoader]): ActorRef = {
+ Actor.log.debug("Deserializing SerializedActorRefProtocol to LocalActorRef:\n" + protocol)
+
+ val serializer =
+ if (format.isInstanceOf[SerializerBasedActorFormat[_]])
+ Some(format.asInstanceOf[SerializerBasedActorFormat[_]].serializer)
+ else None
+
+ val lifeCycle =
+ if (protocol.hasLifeCycle) {
+ val lifeCycleProtocol = protocol.getLifeCycle
+ Some(if (lifeCycleProtocol.getLifeCycle == LifeCycleType.PERMANENT) LifeCycle(Permanent)
+ else if (lifeCycleProtocol.getLifeCycle == LifeCycleType.TEMPORARY) LifeCycle(Temporary)
+ else throw new IllegalActorStateException("LifeCycle type is not valid: " + lifeCycleProtocol.getLifeCycle))
+ } else None
+
+ val supervisor =
+ if (protocol.hasSupervisor)
+ Some(RemoteActorSerialization.fromProtobufToRemoteActorRef(protocol.getSupervisor, loader))
+ else None
+
+ val hotswap =
+ if (serializer.isDefined && protocol.hasHotswapStack) Some(serializer.get
+ .fromBinary(protocol.getHotswapStack.toByteArray, Some(classOf[PartialFunction[Any, Unit]]))
+ .asInstanceOf[PartialFunction[Any, Unit]])
+ else None
+
+ val classLoader = loader.getOrElse(getClass.getClassLoader)
+
+ val factory = () => {
+ val actorClass = classLoader.loadClass(protocol.getActorClassname)
+ if (format.isInstanceOf[SerializerBasedActorFormat[_]])
+ format.asInstanceOf[SerializerBasedActorFormat[_]].serializer.fromBinary(
+ protocol.getActorInstance.toByteArray, Some(actorClass)).asInstanceOf[Actor]
+ else actorClass.newInstance.asInstanceOf[Actor]
+ }
+
+ val ar = new LocalActorRef(
+ protocol.getUuid,
+ protocol.getId,
+ protocol.getOriginalAddress.getHostname,
+ protocol.getOriginalAddress.getPort,
+ if (protocol.hasIsTransactor) protocol.getIsTransactor else false,
+ if (protocol.hasTimeout) protocol.getTimeout else Actor.TIMEOUT,
+ if (protocol.hasReceiveTimeout) Some(protocol.getReceiveTimeout) else None,
+ lifeCycle,
+ supervisor,
+ hotswap,
+ classLoader, // TODO: should we fall back to getClass.getClassLoader?
+ factory)
+
+ val messages = protocol.getMessagesList.toArray.toList.asInstanceOf[List[RemoteRequestProtocol]]
+ messages.foreach(message => ar ! MessageSerializer.deserialize(message.getMessage))
+
+ if (format.isInstanceOf[SerializerBasedActorFormat[_]] == false)
+ format.fromBinary(protocol.getActorInstance.toByteArray, ar.actor.asInstanceOf[T])
+ ar
+ }
+}
+
+object RemoteActorSerialization {
+ /**
+ * Deserializes a byte array (Array[Byte]) into an RemoteActorRef instance.
+ */
+ def fromBinaryToRemoteActorRef(bytes: Array[Byte]): ActorRef =
+ fromProtobufToRemoteActorRef(RemoteActorRefProtocol.newBuilder.mergeFrom(bytes).build, None)
+
+ /**
+ * Deserializes a byte array (Array[Byte]) into an RemoteActorRef instance.
+ */
+ def fromBinaryToRemoteActorRef(bytes: Array[Byte], loader: ClassLoader): ActorRef =
+ fromProtobufToRemoteActorRef(RemoteActorRefProtocol.newBuilder.mergeFrom(bytes).build, Some(loader))
+
+ /**
+ * Deserializes a RemoteActorRefProtocol Protocol Buffers (protobuf) Message into an RemoteActorRef instance.
+ */
+ private[akka] def fromProtobufToRemoteActorRef(protocol: RemoteActorRefProtocol, loader: Option[ClassLoader]): ActorRef = {
+ Actor.log.debug("Deserializing RemoteActorRefProtocol to RemoteActorRef:\n" + protocol)
+ RemoteActorRef(
+ protocol.getUuid,
+ protocol.getActorClassname,
+ protocol.getHomeAddress.getHostname,
+ protocol.getHomeAddress.getPort,
+ protocol.getTimeout,
+ loader)
+ }
+
+ /**
+ * Serializes the ActorRef instance into a Protocol Buffers (protobuf) Message.
+ */
+ def toRemoteActorRefProtocol(ar: ActorRef): RemoteActorRefProtocol = {
+ import ar._
+ val host = homeAddress.getHostName
+ val port = homeAddress.getPort
+
+ if (!registeredInRemoteNodeDuringSerialization) {
+ Actor.log.debug("Register serialized Actor [%s] as remote @ [%s:%s]", actorClass.getName, host, port)
+ RemoteServer.getOrCreateServer(homeAddress)
+ RemoteServer.registerActor(homeAddress, uuid, ar)
+ registeredInRemoteNodeDuringSerialization = true
+ }
+
+ RemoteActorRefProtocol.newBuilder
+ .setUuid(uuid)
+ .setActorClassname(actorClass.getName)
+ .setHomeAddress(AddressProtocol.newBuilder.setHostname(host).setPort(port).build)
+ .setTimeout(timeout)
+ .build
+ }
+
+ def createRemoteRequestProtocolBuilder(
+ actorRef: ActorRef,
+ message: Any,
+ isOneWay: Boolean,
+ senderOption: Option[ActorRef],
+ typedActorInfo: Option[Tuple2[String, String]],
+ actorType: ActorType):
+ RemoteRequestProtocol.Builder = {
+ import actorRef._
+
+ val actorInfoBuilder = ActorInfoProtocol.newBuilder
+ .setUuid(uuid)
+ .setTarget(actorClassName)
+ .setTimeout(timeout)
+
+ typedActorInfo.foreach { typedActor =>
+ actorInfoBuilder.setTypedActorInfo(
+ TypedActorInfoProtocol.newBuilder
+ .setInterface(typedActor._1)
+ .setMethod(typedActor._2)
+ .build)
+ }
+
+ actorType match {
+ case ActorType.ScalaActor => actorInfoBuilder.setActorType(SCALA_ACTOR)
+ case ActorType.TypedActor => actorInfoBuilder.setActorType(TYPED_ACTOR)
+ }
+ val actorInfo = actorInfoBuilder.build
+
+ val requestBuilder = RemoteRequestProtocol.newBuilder
+ .setId(RemoteRequestProtocolIdFactory.nextId)
+ .setMessage(MessageSerializer.serialize(message))
+ .setActorInfo(actorInfo)
+ .setIsOneWay(isOneWay)
+
+ val id = registerSupervisorAsRemoteActor
+ if (id.isDefined) requestBuilder.setSupervisorUuid(id.get)
+
+ senderOption.foreach { sender =>
+ RemoteServer.getOrCreateServer(sender.homeAddress).register(sender.uuid, sender)
+ requestBuilder.setSender(toRemoteActorRefProtocol(sender))
+ }
+ requestBuilder
+ }
+}
diff --git a/akka-core/src/main/scala/serialization/Serializer.scala b/akka-remote/src/main/scala/serialization/Serializer.scala
similarity index 100%
rename from akka-core/src/main/scala/serialization/Serializer.scala
rename to akka-remote/src/main/scala/serialization/Serializer.scala
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java b/akka-remote/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java
similarity index 98%
rename from akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java
index 683f008729..183d2025d0 100644
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java
+++ b/akka-remote/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java
@@ -15,47 +15,47 @@ public final class ProtobufProtocol {
initFields();
}
private ProtobufPOJO(boolean noInit) {}
-
+
private static final ProtobufPOJO defaultInstance;
public static ProtobufPOJO getDefaultInstance() {
return defaultInstance;
}
-
+
public ProtobufPOJO getDefaultInstanceForType() {
return defaultInstance;
}
-
+
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_ProtobufPOJO_descriptor;
}
-
+
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_ProtobufPOJO_fieldAccessorTable;
}
-
+
// required uint64 id = 1;
public static final int ID_FIELD_NUMBER = 1;
private boolean hasId;
private long id_ = 0L;
public boolean hasId() { return hasId; }
public long getId() { return id_; }
-
+
// required string name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private boolean hasName;
private java.lang.String name_ = "";
public boolean hasName() { return hasName; }
public java.lang.String getName() { return name_; }
-
+
// required bool status = 3;
public static final int STATUS_FIELD_NUMBER = 3;
private boolean hasStatus;
private boolean status_ = false;
public boolean hasStatus() { return hasStatus; }
public boolean getStatus() { return status_; }
-
+
private void initFields() {
}
public final boolean isInitialized() {
@@ -64,7 +64,7 @@ public final class ProtobufProtocol {
if (!hasStatus) return false;
return true;
}
-
+
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
@@ -79,12 +79,12 @@ public final class ProtobufProtocol {
}
getUnknownFields().writeTo(output);
}
-
+
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
-
+
size = 0;
if (hasId()) {
size += com.google.protobuf.CodedOutputStream
@@ -102,7 +102,7 @@ public final class ProtobufProtocol {
memoizedSerializedSize = size;
return size;
}
-
+
public static se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -169,31 +169,31 @@ public final class ProtobufProtocol {
return newBuilder().mergeFrom(input, extensionRegistry)
.buildParsed();
}
-
+
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO 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.actor.ProtobufProtocol.ProtobufPOJO result;
-
+
// Construct using se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.newBuilder()
private Builder() {}
-
+
private static Builder create() {
Builder builder = new Builder();
builder.result = new se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO();
return builder;
}
-
+
protected se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO internalGetResult() {
return result;
}
-
+
public Builder clear() {
if (result == null) {
throw new IllegalStateException(
@@ -202,20 +202,20 @@ public final class ProtobufProtocol {
result = new se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO();
return this;
}
-
+
public Builder clone() {
return create().mergeFrom(result);
}
-
+
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.getDescriptor();
}
-
+
public se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO getDefaultInstanceForType() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.getDefaultInstance();
}
-
+
public boolean isInitialized() {
return result.isInitialized();
}
@@ -225,7 +225,7 @@ public final class ProtobufProtocol {
}
return buildPartial();
}
-
+
private se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
@@ -234,7 +234,7 @@ public final class ProtobufProtocol {
}
return buildPartial();
}
-
+
public se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO buildPartial() {
if (result == null) {
throw new IllegalStateException(
@@ -244,7 +244,7 @@ public final class ProtobufProtocol {
result = null;
return returnMe;
}
-
+
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO) {
return mergeFrom((se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO)other);
@@ -253,7 +253,7 @@ public final class ProtobufProtocol {
return this;
}
}
-
+
public Builder mergeFrom(se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO other) {
if (other == se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.getDefaultInstance()) return this;
if (other.hasId()) {
@@ -268,7 +268,7 @@ public final class ProtobufProtocol {
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
-
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -305,8 +305,8 @@ public final class ProtobufProtocol {
}
}
}
-
-
+
+
// required uint64 id = 1;
public boolean hasId() {
return result.hasId();
@@ -324,7 +324,7 @@ public final class ProtobufProtocol {
result.id_ = 0L;
return this;
}
-
+
// required string name = 2;
public boolean hasName() {
return result.hasName();
@@ -345,7 +345,7 @@ public final class ProtobufProtocol {
result.name_ = getDefaultInstance().getName();
return this;
}
-
+
// required bool status = 3;
public boolean hasStatus() {
return result.hasStatus();
@@ -363,19 +363,19 @@ public final class ProtobufProtocol {
result.status_ = false;
return this;
}
-
+
// @@protoc_insertion_point(builder_scope:se.scalablesolutions.akka.actor.ProtobufPOJO)
}
-
+
static {
defaultInstance = new ProtobufPOJO(true);
se.scalablesolutions.akka.actor.ProtobufProtocol.internalForceInit();
defaultInstance.initFields();
}
-
+
// @@protoc_insertion_point(class_scope:se.scalablesolutions.akka.actor.ProtobufPOJO)
}
-
+
public static final class Counter extends
com.google.protobuf.GeneratedMessage {
// Use Counter.newBuilder() to construct.
@@ -383,40 +383,40 @@ public final class ProtobufProtocol {
initFields();
}
private Counter(boolean noInit) {}
-
+
private static final Counter defaultInstance;
public static Counter getDefaultInstance() {
return defaultInstance;
}
-
+
public Counter getDefaultInstanceForType() {
return defaultInstance;
}
-
+
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_Counter_descriptor;
}
-
+
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_Counter_fieldAccessorTable;
}
-
+
// required uint32 count = 1;
public static final int COUNT_FIELD_NUMBER = 1;
private boolean hasCount;
private int count_ = 0;
public boolean hasCount() { return hasCount; }
public int getCount() { return count_; }
-
+
private void initFields() {
}
public final boolean isInitialized() {
if (!hasCount) return false;
return true;
}
-
+
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
@@ -425,12 +425,12 @@ public final class ProtobufProtocol {
}
getUnknownFields().writeTo(output);
}
-
+
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
-
+
size = 0;
if (hasCount()) {
size += com.google.protobuf.CodedOutputStream
@@ -440,7 +440,7 @@ public final class ProtobufProtocol {
memoizedSerializedSize = size;
return size;
}
-
+
public static se.scalablesolutions.akka.actor.ProtobufProtocol.Counter parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -507,31 +507,31 @@ public final class ProtobufProtocol {
return newBuilder().mergeFrom(input, extensionRegistry)
.buildParsed();
}
-
+
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(se.scalablesolutions.akka.actor.ProtobufProtocol.Counter 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.actor.ProtobufProtocol.Counter result;
-
+
// Construct using se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.newBuilder()
private Builder() {}
-
+
private static Builder create() {
Builder builder = new Builder();
builder.result = new se.scalablesolutions.akka.actor.ProtobufProtocol.Counter();
return builder;
}
-
+
protected se.scalablesolutions.akka.actor.ProtobufProtocol.Counter internalGetResult() {
return result;
}
-
+
public Builder clear() {
if (result == null) {
throw new IllegalStateException(
@@ -540,20 +540,20 @@ public final class ProtobufProtocol {
result = new se.scalablesolutions.akka.actor.ProtobufProtocol.Counter();
return this;
}
-
+
public Builder clone() {
return create().mergeFrom(result);
}
-
+
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.getDescriptor();
}
-
+
public se.scalablesolutions.akka.actor.ProtobufProtocol.Counter getDefaultInstanceForType() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.getDefaultInstance();
}
-
+
public boolean isInitialized() {
return result.isInitialized();
}
@@ -563,7 +563,7 @@ public final class ProtobufProtocol {
}
return buildPartial();
}
-
+
private se.scalablesolutions.akka.actor.ProtobufProtocol.Counter buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
@@ -572,7 +572,7 @@ public final class ProtobufProtocol {
}
return buildPartial();
}
-
+
public se.scalablesolutions.akka.actor.ProtobufProtocol.Counter buildPartial() {
if (result == null) {
throw new IllegalStateException(
@@ -582,7 +582,7 @@ public final class ProtobufProtocol {
result = null;
return returnMe;
}
-
+
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof se.scalablesolutions.akka.actor.ProtobufProtocol.Counter) {
return mergeFrom((se.scalablesolutions.akka.actor.ProtobufProtocol.Counter)other);
@@ -591,7 +591,7 @@ public final class ProtobufProtocol {
return this;
}
}
-
+
public Builder mergeFrom(se.scalablesolutions.akka.actor.ProtobufProtocol.Counter other) {
if (other == se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.getDefaultInstance()) return this;
if (other.hasCount()) {
@@ -600,7 +600,7 @@ public final class ProtobufProtocol {
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
-
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -629,8 +629,8 @@ public final class ProtobufProtocol {
}
}
}
-
-
+
+
// required uint32 count = 1;
public boolean hasCount() {
return result.hasCount();
@@ -648,19 +648,19 @@ public final class ProtobufProtocol {
result.count_ = 0;
return this;
}
-
+
// @@protoc_insertion_point(builder_scope:se.scalablesolutions.akka.actor.Counter)
}
-
+
static {
defaultInstance = new Counter(true);
se.scalablesolutions.akka.actor.ProtobufProtocol.internalForceInit();
defaultInstance.initFields();
}
-
+
// @@protoc_insertion_point(class_scope:se.scalablesolutions.akka.actor.Counter)
}
-
+
public static final class DualCounter extends
com.google.protobuf.GeneratedMessage {
// Use DualCounter.newBuilder() to construct.
@@ -668,40 +668,40 @@ public final class ProtobufProtocol {
initFields();
}
private DualCounter(boolean noInit) {}
-
+
private static final DualCounter defaultInstance;
public static DualCounter getDefaultInstance() {
return defaultInstance;
}
-
+
public DualCounter getDefaultInstanceForType() {
return defaultInstance;
}
-
+
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_DualCounter_descriptor;
}
-
+
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_DualCounter_fieldAccessorTable;
}
-
+
// required uint32 count1 = 1;
public static final int COUNT1_FIELD_NUMBER = 1;
private boolean hasCount1;
private int count1_ = 0;
public boolean hasCount1() { return hasCount1; }
public int getCount1() { return count1_; }
-
+
// required uint32 count2 = 2;
public static final int COUNT2_FIELD_NUMBER = 2;
private boolean hasCount2;
private int count2_ = 0;
public boolean hasCount2() { return hasCount2; }
public int getCount2() { return count2_; }
-
+
private void initFields() {
}
public final boolean isInitialized() {
@@ -709,7 +709,7 @@ public final class ProtobufProtocol {
if (!hasCount2) return false;
return true;
}
-
+
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
@@ -721,12 +721,12 @@ public final class ProtobufProtocol {
}
getUnknownFields().writeTo(output);
}
-
+
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
-
+
size = 0;
if (hasCount1()) {
size += com.google.protobuf.CodedOutputStream
@@ -740,7 +740,7 @@ public final class ProtobufProtocol {
memoizedSerializedSize = size;
return size;
}
-
+
public static se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -807,31 +807,31 @@ public final class ProtobufProtocol {
return newBuilder().mergeFrom(input, extensionRegistry)
.buildParsed();
}
-
+
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter 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.actor.ProtobufProtocol.DualCounter result;
-
+
// Construct using se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.newBuilder()
private Builder() {}
-
+
private static Builder create() {
Builder builder = new Builder();
builder.result = new se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter();
return builder;
}
-
+
protected se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter internalGetResult() {
return result;
}
-
+
public Builder clear() {
if (result == null) {
throw new IllegalStateException(
@@ -840,20 +840,20 @@ public final class ProtobufProtocol {
result = new se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter();
return this;
}
-
+
public Builder clone() {
return create().mergeFrom(result);
}
-
+
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.getDescriptor();
}
-
+
public se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter getDefaultInstanceForType() {
return se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.getDefaultInstance();
}
-
+
public boolean isInitialized() {
return result.isInitialized();
}
@@ -863,7 +863,7 @@ public final class ProtobufProtocol {
}
return buildPartial();
}
-
+
private se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
@@ -872,7 +872,7 @@ public final class ProtobufProtocol {
}
return buildPartial();
}
-
+
public se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter buildPartial() {
if (result == null) {
throw new IllegalStateException(
@@ -882,7 +882,7 @@ public final class ProtobufProtocol {
result = null;
return returnMe;
}
-
+
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter) {
return mergeFrom((se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter)other);
@@ -891,7 +891,7 @@ public final class ProtobufProtocol {
return this;
}
}
-
+
public Builder mergeFrom(se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter other) {
if (other == se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.getDefaultInstance()) return this;
if (other.hasCount1()) {
@@ -903,7 +903,7 @@ public final class ProtobufProtocol {
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
-
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -936,8 +936,8 @@ public final class ProtobufProtocol {
}
}
}
-
-
+
+
// required uint32 count1 = 1;
public boolean hasCount1() {
return result.hasCount1();
@@ -955,7 +955,7 @@ public final class ProtobufProtocol {
result.count1_ = 0;
return this;
}
-
+
// required uint32 count2 = 2;
public boolean hasCount2() {
return result.hasCount2();
@@ -973,19 +973,19 @@ public final class ProtobufProtocol {
result.count2_ = 0;
return this;
}
-
+
// @@protoc_insertion_point(builder_scope:se.scalablesolutions.akka.actor.DualCounter)
}
-
+
static {
defaultInstance = new DualCounter(true);
se.scalablesolutions.akka.actor.ProtobufProtocol.internalForceInit();
defaultInstance.initFields();
}
-
+
// @@protoc_insertion_point(class_scope:se.scalablesolutions.akka.actor.DualCounter)
}
-
+
private static com.google.protobuf.Descriptors.Descriptor
internal_static_se_scalablesolutions_akka_actor_ProtobufPOJO_descriptor;
private static
@@ -1001,7 +1001,7 @@ public final class ProtobufProtocol {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_se_scalablesolutions_akka_actor_DualCounter_fieldAccessorTable;
-
+
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
return descriptor;
@@ -1053,8 +1053,8 @@ public final class ProtobufProtocol {
new com.google.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
}
-
+
public static void internalForceInit() {}
-
+
// @@protoc_insertion_point(outer_class_scope)
}
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java b/akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java b/akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java b/akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java b/akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java
diff --git a/akka-typed-actors/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java b/akka-remote/src/test/java/se/scalablesolutions/akka/config/DependencyBinding.java
similarity index 100%
rename from akka-typed-actors/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/config/DependencyBinding.java
diff --git a/akka-typed-actors/src/main/java/se/scalablesolutions/akka/config/TypedActorGuiceModule.java b/akka-remote/src/test/java/se/scalablesolutions/akka/config/TypedActorGuiceModule.java
similarity index 100%
rename from akka-typed-actors/src/main/java/se/scalablesolutions/akka/config/TypedActorGuiceModule.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/config/TypedActorGuiceModule.java
diff --git a/akka-core/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java b/akka-remote/src/test/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java
similarity index 100%
rename from akka-core/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java
rename to akka-remote/src/test/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java
diff --git a/akka-core/src/test/protocol/ProtobufProtocol.proto b/akka-remote/src/test/protocol/ProtobufProtocol.proto
similarity index 92%
rename from akka-core/src/test/protocol/ProtobufProtocol.proto
rename to akka-remote/src/test/protocol/ProtobufProtocol.proto
index 35ffec95e3..a63ebdff62 100644
--- a/akka-core/src/test/protocol/ProtobufProtocol.proto
+++ b/akka-remote/src/test/protocol/ProtobufProtocol.proto
@@ -6,7 +6,7 @@ package se.scalablesolutions.akka.actor;
/*
Compile with:
- cd ./akka-core/src/test/protocol
+ cd ./akka-remote/src/test/protocol
protoc ProtobufProtocol.proto --java_out ../java
*/
diff --git a/akka-core/src/test/resources/META-INF/aop.xml b/akka-remote/src/test/resources/META-INF/aop.xml
similarity index 100%
rename from akka-core/src/test/resources/META-INF/aop.xml
rename to akka-remote/src/test/resources/META-INF/aop.xml
diff --git a/akka-core/src/test/resources/logback-test.xml b/akka-remote/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-core/src/test/resources/logback-test.xml
rename to akka-remote/src/test/resources/logback-test.xml
diff --git a/akka-actors/src/test/scala/Messages.scala b/akka-remote/src/test/scala/Messages.scala
similarity index 83%
rename from akka-actors/src/test/scala/Messages.scala
rename to akka-remote/src/test/scala/Messages.scala
index ad1fcf8885..2b99155626 100644
--- a/akka-actors/src/test/scala/Messages.scala
+++ b/akka-remote/src/test/scala/Messages.scala
@@ -8,14 +8,6 @@ import se.scalablesolutions.akka.serialization.Serializable
import sbinary._
import sbinary.Operations._
-sealed abstract class TestMessage
-
-case object Ping extends TestMessage
-case object Pong extends TestMessage
-case object OneWay extends TestMessage
-case object Die extends TestMessage
-case object NotifySupervisorExit extends TestMessage
-
case class User(val usernamePassword: Tuple2[String, String],
val email: String,
val age: Int)
diff --git a/akka-core/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala b/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
rename to akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
diff --git a/akka-core/src/test/scala/remote/RemoteSupervisorSpec.scala b/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/remote/RemoteSupervisorSpec.scala
rename to akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
diff --git a/akka-core/src/test/scala/remote/RemoteTransactionalTypedActorSpec.scala b/akka-remote/src/test/scala/remote/RemoteTransactionalTypedActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/remote/RemoteTransactionalTypedActorSpec.scala
rename to akka-remote/src/test/scala/remote/RemoteTransactionalTypedActorSpec.scala
diff --git a/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala b/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala
rename to akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala
diff --git a/akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala
similarity index 100%
rename from akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala
rename to akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala
diff --git a/akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
rename to akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
diff --git a/akka-core/src/test/scala/remote/ShutdownSpec.scala b/akka-remote/src/test/scala/remote/ShutdownSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/remote/ShutdownSpec.scala
rename to akka-remote/src/test/scala/remote/ShutdownSpec.scala
diff --git a/akka-core/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala b/akka-remote/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala
rename to akka-remote/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala
diff --git a/akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala b/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
rename to akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
diff --git a/akka-core/src/test/scala/serialization/SerializerSpec.scala b/akka-remote/src/test/scala/serialization/SerializerSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/serialization/SerializerSpec.scala
rename to akka-remote/src/test/scala/serialization/SerializerSpec.scala
diff --git a/akka-core/src/test/scala/serialization/UntypedActorSerializationSpec.scala b/akka-remote/src/test/scala/serialization/UntypedActorSerializationSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/serialization/UntypedActorSerializationSpec.scala
rename to akka-remote/src/test/scala/serialization/UntypedActorSerializationSpec.scala
diff --git a/akka-core/src/test/scala/ticket/Ticket001Spec.scala b/akka-remote/src/test/scala/ticket/Ticket001Spec.scala
similarity index 100%
rename from akka-core/src/test/scala/ticket/Ticket001Spec.scala
rename to akka-remote/src/test/scala/ticket/Ticket001Spec.scala
diff --git a/akka-samples/akka-sample-chat/Buildfile b/akka-samples/akka-sample-chat/Buildfile
index fecc093964..814e6e4149 100644
--- a/akka-samples/akka-sample-chat/Buildfile
+++ b/akka-samples/akka-sample-chat/Buildfile
@@ -7,7 +7,7 @@ repositories.remote << "http://www.ibiblio.org/maven2/"
repositories.remote << "http://www.lag.net/repo"
repositories.remote << "http://multiverse.googlecode.com/svn/maven-repository/releases"
-AKKA = group('akka-core', 'akka-comet', 'akka-util','akka-kernel', 'akka-rest', 'akka-util-java',
+AKKA = group('akka-remote', 'akka-comet', 'akka-util','akka-kernel', 'akka-rest', 'akka-util-java',
'akka-security','akka-persistence-common', 'akka-persistence-redis',
'akka-amqp',
:under=> 'se.scalablesolutions.akka',
diff --git a/akka-sbt-plugin/src/main/scala/AkkaProject.scala b/akka-sbt-plugin/src/main/scala/AkkaProject.scala
index ecf19ae135..ad0f98eee1 100644
--- a/akka-sbt-plugin/src/main/scala/AkkaProject.scala
+++ b/akka-sbt-plugin/src/main/scala/AkkaProject.scala
@@ -46,6 +46,6 @@ trait AkkaProject extends AkkaBaseProject {
// convenience method
def akkaModule(module: String) = "se.scalablesolutions.akka" %% ("akka-" + module) % akkaVersion
- // akka core dependency by default
- val akkaCore = akkaModule("core")
+ // akka remote dependency by default
+ val akkaRemote = akkaModule("remote")
}
diff --git a/akka-typed-actor/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java b/akka-typed-actor/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java
new file mode 100644
index 0000000000..2956e6860f
--- /dev/null
+++ b/akka-typed-actor/src/main/java/se/scalablesolutions/akka/config/DependencyBinding.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB
+ */
+
+package se.scalablesolutions.akka.config;
+
+/**
+ * @author Jonas Bonér
+ */
+public class DependencyBinding {
+ private final Class intf;
+ private final Object target;
+
+ public DependencyBinding(final Class intf, final Object target) {
+ this.intf = intf;
+ this.target = target;
+ }
+ public Class getInterface() {
+ return intf;
+ }
+ public Object getTarget() {
+ return target;
+ }
+}
diff --git a/akka-typed-actor/src/main/java/se/scalablesolutions/akka/config/TypedActorGuiceModule.java b/akka-typed-actor/src/main/java/se/scalablesolutions/akka/config/TypedActorGuiceModule.java
new file mode 100644
index 0000000000..0c2ed11402
--- /dev/null
+++ b/akka-typed-actor/src/main/java/se/scalablesolutions/akka/config/TypedActorGuiceModule.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB
+ */
+
+package se.scalablesolutions.akka.config;
+
+import java.util.List;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Singleton;
+//import com.google.inject.jsr250.ResourceProviderFactory;
+
+/**
+ * @author Jonas Bonér
+ */
+public class TypedActorGuiceModule extends AbstractModule {
+ private final List bindings;
+
+ public TypedActorGuiceModule(final List bindings) {
+ this.bindings = bindings;
+ }
+
+ protected void configure() {
+ //bind(ResourceProviderFactory.class);
+ for (int i = 0; i < bindings.size(); i++) {
+ final DependencyBinding db = bindings.get(i);
+ //if (db.getInterface() ne null) bind((Class) db.getInterface()).to((Class) db.getTarget()).in(Singleton.class);
+ //else
+ this.bind(db.getInterface()).toInstance(db.getTarget());
+ }
+ }
+}
diff --git a/akka-typed-actors/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java b/akka-typed-actor/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java
similarity index 100%
rename from akka-typed-actors/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java
rename to akka-typed-actor/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java
diff --git a/akka-typed-actors/src/main/scala/actor/TypedActor.scala b/akka-typed-actor/src/main/scala/actor/TypedActor.scala
similarity index 94%
rename from akka-typed-actors/src/main/scala/actor/TypedActor.scala
rename to akka-typed-actor/src/main/scala/actor/TypedActor.scala
index c3d2444e55..96790b590b 100644
--- a/akka-typed-actors/src/main/scala/actor/TypedActor.scala
+++ b/akka-typed-actor/src/main/scala/actor/TypedActor.scala
@@ -6,12 +6,10 @@ package se.scalablesolutions.akka.actor
import Actor._
import se.scalablesolutions.akka.config.FaultHandlingStrategy
-import se.scalablesolutions.akka.remote.protocol.RemoteProtocol._
-import se.scalablesolutions.akka.remote.{MessageSerializer, RemoteClient, RemoteRequestProtocolIdFactory}
import se.scalablesolutions.akka.dispatch.{MessageDispatcher, Future, CompletableFuture, Dispatchers}
import se.scalablesolutions.akka.config.ScalaConfig._
-import se.scalablesolutions.akka.serialization.Serializer
import se.scalablesolutions.akka.util._
+import ReflectiveAccess._
import org.codehaus.aspectwerkz.joinpoint.{MethodRtti, JoinPoint}
import org.codehaus.aspectwerkz.proxy.Proxy
@@ -226,8 +224,11 @@ abstract class TypedActor extends Actor with Proxyable {
if (arg.getClass.getName.contains(TypedActor.AW_PROXY_PREFIX)) unserializable = true
}
if (!unserializable && hasMutableArgument) {
- val copyOfArgs = Serializer.Java.deepClone(args)
- joinPoint.getRtti.asInstanceOf[MethodRtti].setParameterValues(copyOfArgs.asInstanceOf[Array[AnyRef]])
+
+ //FIXME serializeArguments
+ // val copyOfArgs = Serializer.Java.deepClone(args)
+ // joinPoint.getRtti.asInstanceOf[MethodRtti].setParameterValues(copyOfArgs.asInstanceOf[Array[AnyRef]])
+ joinPoint
}
}
}
@@ -538,11 +539,11 @@ object TypedActor extends Logging {
private[akka] def supervise(restartStrategy: RestartStrategy, components: List[Supervise]): Supervisor =
Supervisor(SupervisorConfig(restartStrategy, components))
- private[akka] def isJoinPointAndOneWay(message: AnyRef): Boolean = if (isJoinPoint(message))
+ def isJoinPointAndOneWay(message: Any): Boolean = if (isJoinPoint(message))
isOneWay(message.asInstanceOf[JoinPoint].getRtti.asInstanceOf[MethodRtti])
else false
- private[akka] def isJoinPoint(message: AnyRef): Boolean = message.isInstanceOf[JoinPoint])
+ private[akka] def isJoinPoint(message: Any): Boolean = message.isInstanceOf[JoinPoint]
}
/**
@@ -604,33 +605,14 @@ private[akka] sealed class TypedActorAspect {
private def remoteDispatch(joinPoint: JoinPoint): AnyRef = {
val methodRtti = joinPoint.getRtti.asInstanceOf[MethodRtti]
val isOneWay = TypedActor.isOneWay(methodRtti)
+
val (message: Array[AnyRef], isEscaped) = escapeArguments(methodRtti.getParameterValues)
-
- val typedActorInfo = TypedActorInfoProtocol.newBuilder
- .setInterface(interfaceClass.getName)
- .setMethod(methodRtti.getMethod.getName)
- .build
-
- val actorInfo = ActorInfoProtocol.newBuilder
- .setUuid(uuid)
- .setTarget(typedActor.getClass.getName)
- .setTimeout(timeout)
- .setActorType(ActorType.TYPED_ACTOR)
- .setTypedActorInfo(typedActorInfo)
- .build
-
- val requestBuilder = RemoteRequestProtocol.newBuilder
- .setId(RemoteRequestProtocolIdFactory.nextId)
- .setMessage(MessageSerializer.serialize(message))
- .setActorInfo(actorInfo)
- .setIsOneWay(isOneWay)
-
- val id = actorRef.registerSupervisorAsRemoteActor
- if (id.isDefined) requestBuilder.setSupervisorUuid(id.get)
-
- val remoteMessage = requestBuilder.build
-
- val future = RemoteClient.clientFor(remoteAddress.get).send(remoteMessage, None)
+
+ val future = RemoteClientModule.send[AnyRef](
+ message, None, None, remoteAddress.get,
+ timeout, isOneWay, actorRef,
+ Some((interfaceClass.getName, methodRtti.getMethod.getName)),
+ ActorType.TypedActor)
if (isOneWay) null // for void methods
else {
diff --git a/akka-typed-actors/src/main/scala/config/TypedActorConfigurator.scala b/akka-typed-actor/src/main/scala/config/TypedActorConfigurator.scala
similarity index 100%
rename from akka-typed-actors/src/main/scala/config/TypedActorConfigurator.scala
rename to akka-typed-actor/src/main/scala/config/TypedActorConfigurator.scala
diff --git a/akka-typed-actors/src/main/scala/config/TypedActorGuiceConfigurator.scala b/akka-typed-actor/src/main/scala/config/TypedActorGuiceConfigurator.scala
similarity index 97%
rename from akka-typed-actors/src/main/scala/config/TypedActorGuiceConfigurator.scala
rename to akka-typed-actor/src/main/scala/config/TypedActorGuiceConfigurator.scala
index 718050655c..339c4d297d 100644
--- a/akka-typed-actors/src/main/scala/config/TypedActorGuiceConfigurator.scala
+++ b/akka-typed-actor/src/main/scala/config/TypedActorGuiceConfigurator.scala
@@ -6,8 +6,8 @@ package se.scalablesolutions.akka.config
import se.scalablesolutions.akka.actor._
import se.scalablesolutions.akka.config.ScalaConfig._
-import se.scalablesolutions.akka.remote.RemoteServer
-import se.scalablesolutions.akka.util.Logging
+import se.scalablesolutions.akka.util._
+import ReflectiveAccess._
import org.codehaus.aspectwerkz.proxy.Proxy
@@ -122,7 +122,7 @@ private[akka] class TypedActorGuiceConfigurator extends TypedActorConfiguratorBa
remoteAddress.foreach { address =>
actorRef.makeRemote(remoteAddress.get)
- RemoteServer.registerTypedActor(address, implementationClass.getName, proxy)
+ RemoteServerModule.registerTypedActor(address, implementationClass.getName, proxy)
}
AspectInitRegistry.register(
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/Bar.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/Bar.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/Bar.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/Bar.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/BarImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/BarImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/BarImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/BarImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/Ext.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/Ext.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/Ext.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/Ext.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/ExtImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/ExtImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/ExtImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/ExtImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/Foo.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/Foo.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/Foo.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/Foo.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCaller.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCaller.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCaller.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCaller.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActor.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActor.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActor.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActor.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java b/akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java
similarity index 100%
rename from akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java
rename to akka-typed-actor/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java
diff --git a/akka-typed-actors/src/test/resources/META-INF/aop.xml b/akka-typed-actor/src/test/resources/META-INF/aop.xml
similarity index 100%
rename from akka-typed-actors/src/test/resources/META-INF/aop.xml
rename to akka-typed-actor/src/test/resources/META-INF/aop.xml
diff --git a/akka-core/src/test/scala/actor/typed-actor/NestedTransactionalTypedActorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/NestedTransactionalTypedActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/NestedTransactionalTypedActorSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/NestedTransactionalTypedActorSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/RestartNestedTransactionalTypedActorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/RestartNestedTransactionalTypedActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/RestartNestedTransactionalTypedActorSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/RestartNestedTransactionalTypedActorSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/TransactionalTypedActorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TransactionalTypedActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/TransactionalTypedActorSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/TransactionalTypedActorSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/TypedActorContextSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorContextSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/TypedActorContextSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorContextSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/TypedActorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/TypedActorSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorSpec.scala
diff --git a/akka-core/src/test/scala/actor/typed-actor/TypedActorUtilFunctionsSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorUtilFunctionsSpec.scala
similarity index 100%
rename from akka-core/src/test/scala/actor/typed-actor/TypedActorUtilFunctionsSpec.scala
rename to akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorUtilFunctionsSpec.scala
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Bar.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Bar.java
deleted file mode 100644
index 906476b789..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Bar.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface Bar {
- void bar(String msg);
- Ext getExt();
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/BarImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/BarImpl.java
deleted file mode 100644
index 9cb41a85cf..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/BarImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import com.google.inject.Inject;
-import se.scalablesolutions.akka.actor.*;
-
-public class BarImpl extends TypedActor implements Bar {
- @Inject
- private Ext ext;
-
- public Ext getExt() {
- return ext;
- }
-
- public void bar(String msg) {
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Ext.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Ext.java
deleted file mode 100644
index c37219cf00..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Ext.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface Ext {
- void ext();
-}
-
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/ExtImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/ExtImpl.java
deleted file mode 100644
index dd8ca55089..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/ExtImpl.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public class ExtImpl implements Ext {
- public void ext() {
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Foo.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Foo.java
deleted file mode 100644
index a64f975bce..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/Foo.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface Foo {
- public Foo body();
- public Bar getBar();
-
- public String foo(String msg);
- public void bar(String msg);
-
- public String longRunning();
- public String throwsException();
-
- public int $tag() throws java.rmi.RemoteException;
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java
deleted file mode 100644
index ded09f4e07..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import com.google.inject.Inject;
-import se.scalablesolutions.akka.actor.*;
-
-public class FooImpl extends TypedActor implements Foo {
- @Inject
- private Bar bar;
-
- public Foo body() { return this; }
-
- public Bar getBar() {
- return bar;
- }
-
- public String foo(String msg) {
- return msg + "return_foo ";
- }
-
- public void bar(String msg) {
- bar.bar(msg);
- }
-
- public String longRunning() {
- try {
- Thread.sleep(1200);
- } catch (InterruptedException e) {
- }
- return "test";
- }
-
- public String throwsException() {
- if (true) throw new RuntimeException("Expected exception; to test fault-tolerance");
- return "test";
- }
-
- public int $tag() throws java.rmi.RemoteException {
- return 0;
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java
deleted file mode 100644
index fbd241763f..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface NestedTransactionalTypedActor {
- public String getMapState(String key);
- public String getVectorState();
- public String getRefState();
- public void setMapState(String key, String msg);
- public void setVectorState(String msg);
- public void setRefState(String msg);
- public void success(String key, String msg);
- public String failure(String key, String msg, TypedActorFailer failer);
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java
deleted file mode 100644
index 1b95517c22..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.actor.*;
-import se.scalablesolutions.akka.stm.*;
-
-public class NestedTransactionalTypedActorImpl extends TypedTransactor implements NestedTransactionalTypedActor {
- private TransactionalMap mapState;
- private TransactionalVector vectorState;
- private Ref refState;
- private boolean isInitialized = false;
-
- @Override
- public void init() {
- if (!isInitialized) {
- mapState = new TransactionalMap();
- vectorState = new TransactionalVector();
- refState = new Ref();
- isInitialized = true;
- }
- }
-
- public String getMapState(String key) {
- return (String) mapState.get(key).get();
- }
-
- public String getVectorState() {
- return (String) vectorState.last();
- }
-
- public String getRefState() {
- return (String) refState.get();
- }
-
- public void setMapState(String key, String msg) {
- mapState.put(key, msg);
- }
-
- public void setVectorState(String msg) {
- vectorState.add(msg);
- }
-
- public void setRefState(String msg) {
- refState.swap(msg);
- }
-
- public void success(String key, String msg) {
- mapState.put(key, msg);
- vectorState.add(msg);
- refState.swap(msg);
- }
-
- public String failure(String key, String msg, TypedActorFailer failer) {
- mapState.put(key, msg);
- vectorState.add(msg);
- refState.swap(msg);
- failer.fail();
- return msg;
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java
deleted file mode 100644
index dd03a45d12..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface RemoteTypedActorOne {
- public String requestReply(String s) throws Exception;
- public void oneWay() throws Exception;
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java
deleted file mode 100644
index 715e5366a4..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package se.scalablesolutions.akka.actor.remote;
-
-import se.scalablesolutions.akka.actor.*;
-
-import java.util.concurrent.CountDownLatch;
-
-public class RemoteTypedActorOneImpl extends TypedActor implements RemoteTypedActorOne {
-
- public static CountDownLatch latch = new CountDownLatch(1);
-
- public String requestReply(String s) throws Exception {
- if (s.equals("ping")) {
- RemoteTypedActorLog.messageLog().put("ping");
- return "pong";
- } else if (s.equals("die")) {
- throw new RuntimeException("Expected exception; to test fault-tolerance");
- } else return null;
- }
-
- public void oneWay() throws Exception {
- RemoteTypedActorLog.oneWayLog().put("oneway");
- }
-
- @Override
- public void preRestart(Throwable e) {
- try { RemoteTypedActorLog.messageLog().put(e.getMessage()); } catch(Exception ex) {}
- latch.countDown();
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java
deleted file mode 100644
index 5fd289b8c2..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface RemoteTypedActorTwo {
- public String requestReply(String s) throws Exception;
- public void oneWay() throws Exception;
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java
deleted file mode 100644
index a5882fd4e6..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package se.scalablesolutions.akka.actor.remote;
-
-import se.scalablesolutions.akka.actor.*;
-
-import java.util.concurrent.CountDownLatch;
-
-public class RemoteTypedActorTwoImpl extends TypedActor implements RemoteTypedActorTwo {
-
- public static CountDownLatch latch = new CountDownLatch(1);
-
- public String requestReply(String s) throws Exception {
- if (s.equals("ping")) {
- RemoteTypedActorLog.messageLog().put("ping");
- return "pong";
- } else if (s.equals("die")) {
- throw new RuntimeException("Expected exception; to test fault-tolerance");
- } else return null;
- }
-
- public void oneWay() throws Exception {
- RemoteTypedActorLog.oneWayLog().put("oneway");
- }
-
- @Override
- public void preRestart(Throwable e) {
- try { RemoteTypedActorLog.messageLog().put(e.getMessage()); } catch(Exception ex) {}
- latch.countDown();
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java
deleted file mode 100644
index 5d06afdc9c..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import java.util.concurrent.CountDownLatch;
-
-public interface SamplePojo {
- public String greet(String s);
- public String fail();
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java
deleted file mode 100644
index 12985c72ce..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.actor.*;
-
-import java.util.concurrent.CountDownLatch;
-
-public class SamplePojoImpl extends TypedActor implements SamplePojo {
-
- public static CountDownLatch latch = new CountDownLatch(1);
-
- public static boolean _pre = false;
- public static boolean _post = false;
- public static boolean _down = false;
- public static void reset() {
- _pre = false;
- _post = false;
- _down = false;
- }
-
- public String greet(String s) {
- return "hello " + s;
- }
-
- public String fail() {
- throw new RuntimeException("expected");
- }
-
- @Override
- public void preRestart(Throwable e) {
- _pre = true;
- latch.countDown();
- }
-
- @Override
- public void postRestart(Throwable e) {
- _post = true;
- latch.countDown();
- }
-
- @Override
- public void shutdown() {
- _down = true;
- latch.countDown();
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java
deleted file mode 100644
index d3a18abbd9..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.dispatch.Future;
-import se.scalablesolutions.akka.dispatch.CompletableFuture;
-import se.scalablesolutions.akka.dispatch.Future;
-
-public interface SimpleJavaPojo {
- public Object getSender();
- public Object getSenderFuture();
- public Future square(int value);
- public void setName(String name);
- public String getName();
- public void throwException();
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCaller.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCaller.java
deleted file mode 100644
index e35702846f..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCaller.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.dispatch.CompletableFuture;
-
-public interface SimpleJavaPojoCaller {
- public void setPojo(SimpleJavaPojo pojo);
- public Object getSenderFromSimpleJavaPojo();
- public Object getSenderFutureFromSimpleJavaPojo();
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java
deleted file mode 100644
index 760b69f8b9..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.actor.*;
-import se.scalablesolutions.akka.dispatch.Future;
-
-public class SimpleJavaPojoCallerImpl extends TypedActor implements SimpleJavaPojoCaller {
-
- SimpleJavaPojo pojo;
-
- public void setPojo(SimpleJavaPojo pojo) {
- this.pojo = pojo;
- }
-
- public Object getSenderFromSimpleJavaPojo() {
- Object sender = pojo.getSender();
- return sender;
- }
-
- public Object getSenderFutureFromSimpleJavaPojo() {
- return pojo.getSenderFuture();
- }
-
- public Future square(int value) {
- return future(value * value);
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoImpl.java
deleted file mode 100644
index c02d266ce8..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.actor.*;
-import se.scalablesolutions.akka.dispatch.Future;
-import se.scalablesolutions.akka.dispatch.CompletableFuture;
-
-public class SimpleJavaPojoImpl extends TypedActor implements SimpleJavaPojo {
-
- public static boolean _pre = false;
- public static boolean _post = false;
- public static boolean _down = false;
- public static void reset() {
- _pre = false;
- _post = false;
- _down = false;
- }
-
- private String name;
-
- public Future square(int value) {
- return future(value * value);
- }
-
- public Object getSender() {
- return getContext().getSender();
- }
-
- public CompletableFuture getSenderFuture() {
- return getContext().getSenderFuture().get();
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- @Override
- public void preRestart(Throwable e) {
- _pre = true;
- }
-
- @Override
- public void postRestart(Throwable e) {
- _post = true;
- }
-
- public void throwException() {
- throw new RuntimeException();
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActor.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActor.java
deleted file mode 100644
index 6e7c43745b..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActor.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface TransactionalTypedActor {
- public String getMapState(String key);
- public String getVectorState();
- public String getRefState();
- public void setMapState(String key, String msg);
- public void setVectorState(String msg);
- public void setRefState(String msg);
- public void success(String key, String msg);
- public void success(String key, String msg, NestedTransactionalTypedActor nested);
- public String failure(String key, String msg, TypedActorFailer failer);
- public String failure(String key, String msg, NestedTransactionalTypedActor nested, TypedActorFailer failer);
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java
deleted file mode 100644
index 9b32f5d329..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.actor.*;
-import se.scalablesolutions.akka.stm.*;
-
-public class TransactionalTypedActorImpl extends TypedTransactor implements TransactionalTypedActor {
- private TransactionalMap mapState;
- private TransactionalVector vectorState;
- private Ref refState;
- private boolean isInitialized = false;
-
- @Override
- public void initTransactionalState() {
- if (!isInitialized) {
- mapState = new TransactionalMap();
- vectorState = new TransactionalVector();
- refState = new Ref();
- isInitialized = true;
- }
- }
-
- public String getMapState(String key) {
- return (String)mapState.get(key).get();
- }
-
- public String getVectorState() {
- return (String)vectorState.last();
- }
-
- public String getRefState() {
- return (String)refState.get();
- }
-
- public void setMapState(String key, String msg) {
- mapState.put(key, msg);
- }
-
- public void setVectorState(String msg) {
- vectorState.add(msg);
- }
-
- public void setRefState(String msg) {
- refState.swap(msg);
- }
-
- public void success(String key, String msg) {
- mapState.put(key, msg);
- vectorState.add(msg);
- refState.swap(msg);
- }
-
- public void success(String key, String msg, NestedTransactionalTypedActor nested) {
- mapState.put(key, msg);
- vectorState.add(msg);
- refState.swap(msg);
- nested.success(key, msg);
- }
-
- public String failure(String key, String msg, TypedActorFailer failer) {
- mapState.put(key, msg);
- vectorState.add(msg);
- refState.swap(msg);
- failer.fail();
- return msg;
- }
-
- public String failure(String key, String msg, NestedTransactionalTypedActor nested, TypedActorFailer failer) {
- mapState.put(key, msg);
- vectorState.add(msg);
- refState.swap(msg);
- nested.failure(key, msg, failer);
- return msg;
- }
-
- @Override
- public void preRestart(Throwable e) {
- System.out.println("################ PRE RESTART");
- }
-
- @Override
- public void postRestart(Throwable e) {
- System.out.println("################ POST RESTART");
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java
deleted file mode 100644
index e0b1e72c33..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-public interface TypedActorFailer extends java.io.Serializable {
- public int fail();
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java
deleted file mode 100644
index 89a97330df..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package se.scalablesolutions.akka.actor;
-
-import se.scalablesolutions.akka.actor.*;
-
-public class TypedActorFailerImpl extends TypedActor implements TypedActorFailer {
- public int fail() {
- throw new RuntimeException("expected");
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/Address.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/Address.java
deleted file mode 100644
index cb3057929f..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/Address.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-public class Address {
- private String location;
-
- public Address(String location) {
- this.location = location;
- }
-
- @Override public String toString() {
- return "Address(" + location + ")";
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/CounterExample.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/CounterExample.java
deleted file mode 100644
index 57a9a07daa..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/CounterExample.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-import se.scalablesolutions.akka.stm.Ref;
-import se.scalablesolutions.akka.stm.local.Atomic;
-
-public class CounterExample {
- final static Ref ref = new Ref(0);
-
- public static int counter() {
- return new Atomic() {
- public Integer atomically() {
- int inc = ref.get() + 1;
- ref.set(inc);
- return inc;
- }
- }.execute();
- }
-
- public static void main(String[] args) {
- System.out.println();
- System.out.println("Counter example");
- System.out.println();
- System.out.println("counter 1: " + counter());
- System.out.println("counter 2: " + counter());
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/JavaStmTests.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/JavaStmTests.java
deleted file mode 100644
index 7204013808..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/JavaStmTests.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import org.junit.Before;
-
-import se.scalablesolutions.akka.stm.*;
-import se.scalablesolutions.akka.stm.local.Atomic;
-
-import org.multiverse.api.ThreadLocalTransaction;
-import org.multiverse.api.TransactionConfiguration;
-import org.multiverse.api.exceptions.ReadonlyException;
-
-public class JavaStmTests {
-
- private Ref ref;
-
- private int getRefValue() {
- return new Atomic() {
- public Integer atomically() {
- return ref.get();
- }
- }.execute();
- }
-
- public int increment() {
- return new Atomic() {
- public Integer atomically() {
- int inc = ref.get() + 1;
- ref.set(inc);
- return inc;
- }
- }.execute();
- }
-
- @Before public void initialise() {
- ref = new Ref(0);
- }
-
- @Test public void incrementRef() {
- assertEquals(0, getRefValue());
- increment();
- increment();
- increment();
- assertEquals(3, getRefValue());
- }
-
- @Test public void failSetRef() {
- assertEquals(0, getRefValue());
- try {
- new Atomic() {
- public Object atomically() {
- ref.set(3);
- throw new RuntimeException();
- }
- }.execute();
- } catch(RuntimeException e) {}
- assertEquals(0, getRefValue());
- }
-
- @Test public void configureTransaction() {
- TransactionFactory txFactory = new TransactionFactoryBuilder()
- .setFamilyName("example")
- .setReadonly(true)
- .build();
-
- // get transaction config from multiverse
- TransactionConfiguration config = new Atomic(txFactory) {
- public TransactionConfiguration atomically() {
- ref.get();
- return ThreadLocalTransaction.getThreadLocalTransaction().getConfiguration();
- }
- }.execute();
-
- assertEquals("example", config.getFamilyName());
- assertEquals(true, config.isReadonly());
- }
-
- @Test(expected=ReadonlyException.class) public void failReadonlyTransaction() {
- TransactionFactory txFactory = new TransactionFactoryBuilder()
- .setFamilyName("example")
- .setReadonly(true)
- .build();
-
- new Atomic(txFactory) {
- public Object atomically() {
- return ref.set(3);
- }
- }.execute();
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/RefExample.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/RefExample.java
deleted file mode 100644
index f590524fd7..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/RefExample.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-import se.scalablesolutions.akka.stm.Ref;
-import se.scalablesolutions.akka.stm.local.Atomic;
-
-public class RefExample {
- public static void main(String[] args) {
- System.out.println();
- System.out.println("Ref example");
- System.out.println();
-
- final Ref ref = new Ref(0);
-
- Integer value1 = new Atomic() {
- public Integer atomically() {
- return ref.get();
- }
- }.execute();
-
- System.out.println("value 1: " + value1);
-
- new Atomic() {
- public Object atomically() {
- return ref.set(5);
- }
- }.execute();
-
- Integer value2 = new Atomic() {
- public Integer atomically() {
- return ref.get();
- }
- }.execute();
-
- System.out.println("value 2: " + value2);
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/StmExamples.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/StmExamples.java
deleted file mode 100644
index a8526f2dd0..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/StmExamples.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-import se.scalablesolutions.akka.stm.Ref;
-import se.scalablesolutions.akka.stm.local.Atomic;
-
-public class StmExamples {
- public static void main(String[] args) {
- System.out.println();
- System.out.println("STM examples");
- System.out.println();
-
- CounterExample.main(args);
- RefExample.main(args);
- TransactionFactoryExample.main(args);
- TransactionalMapExample.main(args);
- TransactionalVectorExample.main(args);
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionFactoryExample.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionFactoryExample.java
deleted file mode 100644
index 00dd87b7c5..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionFactoryExample.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-import se.scalablesolutions.akka.stm.*;
-import se.scalablesolutions.akka.stm.local.Atomic;
-
-import org.multiverse.api.ThreadLocalTransaction;
-import org.multiverse.api.TransactionConfiguration;
-
-public class TransactionFactoryExample {
- public static void main(String[] args) {
- System.out.println();
- System.out.println("TransactionFactory example");
- System.out.println();
-
- TransactionFactory txFactory = new TransactionFactoryBuilder()
- .setFamilyName("example")
- .setReadonly(true)
- .build();
-
- new Atomic(txFactory) {
- public Object atomically() {
- // check config has been passed to multiverse
- TransactionConfiguration config = ThreadLocalTransaction.getThreadLocalTransaction().getConfiguration();
- System.out.println("family name: " + config.getFamilyName());
- System.out.println("readonly: " + config.isReadonly());
- return null;
- }
- }.execute();
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionalMapExample.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionalMapExample.java
deleted file mode 100644
index 7c4940c7a5..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionalMapExample.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-import se.scalablesolutions.akka.stm.*;
-import se.scalablesolutions.akka.stm.local.Atomic;
-
-public class TransactionalMapExample {
- public static void main(String[] args) {
- System.out.println();
- System.out.println("TransactionalMap example");
- System.out.println();
-
- final TransactionalMap users = new TransactionalMap();
-
- // fill users map (in a transaction)
- new Atomic() {
- public Object atomically() {
- users.put("bill", new User("bill"));
- users.put("mary", new User("mary"));
- users.put("john", new User("john"));
- return null;
- }
- }.execute();
-
- System.out.println("users: " + users);
-
- // access users map (in a transaction)
- User user = new Atomic() {
- public User atomically() {
- return users.get("bill").get();
- }
- }.execute();
-
- System.out.println("user: " + user);
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionalVectorExample.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionalVectorExample.java
deleted file mode 100644
index 7274848beb..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/TransactionalVectorExample.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-import se.scalablesolutions.akka.stm.*;
-import se.scalablesolutions.akka.stm.local.Atomic;
-
-public class TransactionalVectorExample {
- public static void main(String[] args) {
- System.out.println();
- System.out.println("TransactionalVector example");
- System.out.println();
-
- final TransactionalVector addresses = new TransactionalVector();
-
- // fill addresses vector (in a transaction)
- new Atomic() {
- public Object atomically() {
- addresses.add(new Address("somewhere"));
- addresses.add(new Address("somewhere else"));
- return null;
- }
- }.execute();
-
- System.out.println("addresses: " + addresses);
-
- // access addresses vector (in a transaction)
- Address address = new Atomic() {
- public Address atomically() {
- return addresses.get(0);
- }
- }.execute();
-
- System.out.println("address: " + address);
- }
-}
diff --git a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/User.java b/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/User.java
deleted file mode 100644
index c9dc4b3723..0000000000
--- a/akka-typed-actors/src/test/java/se/scalablesolutions/akka/stm/User.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package se.scalablesolutions.akka.stm;
-
-public class User {
- private String name;
-
- public User(String name) {
- this.name = name;
- }
-
- @Override public String toString() {
- return "User(" + name + ")";
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/NestedTransactionalTypedActorSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/NestedTransactionalTypedActorSpec.scala
deleted file mode 100644
index 7338e8df41..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/NestedTransactionalTypedActorSpec.scala
+++ /dev/null
@@ -1,102 +0,0 @@
- /**
- * Copyright (C) 2009-2010 Scalable Solutions AB
- */
-
-package se.scalablesolutions.akka.actor
-
-import org.scalatest.Spec
-import org.scalatest.Assertions
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-import se.scalablesolutions.akka.actor._
-
-@RunWith(classOf[JUnitRunner])
-class NestedTransactionalTypedActorSpec extends
- Spec with
- ShouldMatchers with
- BeforeAndAfterAll {
-
- private var messageLog = ""
-
- override def afterAll {
- // ActorRegistry.shutdownAll
- }
-
- describe("Declaratively nested supervised transactional in-memory TypedActor") {
-
- it("map should not rollback state for stateful server in case of success") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init") // set init state
- val nested = TypedActor.newInstance(classOf[NestedTransactionalTypedActor], classOf[NestedTransactionalTypedActorImpl])
- nested.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init") // set init state
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested) // transactionrequired
- stateful.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess") should equal("new state")
- nested.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess") should equal("new state")
- }
-
- it("map should rollback state for stateful server in case of failure") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init") // set init state
- val nested = TypedActor.newInstance(classOf[NestedTransactionalTypedActor], classOf[NestedTransactionalTypedActorImpl])
- nested.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init") // set init state
- val failer = TypedActor.newInstance(classOf[TypedActorFailer], classOf[TypedActorFailerImpl])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
- nested.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
- }
-
- it("vector should not rollback state for stateful server in case of success") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setVectorState("init") // set init state
- val nested = TypedActor.newInstance(classOf[NestedTransactionalTypedActor], classOf[NestedTransactionalTypedActorImpl])
- nested.setVectorState("init") // set init state
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested) // transactionrequired
- stateful.getVectorState should equal("new state")
- nested.getVectorState should equal("new state")
- }
-
- it("vector should rollback state for stateful server in case of failure") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setVectorState("init") // set init state
- val nested = TypedActor.newInstance(classOf[NestedTransactionalTypedActor], classOf[NestedTransactionalTypedActorImpl])
- nested.setVectorState("init") // set init state
- val failer = TypedActor.newInstance(classOf[TypedActorFailer], classOf[TypedActorFailerImpl])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getVectorState should equal("init")
- nested.getVectorState should equal("init")
- }
-
- it("ref should not rollback state for stateful server in case of success") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- val nested = TypedActor.newInstance(classOf[NestedTransactionalTypedActor], classOf[NestedTransactionalTypedActorImpl])
- stateful.setRefState("init") // set init state
- nested.setRefState("init") // set init state
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested)
- stateful.getRefState should equal("new state")
- nested.getRefState should equal("new state")
- }
-
- it("ref should rollback state for stateful server in case of failure") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- val nested = TypedActor.newInstance(classOf[NestedTransactionalTypedActor], classOf[NestedTransactionalTypedActorImpl])
- stateful.setRefState("init") // set init state
- nested.setRefState("init") // set init state
- val failer = TypedActor.newInstance(classOf[TypedActorFailer], classOf[TypedActorFailerImpl])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getRefState should equal("init")
- nested.getRefState should equal("init")
- }
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/RestartNestedTransactionalTypedActorSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/RestartNestedTransactionalTypedActorSpec.scala
deleted file mode 100644
index 1769a5c47b..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/RestartNestedTransactionalTypedActorSpec.scala
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Copyright (C) 2009-2010 Scalable Solutions AB
- */
-
-package se.scalablesolutions.akka.actor
-
-import org.scalatest.Spec
-import org.scalatest.Assertions
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-import se.scalablesolutions.akka.config.Config
-import se.scalablesolutions.akka.config._
-import se.scalablesolutions.akka.config.TypedActorConfigurator
-import se.scalablesolutions.akka.config.JavaConfig._
-import se.scalablesolutions.akka.actor._
-
-@RunWith(classOf[JUnitRunner])
-class RestartNestedTransactionalTypedActorSpec extends
- Spec with
- ShouldMatchers with
- BeforeAndAfterAll {
-
- private val conf = new TypedActorConfigurator
- private var messageLog = ""
-
- override def beforeAll {
- /*
- Config.config
- conf.configure(
- new RestartStrategy(new AllForOne, 3, 5000, List(classOf[Exception]).toArray),
- List(
- new Component(classOf[TransactionalTypedActor],
- new LifeCycle(new Permanent),
- 10000),
- new Component(classOf[NestedTransactionalTypedActor],
- new LifeCycle(new Permanent),
- 10000),
- new Component(classOf[TypedActorFailer],
- new LifeCycle(new Permanent),
- 10000)
- ).toArray).supervise
- */
- }
-
- override def afterAll {
- /*
- conf.stop
- ActorRegistry.shutdownAll
- */
- }
-
- describe("Restart nested supervised transactional Typed Actor") {
-/*
- it("map should rollback state for stateful server in case of failure") {
- val stateful = conf.getInstance(classOf[TransactionalTypedActor])
- stateful.init
- stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init") // set init state
-
- val nested = conf.getInstance(classOf[NestedTransactionalTypedActor])
- nested.init
- nested.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init") // set init state
-
- val failer = conf.getInstance(classOf[TypedActorFailer])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
-
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
-
- nested.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
- }
-
- it("vector should rollback state for stateful server in case of failure") {
- val stateful = conf.getInstance(classOf[TransactionalTypedActor])
- stateful.init
- stateful.setVectorState("init") // set init state
-
- val nested = conf.getInstance(classOf[NestedTransactionalTypedActor])
- nested.init
- nested.setVectorState("init") // set init state
-
- val failer = conf.getInstance(classOf[TypedActorFailer])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
-
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getVectorState should equal("init")
-
- nested.getVectorState should equal("init")
- }
-
- it("ref should rollback state for stateful server in case of failure") {
- val stateful = conf.getInstance(classOf[TransactionalTypedActor])
- stateful.init
- val nested = conf.getInstance(classOf[NestedTransactionalTypedActor])
- nested.init
- stateful.setRefState("init") // set init state
-
- nested.setRefState("init") // set init state
-
- val failer = conf.getInstance(classOf[TypedActorFailer])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
-
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getRefState should equal("init")
-
- nested.getRefState should equal("init")
- }
- */
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
deleted file mode 100644
index 56b1e6ec5b..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright (C) 2009-2010 Scalable Solutions AB
- */
-
-package se.scalablesolutions.akka.actor
-
-import org.scalatest.Spec
-import org.scalatest.Assertions
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-import se.scalablesolutions.akka.config.Config
-import se.scalablesolutions.akka.config._
-import se.scalablesolutions.akka.config.TypedActorConfigurator
-import se.scalablesolutions.akka.config.JavaConfig._
-import se.scalablesolutions.akka.actor._
-
-@RunWith(classOf[JUnitRunner])
-class RestartTransactionalTypedActorSpec extends
- Spec with
- ShouldMatchers with
- BeforeAndAfterAll {
-
- private val conf = new TypedActorConfigurator
- private var messageLog = ""
-
- def before {
- Config.config
- conf.configure(
- new RestartStrategy(new AllForOne, 3, 5000, List(classOf[Exception]).toArray),
- List(
- new Component(
- classOf[TransactionalTypedActor],
- new LifeCycle(new Temporary),
- 10000),
- new Component(
- classOf[TypedActorFailer],
- new LifeCycle(new Temporary),
- 10000)
- ).toArray).supervise
- }
-
- def after {
- conf.stop
- ActorRegistry.shutdownAll
- }
-
- describe("Restart supervised transactional Typed Actor ") {
-/*
- it("map should rollback state for stateful server in case of failure") {
- before
- val stateful = conf.getInstance(classOf[TransactionalTypedActor])
- stateful.init
- stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init")
- val failer = conf.getInstance(classOf[TypedActorFailer])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
- after
- }
-
- it("vector should rollback state for stateful server in case of failure") {
- before
- val stateful = conf.getInstance(classOf[TransactionalTypedActor])
- stateful.init
- stateful.setVectorState("init") // set init state
- val failer = conf.getInstance(classOf[TypedActorFailer])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getVectorState should equal("init")
- after
- }
-
- it("ref should rollback state for stateful server in case of failure") {
- val stateful = conf.getInstance(classOf[TransactionalTypedActor])
- stateful.init
- stateful.setRefState("init") // set init state
- val failer = conf.getInstance(classOf[TypedActorFailer])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getRefState should equal("init")
- }
-*/ }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/TransactionalTypedActorSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/TransactionalTypedActorSpec.scala
deleted file mode 100644
index b55f52c875..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/TransactionalTypedActorSpec.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (C) 2009-2010 Scalable Solutions AB
- */
-
-package se.scalablesolutions.akka.actor
-
-import org.scalatest.Spec
-import org.scalatest.Assertions
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-import se.scalablesolutions.akka.actor._
-
-@RunWith(classOf[JUnitRunner])
-class TransactionalTypedActorSpec extends
- Spec with
- ShouldMatchers with
- BeforeAndAfterAll {
-
- private var messageLog = ""
-
- override def afterAll {
-// ActorRegistry.shutdownAll
- }
-
- describe("Declaratively supervised transactional in-memory Typed Actor ") {
- it("map should not rollback state for stateful server in case of success") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init")
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state")
- stateful.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess") should equal("new state")
- }
-
- it("map should rollback state for stateful server in case of failure") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init")
- val failer = TypedActor.newInstance(classOf[TypedActorFailer], classOf[TypedActorFailerImpl])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
- }
-
- it("vector should not rollback state for stateful server in case of success") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setVectorState("init") // set init state
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state")
- stateful.getVectorState should equal("new state")
- }
-
- it("vector should rollback state for stateful server in case of failure") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setVectorState("init") // set init state
- val failer = TypedActor.newInstance(classOf[TypedActorFailer], classOf[TypedActorFailerImpl])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getVectorState should equal("init")
- }
-
- it("ref should not rollback state for stateful server in case of success") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setRefState("init") // set init state
- stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state")
- stateful.getRefState should equal("new state")
- }
-
- it("ref should rollback state for stateful server in case of failure") {
- val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
- stateful.setRefState("init") // set init state
- val failer = TypedActor.newInstance(classOf[TypedActorFailer], classOf[TypedActorFailerImpl])
- try {
- stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer)
- fail("should have thrown an exception")
- } catch { case e => {} }
- stateful.getRefState should equal("init")
- }
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorContextSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorContextSpec.scala
deleted file mode 100644
index adc0879c84..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorContextSpec.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (C) 2009-2010 Scalable Solutions AB
- */
-
-package se.scalablesolutions.akka.actor
-
-import org.scalatest.Spec
-import org.scalatest.Assertions
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-import se.scalablesolutions.akka.dispatch.DefaultCompletableFuture;
-
-@RunWith(classOf[JUnitRunner])
-class TypedActorContextSpec extends
- Spec with
- ShouldMatchers with
- BeforeAndAfterAll {
-
- describe("TypedActorContext") {
- it("context.sender should return the sender TypedActor reference") {
- val pojo = TypedActor.newInstance(classOf[SimpleJavaPojo], classOf[SimpleJavaPojoImpl])
- val pojoCaller = TypedActor.newInstance(classOf[SimpleJavaPojoCaller], classOf[SimpleJavaPojoCallerImpl])
- pojoCaller.setPojo(pojo)
- pojoCaller.getSenderFromSimpleJavaPojo.isInstanceOf[Option[_]] should equal (true)
- pojoCaller.getSenderFromSimpleJavaPojo.asInstanceOf[Option[_]].isDefined should equal (true)
- pojoCaller.getSenderFromSimpleJavaPojo.asInstanceOf[Option[_]].get should equal (pojoCaller)
- }
- it("context.senderFuture should return the senderFuture TypedActor reference") {
- val pojo = TypedActor.newInstance(classOf[SimpleJavaPojo], classOf[SimpleJavaPojoImpl])
- val pojoCaller = TypedActor.newInstance(classOf[SimpleJavaPojoCaller], classOf[SimpleJavaPojoCallerImpl])
- pojoCaller.setPojo(pojo)
- pojoCaller.getSenderFutureFromSimpleJavaPojo.getClass.getName should equal (classOf[DefaultCompletableFuture[_]].getName)
- }
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
deleted file mode 100644
index d076ec52cf..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Copyright (C) 2009-2010 Scalable Solutions AB
- */
-
-package se.scalablesolutions.akka.actor
-
-import com.google.inject.AbstractModule
-import com.google.inject.Scopes
-
-import org.scalatest.Spec
-import org.scalatest.Assertions
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-import se.scalablesolutions.akka.config.Config
-import se.scalablesolutions.akka.config.TypedActorConfigurator
-import se.scalablesolutions.akka.config.JavaConfig._
-import se.scalablesolutions.akka.dispatch._
-import se.scalablesolutions.akka.dispatch.FutureTimeoutException
-
-@RunWith(classOf[JUnitRunner])
-class TypedActorGuiceConfiguratorSpec extends
- Spec with
- ShouldMatchers with
- BeforeAndAfterAll {
-
- private val conf = new TypedActorConfigurator
- private var messageLog = ""
-
- override def beforeAll {
- Config.config
- val dispatcher = Dispatchers.newExecutorBasedEventDrivenDispatcher("test")
-
- conf.addExternalGuiceModule(new AbstractModule {
- def configure = bind(classOf[Ext]).to(classOf[ExtImpl]).in(Scopes.SINGLETON)
- }).configure(
- new RestartStrategy(new AllForOne, 3, 5000, List(classOf[Exception]).toArray),
- List(
- new Component(
- classOf[Foo],
- classOf[FooImpl],
- new LifeCycle(new Permanent),
- 1000,
- dispatcher),
- new Component(
- classOf[Bar],
- classOf[BarImpl],
- new LifeCycle(new Permanent),
- 1000,
- dispatcher)
- ).toArray).inject.supervise
-
- }
-
- override def afterAll = conf.stop
-
- describe("TypedActorGuiceConfigurator") {
-/*
- it("should inject typed actor using guice") {
- messageLog = ""
- val foo = conf.getInstance(classOf[Foo])
- val bar = conf.getInstance(classOf[Bar])
- bar should equal(foo.getBar)
- }
-
- it("should inject external dependency using guice") {
- messageLog = ""
- val bar = conf.getInstance(classOf[Bar])
- val ext = conf.getExternalDependency(classOf[Ext])
- ext.toString should equal(bar.getExt.toString)
- }
-
- it("should lookup non-supervised instance") {
- try {
- val str = conf.getInstance(classOf[String])
- fail("exception should have been thrown")
- } catch {
- case e: Exception =>
- classOf[IllegalStateException] should equal(e.getClass)
- }
- }
-
- it("should be able to invoke typed actor") {
- messageLog = ""
- val foo = conf.getInstance(classOf[Foo])
- messageLog += foo.foo("foo ")
- foo.bar("bar ")
- messageLog += "before_bar "
- Thread.sleep(500)
- messageLog should equal("foo return_foo before_bar ")
- }
-
- it("should be able to invoke typed actor's invocation") {
- messageLog = ""
- val foo = conf.getInstance(classOf[Foo])
- val bar = conf.getInstance(classOf[Bar])
- messageLog += foo.foo("foo ")
- foo.bar("bar ")
- messageLog += "before_bar "
- Thread.sleep(500)
- messageLog should equal("foo return_foo before_bar ")
- }
-
- it("should throw FutureTimeoutException on time-out") {
- messageLog = ""
- val foo = conf.getInstance(classOf[Foo])
- try {
- foo.longRunning
- fail("exception should have been thrown")
- } catch {
- case e: FutureTimeoutException =>
- classOf[FutureTimeoutException] should equal(e.getClass)
- }
- }
-
- it("should propagate exception") {
- messageLog = ""
- val foo = conf.getInstance(classOf[Foo])
- try {
- foo.throwsException
- fail("exception should have been thrown")
- } catch {
- case e: RuntimeException =>
- classOf[RuntimeException] should equal(e.getClass)
- }
- }
- */
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
deleted file mode 100644
index 10fc40493b..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
+++ /dev/null
@@ -1,169 +0,0 @@
-package se.scalablesolutions.akka.actor
-
-import org.junit.runner.RunWith
-import org.scalatest.{BeforeAndAfterAll, Spec}
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.matchers.ShouldMatchers
-
-import se.scalablesolutions.akka.actor.TypedActor._
-
-import se.scalablesolutions.akka.config.{OneForOneStrategy, TypedActorConfigurator}
-import se.scalablesolutions.akka.config.JavaConfig._
-
-import java.util.concurrent.CountDownLatch
-
-/**
- * @author Martin Krasser
- */
-@RunWith(classOf[JUnitRunner])
-class TypedActorLifecycleSpec extends Spec with ShouldMatchers with BeforeAndAfterAll {
- var conf1: TypedActorConfigurator = _
- var conf2: TypedActorConfigurator = _
-
- override protected def beforeAll() = {
- val strategy = new RestartStrategy(new AllForOne(), 3, 1000, Array(classOf[Exception]))
- val comp3 = new Component(classOf[SamplePojo], classOf[SamplePojoImpl], new LifeCycle(new Permanent()), 1000)
- val comp4 = new Component(classOf[SamplePojo], classOf[SamplePojoImpl], new LifeCycle(new Temporary()), 1000)
- conf1 = new TypedActorConfigurator().configure(strategy, Array(comp3)).supervise
- conf2 = new TypedActorConfigurator().configure(strategy, Array(comp4)).supervise
- }
-
- override protected def afterAll() = {
- conf1.stop
- conf2.stop
- }
-
- describe("TypedActor lifecycle management") {
- it("should restart supervised, non-annotated typed actor on failure") {
- SamplePojoImpl.reset
- val obj = conf1.getInstance[SamplePojo](classOf[SamplePojo])
- val cdl = new CountDownLatch(2)
- SamplePojoImpl.latch = cdl
- assert(AspectInitRegistry.initFor(obj) ne null)
- try {
- obj.fail
- fail("expected exception not thrown")
- } catch {
- case e: RuntimeException => {
- cdl.await
- assert(SamplePojoImpl._pre)
- assert(SamplePojoImpl._post)
- assert(!SamplePojoImpl._down)
-// assert(AspectInitRegistry.initFor(obj) ne null)
- }
- }
- }
-
- it("should shutdown supervised, non-annotated typed actor on failure") {
- SamplePojoImpl.reset
- val obj = conf2.getInstance[SamplePojo](classOf[SamplePojo])
- val cdl = new CountDownLatch(1)
- SamplePojoImpl.latch = cdl
- assert(AspectInitRegistry.initFor(obj) ne null)
- try {
- obj.fail
- fail("expected exception not thrown")
- } catch {
- case e: RuntimeException => {
- cdl.await
- assert(!SamplePojoImpl._pre)
- assert(!SamplePojoImpl._post)
- assert(SamplePojoImpl._down)
- // assert(AspectInitRegistry.initFor(obj) eq null)
- }
- }
- }
-
- it("should shutdown non-supervised, non-initialized typed actor on TypedActor.stop") {
- SamplePojoImpl.reset
- val obj = TypedActor.newInstance(classOf[SamplePojo], classOf[SamplePojoImpl])
- TypedActor.stop(obj)
- assert(!SamplePojoImpl._pre)
- assert(!SamplePojoImpl._post)
- assert(SamplePojoImpl._down)
- }
-
- it("both preRestart and postRestart methods should be invoked when an actor is restarted") {
- SamplePojoImpl.reset
- val pojo = TypedActor.newInstance(classOf[SimpleJavaPojo], classOf[SimpleJavaPojoImpl])
- val supervisor = TypedActor.newInstance(classOf[SimpleJavaPojo], classOf[SimpleJavaPojoImpl])
- link(supervisor, pojo, new OneForOneStrategy(3, 2000), Array(classOf[Throwable]))
- pojo.throwException
- Thread.sleep(500)
- SimpleJavaPojoImpl._pre should be(true)
- SimpleJavaPojoImpl._post should be(true)
- }
-
- /*
- it("should shutdown non-supervised, annotated typed actor on TypedActor.stop") {
- val obj = TypedActor.newInstance(classOf[SamplePojoAnnotated])
- assert(AspectInitRegistry.initFor(obj) ne null)
- assert("hello akka" === obj.greet("akka"))
- TypedActor.stop(obj)
- assert(AspectInitRegistry.initFor(obj) eq null)
- assert(!obj.pre)
- assert(!obj.post)
- assert(obj.down)
- try {
- obj.greet("akka")
- fail("access to stopped typed actor")
- } catch {
- case e: Exception => {}
- }
- }
-
- it("should shutdown non-supervised, annotated typed actor on ActorRegistry.shutdownAll") {
- val obj = TypedActor.newInstance(classOf[SamplePojoAnnotated])
- assert(AspectInitRegistry.initFor(obj) ne null)
- assert("hello akka" === obj.greet("akka"))
- ActorRegistry.shutdownAll
- assert(AspectInitRegistry.initFor(obj) eq null)
- assert(!obj.pre)
- assert(!obj.post)
- assert(obj.down)
- try {
- obj.greet("akka")
- fail("access to stopped typed actor")
- } catch {
- case e: Exception => { }
- }
- }
-
- it("should restart supervised, annotated typed actor on failure") {
- val obj = conf1.getInstance[SamplePojoAnnotated](classOf[SamplePojoAnnotated])
- val cdl = obj.newCountdownLatch(2)
- assert(AspectInitRegistry.initFor(obj) ne null)
- try {
- obj.fail
- fail("expected exception not thrown")
- } catch {
- case e: RuntimeException => {
- cdl.await
- assert(obj.pre)
- assert(obj.post)
- assert(!obj.down)
- assert(AspectInitRegistry.initFor(obj) ne null)
- }
- }
- }
-
- it("should shutdown supervised, annotated typed actor on failure") {
- val obj = conf2.getInstance[SamplePojoAnnotated](classOf[SamplePojoAnnotated])
- val cdl = obj.newCountdownLatch(1)
- assert(AspectInitRegistry.initFor(obj) ne null)
- try {
- obj.fail
- fail("expected exception not thrown")
- } catch {
- case e: RuntimeException => {
- cdl.await
- assert(!obj.pre)
- assert(!obj.post)
- assert(obj.down)
- assert(AspectInitRegistry.initFor(obj) eq null)
- }
- }
- }
- */
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorSpec.scala
deleted file mode 100644
index 7de0a8f5df..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorSpec.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (C) 2009-2010 Scalable Solutions AB
- */
-
-package se.scalablesolutions.akka.actor
-
-import org.scalatest.Spec
-import org.scalatest.Assertions
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-import se.scalablesolutions.akka.dispatch.DefaultCompletableFuture;
-
-@RunWith(classOf[JUnitRunner])
-class TypedActorSpec extends
- Spec with
- ShouldMatchers with
- BeforeAndAfterAll {
-
- describe("TypedActor") {
- it("should resolve Future return from method defined to return a Future") {
- val pojo = TypedActor.newInstance(classOf[SimpleJavaPojo], classOf[SimpleJavaPojoImpl])
- val future = pojo.square(10)
- future.await
- future.result.isDefined should equal (true)
- future.result.get should equal (100)
- }
- }
-}
diff --git a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorUtilFunctionsSpec.scala b/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorUtilFunctionsSpec.scala
deleted file mode 100644
index 48424f3c17..0000000000
--- a/akka-typed-actors/src/test/scala/actor/typed-actor/TypedActorUtilFunctionsSpec.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-package se.scalablesolutions.akka.actor
-
-import org.scalatest.Suite
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.matchers.MustMatchers
-import org.junit.{Before, After, Test}
-import java.util.concurrent.{ CountDownLatch, TimeUnit }
-
-@RunWith(classOf[JUnitRunner])
-class ActorObjectUtilFunctionsSpec extends junit.framework.TestCase with Suite with MustMatchers {
- import Actor._
- @Test def testSpawn = {
- val latch = new CountDownLatch(1)
-
- spawn {
- latch.countDown
- }
-
- val done = latch.await(10,TimeUnit.SECONDS)
- done must be (true)
- }
-}
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index e6c243c201..59e190114f 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -216,19 +216,19 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
// Subprojects
// -------------------------------------------------------------------------------------------------------------------
- lazy val akka_actors = project("akka-actors", "akka-actors", new AkkaCoreProject(_))
- lazy val akka_typed_actors = project("akka-typed-actors", "akka-typed-actors", new AkkaCoreProject(_), akka_actors)
- lazy val akka_core = project("akka-core", "akka-core", new AkkaCoreProject(_), akka_typed_actors)
- lazy val akka_amqp = project("akka-amqp", "akka-amqp", new AkkaAMQPProject(_), akka_core)
- lazy val akka_http = project("akka-http", "akka-http", new AkkaHttpProject(_), akka_core, akka_camel)
- lazy val akka_camel = project("akka-camel", "akka-camel", new AkkaCamelProject(_), akka_core)
- lazy val akka_persistence = project("akka-persistence", "akka-persistence", new AkkaPersistenceParentProject(_))
- lazy val akka_spring = project("akka-spring", "akka-spring", new AkkaSpringProject(_), akka_core, akka_camel)
- lazy val akka_jta = project("akka-jta", "akka-jta", new AkkaJTAProject(_), akka_core)
- lazy val akka_kernel = project("akka-kernel", "akka-kernel", new AkkaKernelProject(_),
- akka_core, akka_http, akka_spring, akka_camel, akka_persistence, akka_amqp)
- lazy val akka_osgi = project("akka-osgi", "akka-osgi", new AkkaOSGiParentProject(_))
- lazy val akka_samples = project("akka-samples", "akka-samples", new AkkaSamplesParentProject(_))
+ lazy val akka_actor = project("akka-actor", "akka-actor", new AkkaActorProject(_))
+ lazy val akka_typed_actor = project("akka-typed-actor", "akka-typed-actor", new AkkaTypedActorProject(_), akka_actor)
+ lazy val akka_remote = project("akka-remote", "akka-remote", new AkkaRemoteProject(_), akka_typed_actor)
+ lazy val akka_amqp = project("akka-amqp", "akka-amqp", new AkkaAMQPProject(_), akka_remote)
+ lazy val akka_http = project("akka-http", "akka-http", new AkkaHttpProject(_), akka_remote, akka_camel)
+ lazy val akka_camel = project("akka-camel", "akka-camel", new AkkaCamelProject(_), akka_remote)
+ lazy val akka_persistence = project("akka-persistence", "akka-persistence", new AkkaPersistenceParentProject(_))
+ lazy val akka_spring = project("akka-spring", "akka-spring", new AkkaSpringProject(_), akka_remote, akka_camel)
+ lazy val akka_jta = project("akka-jta", "akka-jta", new AkkaJTAProject(_), akka_remote)
+ lazy val akka_kernel = project("akka-kernel", "akka-kernel", new AkkaKernelProject(_),
+ akka_remote, akka_http, akka_spring, akka_camel, akka_persistence, akka_amqp)
+ lazy val akka_osgi = project("akka-osgi", "akka-osgi", new AkkaOSGiParentProject(_))
+ lazy val akka_samples = project("akka-samples", "akka-samples", new AkkaSamplesParentProject(_))
// -------------------------------------------------------------------------------------------------------------------
// Miscellaneous
@@ -253,7 +253,9 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
.map("lib_managed/scala_%s/compile/".format(buildScalaVersion) + _.getName)
.mkString(" ") +
" scala-library.jar" +
- " dist/akka-core_%s-%s.jar".format(buildScalaVersion, version) +
+ " dist/akka-actor_%s-%s.jar".format(buildScalaVersion, version) +
+ " dist/akka-typed-actor_%s-%s.jar".format(buildScalaVersion, version) +
+ " dist/akka-remote_%s-%s.jar".format(buildScalaVersion, version) +
" dist/akka-http_%s-%s.jar".format(buildScalaVersion, version) +
" dist/akka-camel_%s-%s.jar".format(buildScalaVersion, version) +
" dist/akka-amqp_%s-%s.jar".format(buildScalaVersion, version) +
@@ -328,10 +330,10 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
} dependsOn(dist) describedAs("Run mvn install for artifacts in dist.")
// -------------------------------------------------------------------------------------------------------------------
- // akka-actors subproject
+ // akka-actor subproject
// -------------------------------------------------------------------------------------------------------------------
- class AkkaActorsProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
+ class AkkaActorProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
val configgy = Dependencies.configgy
val hawtdispatch = Dependencies.hawtdispatch
val multiverse = Dependencies.multiverse
@@ -345,7 +347,11 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
val scalatest = Dependencies.scalatest
}
- class AkkaTypedActorsProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
+ // -------------------------------------------------------------------------------------------------------------------
+ // akka-typed-actor subproject
+ // -------------------------------------------------------------------------------------------------------------------
+
+ class AkkaTypedActorProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
val aopalliance = Dependencies.aopalliance
val werkz = Dependencies.werkz
val werkz_core = Dependencies.werkz_core
@@ -356,10 +362,10 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
}
// -------------------------------------------------------------------------------------------------------------------
- // akka-core subproject
+ // akka-remote subproject
// -------------------------------------------------------------------------------------------------------------------
- class AkkaCoreProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
+ class AkkaRemoteProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
val commons_codec = Dependencies.commons_codec
val commons_io = Dependencies.commons_io
val dispatch_http = Dependencies.dispatch_http
@@ -439,7 +445,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
class AkkaPersistenceParentProject(info: ProjectInfo) extends ParentProject(info) {
lazy val akka_persistence_common = project("akka-persistence-common", "akka-persistence-common",
- new AkkaPersistenceCommonProject(_), akka_core)
+ new AkkaPersistenceCommonProject(_), akka_remote)
lazy val akka_persistence_redis = project("akka-persistence-redis", "akka-persistence-redis",
new AkkaRedisProject(_), akka_persistence_common)
lazy val akka_persistence_mongo = project("akka-persistence-mongo", "akka-persistence-mongo",
@@ -534,7 +540,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val akka_osgi_dependencies_bundle = project("akka-osgi-dependencies-bundle", "akka-osgi-dependencies-bundle",
new AkkaOSGiDependenciesBundleProject(_), akka_kernel, akka_jta) // akka_kernel does not depend on akka_jta (why?) therefore we list akka_jta here
lazy val akka_osgi_assembly = project("akka-osgi-assembly", "akka-osgi-assembly",
- new AkkaOSGiAssemblyProject(_), akka_osgi_dependencies_bundle, akka_core, akka_amqp, akka_http,
+ new AkkaOSGiAssemblyProject(_), akka_osgi_dependencies_bundle, akka_remote, akka_amqp, akka_http,
akka_camel, akka_spring, akka_jta, akka_persistence.akka_persistence_common,
akka_persistence.akka_persistence_redis, akka_persistence.akka_persistence_mongo,
akka_persistence.akka_persistence_cassandra)
@@ -695,7 +701,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
class AkkaSamplesParentProject(info: ProjectInfo) extends ParentProject(info) {
lazy val akka_sample_ants = project("akka-sample-ants", "akka-sample-ants",
- new AkkaSampleAntsProject(_), akka_core)
+ new AkkaSampleAntsProject(_), akka_remote)
lazy val akka_sample_chat = project("akka-sample-chat", "akka-sample-chat",
new AkkaSampleChatProject(_), akka_kernel)
lazy val akka_sample_pubsub = project("akka-sample-pubsub", "akka-sample-pubsub",
@@ -715,7 +721,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val akka_sample_remote = project("akka-sample-remote", "akka-sample-remote",
new AkkaSampleRemoteProject(_), akka_kernel)
lazy val akka_sample_osgi = project("akka-sample-osgi", "akka-sample-osgi",
- new AkkaSampleOSGiProject(_), akka_core)
+ new AkkaSampleOSGiProject(_), akka_remote)
}
// -------------------------------------------------------------------------------------------------------------------