raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

moved akka.annotation._ to akka.actor.annotation._ to be merged in with akka-core OSGi bundle

Browse source
This commit is contained in:
Jonas Bonér 2010-03-17 14:31:50 +01:00
parent 10a6a7d32f
commit f0e53bc049
22 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-camel/src/main/scala/service/ConsumerPublisher.scala
View file

@ -9,7 +9,7 @@ import java.util.concurrent.CountDownLatch
import org.apache.camel.builder.RouteBuilder
import se.scalablesolutions.akka.actor.{ActorUnregistered, ActorRegistered, Actor}
import se.scalablesolutions.akka.annotation.consume
import se.scalablesolutions.akka.actor.annotation.consume
import se.scalablesolutions.akka.camel.{Consumer, CamelContextManager}
import se.scalablesolutions.akka.util.Logging

2
akka-camel/src/test/scala/service/CamelServiceTest.scala
View file

@ -5,7 +5,7 @@ import org.junit.Assert._
import org.scalatest.junit.JUnitSuite
import se.scalablesolutions.akka.actor.Actor
import se.scalablesolutions.akka.annotation.consume
import se.scalablesolutions.akka.actor.annotation.consume
import se.scalablesolutions.akka.camel.{CamelContextManager, Consumer, Message}
import org.junit.{Ignore, Before, After, Test}

2
akka-core/src/main/scala/actor/ActiveObject.scala
View file

@ -19,7 +19,7 @@ import java.net.InetSocketAddress
import java.lang.reflect.{InvocationTargetException, Method}
object Annotations {
import se.scalablesolutions.akka.annotation._
import se.scalablesolutions.akka.actor.annotation._
val oneway = classOf[oneway]
val transactionrequired = classOf[transactionrequired]
val prerestart = classOf[prerestart]

2
akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/Bar.java
View file

@ -1,6 +1,6 @@
package se.scalablesolutions.akka.api;
import se.scalablesolutions.akka.annotation.oneway;
import se.scalablesolutions.akka.actor.annotation.oneway;
public interface Bar {
@oneway

2
akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/Foo.java
View file

@ -1,7 +1,7 @@
package se.scalablesolutions.akka.api;
import com.google.inject.Inject;
import se.scalablesolutions.akka.annotation.oneway;
import se.scalablesolutions.akka.actor.annotation.oneway;
public class Foo extends se.scalablesolutions.akka.serialization.Serializable.JavaJSON {
@Inject

8
akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java
View file

@ -1,9 +1,9 @@
package se.scalablesolutions.akka.api;
import se.scalablesolutions.akka.annotation.transactionrequired;
import se.scalablesolutions.akka.annotation.prerestart;
import se.scalablesolutions.akka.annotation.postrestart;
import se.scalablesolutions.akka.annotation.inittransactionalstate;
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
import se.scalablesolutions.akka.actor.annotation.prerestart;
import se.scalablesolutions.akka.actor.annotation.postrestart;
import se.scalablesolutions.akka.actor.annotation.inittransactionalstate;
import se.scalablesolutions.akka.stm.*;
@transactionrequired

4
akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java
View file

@ -1,7 +1,7 @@
package se.scalablesolutions.akka.api;
import se.scalablesolutions.akka.annotation.transactionrequired;
import se.scalablesolutions.akka.annotation.inittransactionalstate;
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
import se.scalablesolutions.akka.actor.annotation.inittransactionalstate;
import se.scalablesolutions.akka.stm.*;
@transactionrequired

2
akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java
View file

@ -2,7 +2,7 @@ package se.scalablesolutions.akka.api;
import se.scalablesolutions.akka.persistence.common.*;
import se.scalablesolutions.akka.persistence.cassandra.*;
import se.scalablesolutions.akka.annotation.inittransactionalstate;
import se.scalablesolutions.akka.actor.annotation.inittransactionalstate;
public class PersistentClasher {
private PersistentMap state;

4
akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java
View file

@ -1,7 +1,7 @@
package se.scalablesolutions.akka.api;
import se.scalablesolutions.akka.annotation.inittransactionalstate;
import se.scalablesolutions.akka.annotation.transactionrequired;
import se.scalablesolutions.akka.actor.annotation.inittransactionalstate;
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
import se.scalablesolutions.akka.persistence.common.*;
import se.scalablesolutions.akka.persistence.cassandra.*;

4
akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java
View file

@ -1,7 +1,7 @@
package se.scalablesolutions.akka.api;
import se.scalablesolutions.akka.annotation.inittransactionalstate;
import se.scalablesolutions.akka.annotation.transactionrequired;
import se.scalablesolutions.akka.actor.annotation.inittransactionalstate;
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
import se.scalablesolutions.akka.persistence.common.*;
import se.scalablesolutions.akka.persistence.cassandra.*;

2
akka-samples/akka-sample-camel/src/main/scala/Actors.scala
View file

@ -1,7 +1,7 @@
package sample.camel
import se.scalablesolutions.akka.actor.{Actor, RemoteActor}
import se.scalablesolutions.akka.annotation.consume
import se.scalablesolutions.akka.actor.annotation.consume
import se.scalablesolutions.akka.camel.{Producer, Message, Consumer}
import se.scalablesolutions.akka.util.Logging

6
akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java
View file

@ -8,9 +8,9 @@ import javax.ws.rs.Path;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import se.scalablesolutions.akka.annotation.transactionrequired;
import se.scalablesolutions.akka.annotation.prerestart;
import se.scalablesolutions.akka.annotation.postrestart;
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
import se.scalablesolutions.akka.actor.annotation.prerestart;
import se.scalablesolutions.akka.actor.annotation.postrestart;
import se.scalablesolutions.akka.persistence.common.PersistentMap;
import se.scalablesolutions.akka.persistence.cassandra.CassandraStorage;

6
akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java
View file

@ -8,9 +8,9 @@ import javax.ws.rs.Path;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import se.scalablesolutions.akka.annotation.transactionrequired;
import se.scalablesolutions.akka.annotation.prerestart;
import se.scalablesolutions.akka.annotation.postrestart;
import se.scalablesolutions.akka.actor.annotation.transactionrequired;
import se.scalablesolutions.akka.actor.annotation.prerestart;
import se.scalablesolutions.akka.actor.annotation.postrestart;
import se.scalablesolutions.akka.stm.TransactionalState;
import se.scalablesolutions.akka.stm.TransactionalMap;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/consume.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/immutable.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/inittransactionalstate.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/oneway.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/postrestart.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/prerestart.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/state.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;

2
akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/transactionrequired.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.annotation;
package se.scalablesolutions.akka.actor.annotation;
import java.lang.annotation.*;