diff --git a/akka-actor/src/main/scala/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/util/ReflectiveAccess.scala index 41283cbbae..9de57e5c4a 100644 --- a/akka-actor/src/main/scala/util/ReflectiveAccess.scala +++ b/akka-actor/src/main/scala/util/ReflectiveAccess.scala @@ -111,7 +111,7 @@ object ReflectiveAccess extends Logging { */ object RemoteServerModule { val HOSTNAME = Config.config.getString("akka.remote.server.hostname", "localhost") - val PORT = Config.config.getInt("akka.remote.server.port", 9999) + val PORT = Config.config.getInt("akka.remote.server.port", 2552) type RemoteServerObject = { def registerActor(address: InetSocketAddress, uuid: Uuid, actor: ActorRef): Unit diff --git a/akka-actor/src/test/java/akka/config/SupervisionConfig.java b/akka-actor/src/test/java/akka/config/SupervisionConfig.java index 908bc416d4..271e6c490e 100644 --- a/akka-actor/src/test/java/akka/config/SupervisionConfig.java +++ b/akka-actor/src/test/java/akka/config/SupervisionConfig.java @@ -13,7 +13,7 @@ public class SupervisionConfig { public SupervisorConfig createSupervisorConfig(List toSupervise) { ArrayList targets = new ArrayList(toSupervise.size()); for(ActorRef ref : toSupervise) { - targets.add(new Supervise(ref, permanent(), new RemoteAddress("localhost",9999))); + targets.add(new Supervise(ref, permanent(), new RemoteAddress("localhost",2552))); } return new SupervisorConfig(new AllForOneStrategy(new Class[] { Exception.class },50,1000), targets.toArray(new Server[0])); diff --git a/akka-remote/src/main/scala/remote/RemoteServer.scala b/akka-remote/src/main/scala/remote/RemoteServer.scala index 9bc85e2608..dbb33ff50c 100644 --- a/akka-remote/src/main/scala/remote/RemoteServer.scala +++ b/akka-remote/src/main/scala/remote/RemoteServer.scala @@ -83,7 +83,7 @@ object RemoteServer { val UNTRUSTED_MODE = config.getBool("akka.remote.server.untrusted-mode", false) val HOSTNAME = config.getString("akka.remote.server.hostname", "localhost") - val PORT = config.getInt("akka.remote.server.port", 9999) + val PORT = config.getInt("akka.remote.server.port", 2552) val CONNECTION_TIMEOUT_MILLIS = Duration(config.getInt("akka.remote.server.connection-timeout", 1), TIME_UNIT) val COMPRESSION_SCHEME = config.getString("akka.remote.compression-scheme", "zlib") val ZLIB_COMPRESSION_LEVEL = { diff --git a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala index 855d6cd723..cb7a5f36eb 100644 --- a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala +++ b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala @@ -17,7 +17,7 @@ class HelloWorldActor extends Actor { object ServerInitiatedRemoteActorServer { def run = { - RemoteNode.start("localhost", 9999) + RemoteNode.start("localhost", 2552) RemoteNode.register("hello-service", actorOf[HelloWorldActor]) } @@ -27,7 +27,7 @@ object ServerInitiatedRemoteActorServer { object ServerInitiatedRemoteActorClient extends Logging { def run = { - val actor = RemoteClient.actorFor("hello-service", "localhost", 9999) + val actor = RemoteClient.actorFor("hello-service", "localhost", 2552) val result = actor !! "Hello" log.info("Result from Remote Actor: %s", result) } diff --git a/akka-remote/src/test/scala/remote/ShutdownSpec.scala b/akka-remote/src/test/scala/remote/ShutdownSpec.scala index 1f8787a1c7..3e11ac1c5f 100644 --- a/akka-remote/src/test/scala/remote/ShutdownSpec.scala +++ b/akka-remote/src/test/scala/remote/ShutdownSpec.scala @@ -28,7 +28,7 @@ object RemoteServerAndClusterShutdownRunner { val s1 = new RemoteServer val s2 = new RemoteServer val s3 = new RemoteServer - s1.start("localhost", 9999) + s1.start("localhost", 2552) s2.start("localhost", 9998) s3.start("localhost", 9997) Thread.sleep(5000) diff --git a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala index 142ffc20a3..27bdad9d18 100644 --- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala +++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala @@ -60,7 +60,7 @@ case class ChatMessage(from: String, message: String) extends Event * Chat client. */ class ChatClient(val name: String) { - val chat = RemoteClient.actorFor("chat:service", "localhost", 9999) + val chat = RemoteClient.actorFor("chat:service", "localhost", 2552) def login = chat ! Login(name) def logout = chat ! Logout(name) @@ -203,7 +203,7 @@ class ChatService extends ChatManagement with RedisChatStorageFactory { override def preStart = { - RemoteNode.start("localhost", 9999) + RemoteNode.start("localhost", 2552) RemoteNode.register("chat:service", self) } } diff --git a/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala b/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala index 692c35de8a..33bdbbcd69 100644 --- a/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala +++ b/akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala @@ -9,7 +9,7 @@ import akka.actor.RemoteActor import akka.remote.RemoteNode import akka.util.Logging -class RemoteHelloWorldActor extends RemoteActor("localhost", 9999) { +class RemoteHelloWorldActor extends RemoteActor("localhost", 2552) { def receive = { case "Hello" => log.info("Received 'Hello'") @@ -19,7 +19,7 @@ class RemoteHelloWorldActor extends RemoteActor("localhost", 9999) { object ClientManagedRemoteActorServer extends Logging { def run = { - RemoteNode.start("localhost", 9999) + RemoteNode.start("localhost", 2552) log.info("Remote node started") } diff --git a/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala b/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala index 3ee0934a13..9fe7e19880 100644 --- a/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala +++ b/akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala @@ -20,7 +20,7 @@ class HelloWorldActor extends Actor { object ServerManagedRemoteActorServer extends Logging { def run = { - RemoteNode.start("localhost", 9999) + RemoteNode.start("localhost", 2552) log.info("Remote node started") RemoteNode.register("hello-service", actorOf[HelloWorldActor]) log.info("Remote actor registered and started") @@ -32,7 +32,7 @@ object ServerManagedRemoteActorServer extends Logging { object ServerManagedRemoteActorClient extends Logging { def run = { - val actor = RemoteClient.actorFor("hello-service", "localhost", 9999) + val actor = RemoteClient.actorFor("hello-service", "localhost", 2552) log.info("Remote client created") log.info("Sending 'Hello' to remote actor") val result = actor !! "Hello" diff --git a/akka-spring/src/test/resources/typed-actor-config.xml b/akka-spring/src/test/resources/typed-actor-config.xml index fedfcada27..fa0e81eeae 100644 --- a/akka-spring/src/test/resources/typed-actor-config.xml +++ b/akka-spring/src/test/resources/typed-actor-config.xml @@ -44,7 +44,7 @@ http://scalablesolutions.se/akka/akka-1.0-SNAPSHOT.xsd"> interface="akka.spring.foo.IMyPojo" implementation="akka.spring.foo.MyPojo" timeout="1000"> - + diff --git a/akka-spring/src/test/scala/TypedActorBeanDefinitionParserTest.scala b/akka-spring/src/test/scala/TypedActorBeanDefinitionParserTest.scala index 97766341a4..36b8588861 100644 --- a/akka-spring/src/test/scala/TypedActorBeanDefinitionParserTest.scala +++ b/akka-spring/src/test/scala/TypedActorBeanDefinitionParserTest.scala @@ -60,24 +60,24 @@ class TypedActorBeanDefinitionParserTest extends Spec with ShouldMatchers { it("should parse remote TypedActors configuration") { val xml = - + val props = parser.parseActor(dom(xml).getDocumentElement); assert(props ne null) assert(props.host === "com.some.host") - assert(props.port === "9999") + assert(props.port === "2552") assert(!props.serverManaged) } it("should parse remote server managed TypedActors configuration") { val xml = - + val props = parser.parseActor(dom(xml).getDocumentElement); assert(props ne null) assert(props.host === "com.some.host") - assert(props.port === "9999") + assert(props.port === "2552") assert(props.serviceName === "my-service") assert(props.serverManaged) } diff --git a/config/akka-reference.conf b/config/akka-reference.conf index b218045c70..cfdd5887c6 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -134,7 +134,7 @@ akka { server { service = on hostname = "localhost" # The hostname or IP that clients should connect to - port = 9999 # The port clients should connect to + port = 2552 # The port clients should connect to connection-timeout = 1 require-cookie = on untrusted-mode = off