Fixed maven groupId and some other minor stuff
This commit is contained in:
parent
f198b966fd
commit
a43009e465
5 changed files with 26 additions and 26 deletions
|
|
@ -259,7 +259,7 @@ object ReflectiveAccess extends Logging {
|
||||||
Some(ctor.newInstance(args: _*).asInstanceOf[T])
|
Some(ctor.newInstance(args: _*).asInstanceOf[T])
|
||||||
} catch {
|
} catch {
|
||||||
case e =>
|
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
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -276,7 +276,7 @@ object ReflectiveAccess extends Logging {
|
||||||
Some(ctor.newInstance(args: _*).asInstanceOf[T])
|
Some(ctor.newInstance(args: _*).asInstanceOf[T])
|
||||||
} catch {
|
} catch {
|
||||||
case e =>
|
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
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,21 @@ option optimize_for = SPEED;
|
||||||
protoc RemoteProtocol.proto --java_out ../java
|
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
|
* Defines a remote ActorRef that "remembers" and uses its original Actor instance
|
||||||
* on the original node.
|
* on the original node.
|
||||||
|
|
@ -91,21 +106,6 @@ message TypedActorInfoProtocol {
|
||||||
required string method = 2;
|
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.
|
* Defines a UUID.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ class RemoteTypedActorSpec extends
|
||||||
}
|
}
|
||||||
|
|
||||||
describe("Remote Typed Actor ") {
|
describe("Remote Typed Actor ") {
|
||||||
/*
|
|
||||||
it("should receive one-way message") {
|
it("should receive one-way message") {
|
||||||
clearMessageLogs
|
clearMessageLogs
|
||||||
val ta = conf.getInstance(classOf[RemoteTypedActorOne])
|
val ta = conf.getInstance(classOf[RemoteTypedActorOne])
|
||||||
|
|
@ -102,7 +102,7 @@ class RemoteTypedActorSpec extends
|
||||||
ta.requestReply("ping")
|
ta.requestReply("ping")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
it("should be restarted on failure") {
|
it("should be restarted on failure") {
|
||||||
clearMessageLogs
|
clearMessageLogs
|
||||||
val ta = conf.getInstance(classOf[RemoteTypedActorOne])
|
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")
|
messageLog.poll(5, TimeUnit.SECONDS) should equal ("Expected exception; to test fault-tolerance")
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
it("should restart linked friends on failure") {
|
it("should restart linked friends on failure") {
|
||||||
clearMessageLogs
|
clearMessageLogs
|
||||||
val ta1 = conf.getInstance(classOf[RemoteTypedActorOne])
|
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")
|
||||||
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")
|
||||||
}
|
}
|
||||||
*/ }
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
project.organization=akka
|
project.organization=se.scalablesolutions.akka
|
||||||
project.name=akka
|
project.name=akka
|
||||||
project.version=1.0-SNAPSHOT
|
project.version=1.0-SNAPSHOT
|
||||||
scala.version=2.8.0
|
scala.version=2.8.0
|
||||||
|
|
|
||||||
|
|
@ -310,8 +310,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
manifestClassPath.map(cp => ManifestAttributes(
|
manifestClassPath.map(cp => ManifestAttributes(
|
||||||
(Attributes.Name.CLASS_PATH, cp),
|
(Attributes.Name.CLASS_PATH, cp),
|
||||||
(IMPLEMENTATION_TITLE, "Akka"),
|
(IMPLEMENTATION_TITLE, "Akka"),
|
||||||
(IMPLEMENTATION_URL, "http://akkasource.org"),
|
(IMPLEMENTATION_URL, "http://akka.io"),
|
||||||
(IMPLEMENTATION_VENDOR, "The Akka Project")
|
(IMPLEMENTATION_VENDOR, "Scalable Solutions AB")
|
||||||
)).toList :::
|
)).toList :::
|
||||||
getMainClass(false).map(MainClass(_)).toList
|
getMainClass(false).map(MainClass(_)).toList
|
||||||
|
|
||||||
|
|
@ -393,7 +393,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
val artifactRE(path, artifactId, artifactVersion) = absPath
|
val artifactRE(path, artifactId, artifactVersion) = absPath
|
||||||
val command = "mvn install:install-file" +
|
val command = "mvn install:install-file" +
|
||||||
" -Dfile=" + absPath +
|
" -Dfile=" + absPath +
|
||||||
" -DgroupId=akka" +
|
" -DgroupId=se.scalablesolutions.akka" +
|
||||||
" -DartifactId=" + artifactId +
|
" -DartifactId=" + artifactId +
|
||||||
" -Dversion=" + version +
|
" -Dversion=" + version +
|
||||||
" -Dpackaging=jar -DgeneratePom=true"
|
" -Dpackaging=jar -DgeneratePom=true"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue