Merge branch 'remote_deluxe'
This commit is contained in:
commit
fff4109cb5
59 changed files with 3112 additions and 3451 deletions
|
|
@ -2,7 +2,7 @@ package akka.transactor.example;
|
|||
|
||||
import akka.transactor.Coordinated;
|
||||
import akka.transactor.Atomically;
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.Actors;
|
||||
import akka.actor.UntypedActor;
|
||||
import akka.stm.Ref;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package akka.transactor.example;
|
|||
|
||||
import akka.transactor.Coordinated;
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.UntypedActor;
|
||||
import akka.actor.Actors;
|
||||
import akka.dispatch.Future;
|
||||
import akka.dispatch.Futures;
|
||||
|
||||
|
|
@ -12,8 +12,8 @@ public class UntypedCoordinatedExample {
|
|||
System.out.println("Untyped transactor example");
|
||||
System.out.println();
|
||||
|
||||
ActorRef counter1 = UntypedActor.actorOf(UntypedCoordinatedCounter.class).start();
|
||||
ActorRef counter2 = UntypedActor.actorOf(UntypedCoordinatedCounter.class).start();
|
||||
ActorRef counter1 = Actors.actorOf(UntypedCoordinatedCounter.class).start();
|
||||
ActorRef counter2 = Actors.actorOf(UntypedCoordinatedCounter.class).start();
|
||||
|
||||
counter1.sendOneWay(new Coordinated(new Increment(counter2)));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package akka.transactor.example;
|
||||
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.UntypedActor;
|
||||
import akka.actor.Actors;
|
||||
import akka.dispatch.Future;
|
||||
import akka.dispatch.Futures;
|
||||
|
||||
|
|
@ -11,8 +11,8 @@ public class UntypedTransactorExample {
|
|||
System.out.println("Untyped transactor example");
|
||||
System.out.println();
|
||||
|
||||
ActorRef counter1 = UntypedActor.actorOf(UntypedCounter.class).start();
|
||||
ActorRef counter2 = UntypedActor.actorOf(UntypedCounter.class).start();
|
||||
ActorRef counter1 = Actors.actorOf(UntypedCounter.class).start();
|
||||
ActorRef counter2 = Actors.actorOf(UntypedCounter.class).start();
|
||||
|
||||
counter1.sendOneWay(new Increment(counter2));
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package akka.transactor.test;
|
|||
import akka.transactor.Coordinated;
|
||||
import akka.transactor.Atomically;
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.Actors;
|
||||
import akka.actor.UntypedActor;
|
||||
import akka.stm.*;
|
||||
import akka.util.FiniteDuration;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import org.junit.Test;
|
|||
import org.junit.Before;
|
||||
|
||||
import akka.transactor.Coordinated;
|
||||
import akka.actor.Actors;
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.UntypedActor;
|
||||
import akka.actor.UntypedActorFactory;
|
||||
|
|
@ -28,7 +29,7 @@ public class UntypedCoordinatedIncrementTest {
|
|||
counters = new ArrayList<ActorRef>();
|
||||
for (int i = 1; i <= numCounters; i++) {
|
||||
final String name = "counter" + i;
|
||||
ActorRef counter = UntypedActor.actorOf(new UntypedActorFactory() {
|
||||
ActorRef counter = Actors.actorOf(new UntypedActorFactory() {
|
||||
public UntypedActor create() {
|
||||
return new UntypedCoordinatedCounter(name);
|
||||
}
|
||||
|
|
@ -36,7 +37,7 @@ public class UntypedCoordinatedIncrementTest {
|
|||
counter.start();
|
||||
counters.add(counter);
|
||||
}
|
||||
failer = UntypedActor.actorOf(UntypedFailer.class);
|
||||
failer = Actors.actorOf(UntypedFailer.class);
|
||||
failer.start();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import org.junit.Test;
|
|||
import org.junit.Before;
|
||||
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.Actors;
|
||||
import akka.actor.UntypedActor;
|
||||
import akka.actor.UntypedActorFactory;
|
||||
import akka.dispatch.Future;
|
||||
|
|
@ -27,7 +28,7 @@ public class UntypedTransactorTest {
|
|||
counters = new ArrayList<ActorRef>();
|
||||
for (int i = 1; i <= numCounters; i++) {
|
||||
final String name = "counter" + i;
|
||||
ActorRef counter = UntypedActor.actorOf(new UntypedActorFactory() {
|
||||
ActorRef counter = Actors.actorOf(new UntypedActorFactory() {
|
||||
public UntypedActor create() {
|
||||
return new UntypedCounter(name);
|
||||
}
|
||||
|
|
@ -35,7 +36,7 @@ public class UntypedTransactorTest {
|
|||
counter.start();
|
||||
counters.add(counter);
|
||||
}
|
||||
failer = UntypedActor.actorOf(UntypedFailer.class);
|
||||
failer = Actors.actorOf(UntypedFailer.class);
|
||||
failer.start();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue