From a43009e46526b95830e5a6bd08d765a16e30b515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Mon, 8 Nov 2010 15:42:08 +0100 Subject: [PATCH] Fixed maven groupId and some other minor stuff --- .../main/scala/util/ReflectiveAccess.scala | 4 +-- .../src/main/protocol/RemoteProtocol.proto | 30 +++++++++---------- .../scala/remote/RemoteTypedActorSpec.scala | 8 ++--- project/build.properties | 2 +- project/build/AkkaProject.scala | 8 ++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/akka-actor/src/main/scala/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/util/ReflectiveAccess.scala index 51c895728e..3320522ed6 100644 --- a/akka-actor/src/main/scala/util/ReflectiveAccess.scala +++ b/akka-actor/src/main/scala/util/ReflectiveAccess.scala @@ -259,7 +259,7 @@ object ReflectiveAccess extends Logging { Some(ctor.newInstance(args: _*).asInstanceOf[T]) } catch { case e => - log.debug("Could not instantiate class [%s] due to [%s]", clazz.getName, e) + log.warning("Could not instantiate class [%s] due to [%s]", clazz.getName, e.getCause) None } @@ -276,7 +276,7 @@ object ReflectiveAccess extends Logging { Some(ctor.newInstance(args: _*).asInstanceOf[T]) } catch { case e => - log.debug("Could not instantiate class [%s] due to [%s]", fqn, e) + log.warning("Could not instantiate class [%s] due to [%s]", fqn, e.getCause) None } diff --git a/akka-remote/src/main/protocol/RemoteProtocol.proto b/akka-remote/src/main/protocol/RemoteProtocol.proto index fe55c115e7..19282c53be 100644 --- a/akka-remote/src/main/protocol/RemoteProtocol.proto +++ b/akka-remote/src/main/protocol/RemoteProtocol.proto @@ -11,6 +11,21 @@ option optimize_for = SPEED; protoc RemoteProtocol.proto --java_out ../java *******************************************/ +/** + * Defines a remote message. + */ +message RemoteMessageProtocol { + required UuidProtocol uuid = 1; + required ActorInfoProtocol actorInfo = 2; + required bool oneWay = 3; + optional MessageProtocol message = 4; + optional ExceptionProtocol exception = 5; + optional UuidProtocol supervisorUuid = 6; + optional RemoteActorRefProtocol sender = 7; + repeated MetadataEntryProtocol metadata = 8; + optional string cookie = 9; +} + /** * Defines a remote ActorRef that "remembers" and uses its original Actor instance * on the original node. @@ -91,21 +106,6 @@ message TypedActorInfoProtocol { required string method = 2; } -/** - * Defines a remote message. - */ -message RemoteMessageProtocol { - required UuidProtocol uuid = 1; - required ActorInfoProtocol actorInfo = 2; - required bool oneWay = 3; - optional MessageProtocol message = 4; - optional ExceptionProtocol exception = 5; - optional UuidProtocol supervisorUuid = 6; - optional RemoteActorRefProtocol sender = 7; - repeated MetadataEntryProtocol metadata = 8; - optional string cookie = 9; -} - /** * Defines a UUID. */ diff --git a/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala b/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala index 064bce95b0..431c633102 100644 --- a/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala +++ b/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala @@ -83,7 +83,7 @@ class RemoteTypedActorSpec extends } describe("Remote Typed Actor ") { -/* + it("should receive one-way message") { clearMessageLogs val ta = conf.getInstance(classOf[RemoteTypedActorOne]) @@ -102,7 +102,7 @@ class RemoteTypedActorSpec extends ta.requestReply("ping") } } -*/ + it("should be restarted on failure") { clearMessageLogs val ta = conf.getInstance(classOf[RemoteTypedActorOne]) @@ -112,7 +112,7 @@ class RemoteTypedActorSpec extends } messageLog.poll(5, TimeUnit.SECONDS) should equal ("Expected exception; to test fault-tolerance") } -/* + it("should restart linked friends on failure") { clearMessageLogs val ta1 = conf.getInstance(classOf[RemoteTypedActorOne]) @@ -124,5 +124,5 @@ class RemoteTypedActorSpec extends messageLog.poll(5, TimeUnit.SECONDS) should equal ("Expected exception; to test fault-tolerance") messageLog.poll(5, TimeUnit.SECONDS) should equal ("Expected exception; to test fault-tolerance") } -*/ } + } } diff --git a/project/build.properties b/project/build.properties index a0dd769ee9..4b70e4a190 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ -project.organization=akka +project.organization=se.scalablesolutions.akka project.name=akka project.version=1.0-SNAPSHOT scala.version=2.8.0 diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index f7b261edb3..44796fc157 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -140,7 +140,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { object Dependencies { // Compile - lazy val commonsHttpClient = "commons-httpclient" % "commons-httpclient" % "3.1" % "compile" + lazy val commonsHttpClient = "commons-httpclient" % "commons-httpclient" % "3.1" % "compile" lazy val annotation = "javax.annotation" % "jsr250-api" % "1.0" % "compile" @@ -310,8 +310,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { manifestClassPath.map(cp => ManifestAttributes( (Attributes.Name.CLASS_PATH, cp), (IMPLEMENTATION_TITLE, "Akka"), - (IMPLEMENTATION_URL, "http://akkasource.org"), - (IMPLEMENTATION_VENDOR, "The Akka Project") + (IMPLEMENTATION_URL, "http://akka.io"), + (IMPLEMENTATION_VENDOR, "Scalable Solutions AB") )).toList ::: getMainClass(false).map(MainClass(_)).toList @@ -393,7 +393,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { val artifactRE(path, artifactId, artifactVersion) = absPath val command = "mvn install:install-file" + " -Dfile=" + absPath + - " -DgroupId=akka" + + " -DgroupId=se.scalablesolutions.akka" + " -DartifactId=" + artifactId + " -Dversion=" + version + " -Dpackaging=jar -DgeneratePom=true"