merged master
This commit is contained in:
ticktock
commit
0a720060fb
7 changed files with 127 additions and 116 deletions
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import akka.actor.Actor._
|
|||
import java.util.concurrent.atomic.AtomicLong
|
||||
import java.util.concurrent. {ConcurrentHashMap, CountDownLatch, TimeUnit}
|
||||
import akka.actor.dispatch.ActorModelSpec.MessageDispatcherInterceptor
|
||||
import akka.util.Duration
|
||||
|
||||
object ActorModelSpec {
|
||||
|
||||
|
|
@ -164,6 +165,18 @@ object ActorModelSpec {
|
|||
assert(stats.restarts.get() === restarts, "Restarts")
|
||||
}
|
||||
|
||||
def await(condition: => Boolean)(withinMs: Long, intervalMs: Long = 25): Boolean = try {
|
||||
val until = System.currentTimeMillis() + withinMs
|
||||
while(System.currentTimeMillis() <= until) {
|
||||
try {
|
||||
if (condition) return true
|
||||
|
||||
Thread.sleep(intervalMs)
|
||||
} catch { case e: InterruptedException => }
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
def newTestActor(implicit d: MessageDispatcherInterceptor) = actorOf(new DispatcherActor(d))
|
||||
}
|
||||
|
||||
|
|
@ -179,7 +192,7 @@ abstract class ActorModelSpec extends JUnitSuite {
|
|||
a.start
|
||||
assertDispatcher(dispatcher)(starts = 1, stops = 0)
|
||||
a.stop
|
||||
Thread.sleep(dispatcher.timeoutMs + 100)
|
||||
await(dispatcher.stops.get == 1)(withinMs = 10000)
|
||||
assertDispatcher(dispatcher)(starts = 1, stops = 1)
|
||||
assertRef(a,dispatcher)(
|
||||
suspensions = 0,
|
||||
|
|
@ -279,7 +292,7 @@ abstract class ActorModelSpec extends JUnitSuite {
|
|||
}
|
||||
for(run <- 1 to 3) {
|
||||
flood(10000)
|
||||
Thread.sleep(dispatcher.timeoutMs * 2)
|
||||
await(dispatcher.stops.get == run)(withinMs = 10000)
|
||||
assertDispatcher(dispatcher)(starts = run, stops = run)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ private[akka] object SimpledbStorageBackend extends CommonStorageBackend {
|
|||
val seperatorBytes = seperator.getBytes("UTF-8")
|
||||
val base64 = new Base64(1024, seperatorBytes, true)
|
||||
val base64key = new Base64(1024, Array.empty[Byte], true)
|
||||
val id = config.getString("akka.storage.simpledb.account.id")
|
||||
val secretKey = config.getString("akka.storage.simpledb.account.secretKey")
|
||||
val id = config.getString("akka.storage.simpledb.account.id", "YOU NEED TO PROVIDE AN AWS ID")
|
||||
val secretKey = config.getString("akka.storage.simpledb.account.secretKey", "YOU NEED TO PROVIDE AN AWS SECRET KEY")
|
||||
val refDomain = config.getString("akka.storage.simpledb.domain.ref", "ref")
|
||||
val mapDomain = config.getString("akka.storage.simpledb.domain.map", "map")
|
||||
val queueDomain = config.getString("akka.storage.simpledb.domain.queue", "queue")
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
}
|
||||
*/ }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -140,146 +140,144 @@ 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" //ApacheV2
|
||||
|
||||
lazy val annotation = "javax.annotation" % "jsr250-api" % "1.0" % "compile"
|
||||
lazy val aopalliance = "aopalliance" % "aopalliance" % "1.0" % "compile" //Public domain
|
||||
|
||||
lazy val aopalliance = "aopalliance" % "aopalliance" % "1.0" % "compile"
|
||||
lazy val atmo = "org.atmosphere" % "atmosphere-annotations" % ATMO_VERSION % "compile" //CDDL v1
|
||||
lazy val atmo_jbossweb = "org.atmosphere" % "atmosphere-compat-jbossweb" % ATMO_VERSION % "compile" //CDDL v1
|
||||
lazy val atmo_jersey = "org.atmosphere" % "atmosphere-jersey" % ATMO_VERSION % "compile" //CDDL v1
|
||||
lazy val atmo_runtime = "org.atmosphere" % "atmosphere-runtime" % ATMO_VERSION % "compile" //CDDL v1
|
||||
lazy val atmo_tomcat = "org.atmosphere" % "atmosphere-compat-tomcat" % ATMO_VERSION % "compile" //CDDL v1
|
||||
lazy val atmo_weblogic = "org.atmosphere" % "atmosphere-compat-weblogic" % ATMO_VERSION % "compile" //CDDL v1
|
||||
|
||||
lazy val atmo = "org.atmosphere" % "atmosphere-annotations" % ATMO_VERSION % "compile"
|
||||
lazy val atmo_jbossweb = "org.atmosphere" % "atmosphere-compat-jbossweb" % ATMO_VERSION % "compile"
|
||||
lazy val atmo_jersey = "org.atmosphere" % "atmosphere-jersey" % ATMO_VERSION % "compile"
|
||||
lazy val atmo_runtime = "org.atmosphere" % "atmosphere-runtime" % ATMO_VERSION % "compile"
|
||||
lazy val atmo_tomcat = "org.atmosphere" % "atmosphere-compat-tomcat" % ATMO_VERSION % "compile"
|
||||
lazy val atmo_weblogic = "org.atmosphere" % "atmosphere-compat-weblogic" % ATMO_VERSION % "compile"
|
||||
lazy val atomikos_transactions = "com.atomikos" % "transactions" % "3.2.3" % "compile" //ApacheV2
|
||||
lazy val atomikos_transactions_api = "com.atomikos" % "transactions-api" % "3.2.3" % "compile" //ApacheV2
|
||||
lazy val atomikos_transactions_jta = "com.atomikos" % "transactions-jta" % "3.2.3" % "compile" //ApacheV2
|
||||
|
||||
lazy val atomikos_transactions = "com.atomikos" % "transactions" % "3.2.3" % "compile"
|
||||
lazy val atomikos_transactions_api = "com.atomikos" % "transactions-api" % "3.2.3" % "compile"
|
||||
lazy val atomikos_transactions_jta = "com.atomikos" % "transactions-jta" % "3.2.3" % "compile"
|
||||
lazy val camel_core = "org.apache.camel" % "camel-core" % CAMEL_VERSION % "compile" //ApacheV2
|
||||
|
||||
lazy val camel_core = "org.apache.camel" % "camel-core" % CAMEL_VERSION % "compile"
|
||||
lazy val cassandra = "org.apache.cassandra" % "cassandra" % CASSANDRA_VERSION % "compile" //ApacheV2
|
||||
|
||||
lazy val cassandra = "org.apache.cassandra" % "cassandra" % CASSANDRA_VERSION % "compile"
|
||||
lazy val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile" //ApacheV2
|
||||
|
||||
lazy val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile"
|
||||
lazy val commons_io = "commons-io" % "commons-io" % "1.4" % "compile" //ApacheV2
|
||||
|
||||
lazy val commons_io = "commons-io" % "commons-io" % "1.4" % "compile"
|
||||
lazy val commons_pool = "commons-pool" % "commons-pool" % "1.5.4" % "compile" //ApacheV2
|
||||
|
||||
lazy val commons_pool = "commons-pool" % "commons-pool" % "1.5.4" % "compile"
|
||||
lazy val configgy = "net.lag" % "configgy" % "2.8.0-1.5.5" % "compile" //ApacheV2
|
||||
|
||||
lazy val configgy = "net.lag" % "configgy" % "2.8.0-1.5.5" % "compile"
|
||||
lazy val dispatch_http = "net.databinder" % "dispatch-http_2.8.0" % DISPATCH_VERSION % "compile" //LGPL v2
|
||||
lazy val dispatch_json = "net.databinder" % "dispatch-json_2.8.0" % DISPATCH_VERSION % "compile" //LGPL v2
|
||||
|
||||
lazy val dispatch_http = "net.databinder" % "dispatch-http_2.8.0" % DISPATCH_VERSION % "compile"
|
||||
lazy val dispatch_json = "net.databinder" % "dispatch-json_2.8.0" % DISPATCH_VERSION % "compile"
|
||||
lazy val jetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "compile" //Eclipse license
|
||||
lazy val jetty_util = "org.eclipse.jetty" % "jetty-util" % JETTY_VERSION % "compile" //Eclipse license
|
||||
lazy val jetty_xml = "org.eclipse.jetty" % "jetty-xml" % JETTY_VERSION % "compile" //Eclipse license
|
||||
lazy val jetty_servlet = "org.eclipse.jetty" % "jetty-servlet" % JETTY_VERSION % "compile" //Eclipse license
|
||||
|
||||
lazy val jetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "compile"
|
||||
lazy val jetty_util = "org.eclipse.jetty" % "jetty-util" % JETTY_VERSION % "compile"
|
||||
lazy val jetty_xml = "org.eclipse.jetty" % "jetty-xml" % JETTY_VERSION % "compile"
|
||||
lazy val jetty_servlet = "org.eclipse.jetty" % "jetty-servlet" % JETTY_VERSION % "compile"
|
||||
lazy val uuid = "com.eaio" % "uuid" % "3.2" % "compile" //MIT license
|
||||
|
||||
lazy val uuid = "com.eaio" % "uuid" % "3.2" % "compile"
|
||||
lazy val guicey = "org.guiceyfruit" % "guice-all" % "2.0" % "compile" //ApacheV2
|
||||
|
||||
lazy val guicey = "org.guiceyfruit" % "guice-all" % "2.0" % "compile"
|
||||
lazy val h2_lzf = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile" //ApacheV2
|
||||
|
||||
lazy val h2_lzf = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile"
|
||||
lazy val hawtdispatch = "org.fusesource.hawtdispatch" % "hawtdispatch-scala" % HAWT_DISPATCH_VERSION % "compile" //ApacheV2
|
||||
|
||||
lazy val hawtdispatch = "org.fusesource.hawtdispatch" % "hawtdispatch-scala" % HAWT_DISPATCH_VERSION % "compile"
|
||||
lazy val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % JACKSON_VERSION % "compile" //ApacheV2
|
||||
lazy val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % JACKSON_VERSION % "compile" //ApacheV2
|
||||
|
||||
lazy val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % JACKSON_VERSION % "compile"
|
||||
lazy val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % JACKSON_VERSION % "compile"
|
||||
lazy val jersey = "com.sun.jersey" % "jersey-core" % JERSEY_VERSION % "compile" //CDDL v1
|
||||
lazy val jersey_json = "com.sun.jersey" % "jersey-json" % JERSEY_VERSION % "compile" //CDDL v1
|
||||
lazy val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" //CDDL v1
|
||||
lazy val jersey_contrib = "com.sun.jersey.contribs" % "jersey-scala" % JERSEY_VERSION % "compile" //CDDL v1
|
||||
|
||||
lazy val jersey = "com.sun.jersey" % "jersey-core" % JERSEY_VERSION % "compile"
|
||||
lazy val jersey_json = "com.sun.jersey" % "jersey-json" % JERSEY_VERSION % "compile"
|
||||
lazy val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile"
|
||||
lazy val jersey_contrib = "com.sun.jersey.contribs" % "jersey-scala" % JERSEY_VERSION % "compile"
|
||||
lazy val jgroups = "jgroups" % "jgroups" % "2.9.0.GA" % "compile" //LGPL 2.1
|
||||
|
||||
lazy val jgroups = "jgroups" % "jgroups" % "2.9.0.GA" % "compile"
|
||||
lazy val jsr166x = "jsr166x" % "jsr166x" % "1.0" % "compile" //CC Public Domain
|
||||
|
||||
lazy val jsr166x = "jsr166x" % "jsr166x" % "1.0" % "compile"
|
||||
lazy val jsr250 = "javax.annotation" % "jsr250-api" % "1.0" % "compile" //CDDL v1
|
||||
|
||||
lazy val jsr250 = "javax.annotation" % "jsr250-api" % "1.0" % "compile"
|
||||
lazy val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" //CDDL v1
|
||||
|
||||
lazy val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile"
|
||||
lazy val jta_1_1 = "org.apache.geronimo.specs" % "geronimo-jta_1.1_spec" % "1.1.1" % "compile" intransitive //ApacheV2
|
||||
|
||||
lazy val jta_1_1 = "org.apache.geronimo.specs" % "geronimo-jta_1.1_spec" % "1.1.1" % "compile" intransitive
|
||||
lazy val mongo = "org.mongodb" % "mongo-java-driver" % "2.0" % "compile" //ApacheV2
|
||||
|
||||
lazy val mongo = "org.mongodb" % "mongo-java-driver" % "2.0" % "compile"
|
||||
lazy val casbah = "com.novus" % "casbah_2.8.0" % "1.0.8.5" % "compile" //ApacheV2
|
||||
|
||||
lazy val casbah = "com.novus" % "casbah_2.8.0" % "1.0.8.5" % "compile"
|
||||
lazy val multiverse = "org.multiverse" % "multiverse-alpha" % MULTIVERSE_VERSION % "compile" intransitive //ApacheV2
|
||||
|
||||
lazy val multiverse = "org.multiverse" % "multiverse-alpha" % MULTIVERSE_VERSION % "compile" intransitive
|
||||
lazy val netty = "org.jboss.netty" % "netty" % "3.2.3.Final" % "compile" //ApacheV2
|
||||
|
||||
lazy val netty = "org.jboss.netty" % "netty" % "3.2.3.Final" % "compile"
|
||||
lazy val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0" % "compile" //New BSD
|
||||
|
||||
lazy val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0" % "compile"
|
||||
lazy val osgi_core = "org.osgi" % "org.osgi.core" % "4.2.0" //ApacheV2
|
||||
|
||||
lazy val osgi_core = "org.osgi" % "org.osgi.core" % "4.2.0"
|
||||
lazy val rabbit = "com.rabbitmq" % "amqp-client" % "1.8.1" % "compile" //Mozilla public license
|
||||
|
||||
lazy val rabbit = "com.rabbitmq" % "amqp-client" % "1.8.1" % "compile"
|
||||
lazy val redis = "com.redis" % "redisclient" % "2.8.0-2.0.3" % "compile" //ApacheV2
|
||||
|
||||
lazy val redis = "com.redis" % "redisclient" % "2.8.0-2.0.3" % "compile"
|
||||
lazy val sbinary = "sbinary" % "sbinary" % "2.8.0-0.3.1" % "compile" //MIT
|
||||
|
||||
lazy val sbinary = "sbinary" % "sbinary" % "2.8.0-0.3.1" % "compile"
|
||||
lazy val sjson = "sjson.json" % "sjson" % "0.8-2.8.0" % "compile" //ApacheV2
|
||||
lazy val sjson_test = "sjson.json" % "sjson" % "0.8-2.8.0" % "test" //ApacheV2
|
||||
|
||||
lazy val sjson = "sjson.json" % "sjson" % "0.8-2.8.0" % "compile"
|
||||
lazy val sjson_test = "sjson.json" % "sjson" % "0.8-2.8.0" % "test"
|
||||
lazy val slf4j = "org.slf4j" % "slf4j-api" % SLF4J_VERSION % "compile" //MIT
|
||||
|
||||
lazy val slf4j = "org.slf4j" % "slf4j-api" % SLF4J_VERSION % "compile"
|
||||
lazy val logback = "ch.qos.logback" % "logback-classic" % LOGBACK_VERSION % "compile" //LGPL 2.1
|
||||
lazy val logback_core = "ch.qos.logback" % "logback-core" % LOGBACK_VERSION % "compile" //LGPL 2.1
|
||||
|
||||
lazy val logback = "ch.qos.logback" % "logback-classic" % LOGBACK_VERSION % "compile"
|
||||
lazy val logback_core = "ch.qos.logback" % "logback-core" % LOGBACK_VERSION % "compile"
|
||||
lazy val spring_beans = "org.springframework" % "spring-beans" % SPRING_VERSION % "compile" //ApacheV2
|
||||
lazy val spring_context = "org.springframework" % "spring-context" % SPRING_VERSION % "compile" //ApacheV2
|
||||
|
||||
lazy val spring_beans = "org.springframework" % "spring-beans" % SPRING_VERSION % "compile"
|
||||
lazy val spring_context = "org.springframework" % "spring-context" % SPRING_VERSION % "compile"
|
||||
lazy val stax_api = "javax.xml.stream" % "stax-api" % "1.0-2" % "compile" //ApacheV2
|
||||
|
||||
lazy val stax_api = "javax.xml.stream" % "stax-api" % "1.0-2" % "compile"
|
||||
lazy val thrift = "com.facebook" % "thrift" % "r917130" % "compile" //ApacheV2
|
||||
|
||||
lazy val thrift = "com.facebook" % "thrift" % "r917130" % "compile"
|
||||
lazy val voldemort = "voldemort" % "voldemort" % "0.81" % "compile" //ApacheV2
|
||||
lazy val voldemort_contrib = "voldemort" % "voldemort-contrib" % "0.81" % "compile" //ApacheV2
|
||||
lazy val voldemort_needs_log4j = "org.slf4j" % "log4j-over-slf4j" % SLF4J_VERSION % "compile" //MIT
|
||||
|
||||
lazy val voldemort = "voldemort" % "voldemort" % "0.81" % "compile"
|
||||
lazy val voldemort_contrib = "voldemort" % "voldemort-contrib" % "0.81" % "compile"
|
||||
lazy val voldemort_needs_log4j = "org.slf4j" % "log4j-over-slf4j" % SLF4J_VERSION % "compile"
|
||||
lazy val werkz = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % ASPECTWERKZ_VERSION % "compile" //LGPL 2.1
|
||||
lazy val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % ASPECTWERKZ_VERSION % "compile" //LGPL 2.1
|
||||
|
||||
lazy val werkz = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % ASPECTWERKZ_VERSION % "compile"
|
||||
lazy val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % ASPECTWERKZ_VERSION % "compile"
|
||||
lazy val zookeeper = "org.apache.hadoop.zookeeper" % "zookeeper" % "3.2.2" % "compile" //ApacheV2
|
||||
|
||||
lazy val zookeeper = "org.apache.hadoop.zookeeper" % "zookeeper" % "3.2.2" % "compile"
|
||||
lazy val hadoop_core = "org.apache.hadoop" % "hadoop-core" % "0.20.2" % "compile" //ApacheV2
|
||||
|
||||
lazy val hadoop_core = "org.apache.hadoop" % "hadoop-core" % "0.20.2" % "compile"
|
||||
lazy val hbase_core = "org.apache.hbase" % "hbase-core" % "0.20.6" % "compile" //ApacheV2
|
||||
|
||||
lazy val hbase_core = "org.apache.hbase" % "hbase-core" % "0.20.6" % "compile"
|
||||
|
||||
lazy val google_coll = "com.google.collections" % "google-collections" % "1.0" % "compile"
|
||||
lazy val google_coll = "com.google.collections" % "google-collections" % "1.0" % "compile" //ApacheV2
|
||||
|
||||
//Riak PB Client
|
||||
lazy val riak_pb_client = "com.trifork" % "riak-java-pb-client" % "1.0-for-akka-by-ticktock" % "compile"
|
||||
lazy val riak_pb_client = "com.trifork" % "riak-java-pb-client" % "1.0-for-akka-by-ticktock" % "compile" //ApacheV2
|
||||
|
||||
// Test
|
||||
|
||||
lazy val camel_spring = "org.apache.camel" % "camel-spring" % CAMEL_VERSION % "test"
|
||||
lazy val cassandra_clhm = "org.apache.cassandra" % "clhm-production" % CASSANDRA_VERSION % "test"
|
||||
lazy val commons_coll = "commons-collections" % "commons-collections" % "3.2.1" % "test"
|
||||
lazy val camel_spring = "org.apache.camel" % "camel-spring" % CAMEL_VERSION % "test" //ApacheV2
|
||||
lazy val cassandra_clhm = "org.apache.cassandra" % "clhm-production" % CASSANDRA_VERSION % "test" //ApacheV2
|
||||
lazy val commons_coll = "commons-collections" % "commons-collections" % "3.2.1" % "test" //ApacheV2
|
||||
|
||||
lazy val high_scale = "org.apache.cassandra" % "high-scale-lib" % CASSANDRA_VERSION % "test"
|
||||
lazy val testJetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "test"
|
||||
lazy val testJettyWebApp= "org.eclipse.jetty" % "jetty-webapp" % JETTY_VERSION % "test"
|
||||
lazy val high_scale = "org.apache.cassandra" % "high-scale-lib" % CASSANDRA_VERSION % "test" //ApacheV2
|
||||
lazy val testJetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "test" //Eclipse license
|
||||
lazy val testJettyWebApp= "org.eclipse.jetty" % "jetty-webapp" % JETTY_VERSION % "test" //Eclipse license
|
||||
|
||||
lazy val junit = "junit" % "junit" % "4.5" % "test"
|
||||
lazy val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test"
|
||||
lazy val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test"
|
||||
lazy val specs = "org.scala-tools.testing" %% "specs" % "1.6.5" % "test"
|
||||
lazy val junit = "junit" % "junit" % "4.5" % "test" //Common Public License 1.0
|
||||
lazy val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" //MIT
|
||||
lazy val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test" //ApacheV2
|
||||
lazy val specs = "org.scala-tools.testing" %% "specs" % "1.6.5" % "test" //MIT
|
||||
|
||||
//HBase testing
|
||||
lazy val hadoop_test = "org.apache.hadoop" % "hadoop-test" % "0.20.2" % "test"
|
||||
lazy val hbase_test = "org.apache.hbase" % "hbase-test" % "0.20.6" % "test"
|
||||
lazy val log4j = "log4j" % "log4j" % "1.2.15" % "test"
|
||||
lazy val jetty_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test"
|
||||
lazy val hadoop_test = "org.apache.hadoop" % "hadoop-test" % "0.20.2" % "test" //ApacheV2
|
||||
lazy val hbase_test = "org.apache.hbase" % "hbase-test" % "0.20.6" % "test" //ApacheV2
|
||||
lazy val log4j = "log4j" % "log4j" % "1.2.15" % "test" //ApacheV2
|
||||
lazy val jetty_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test" //Eclipse license
|
||||
|
||||
//voldemort testing
|
||||
lazy val jdom = "org.jdom" % "jdom" % "1.1" % "test"
|
||||
lazy val vold_jetty = "org.mortbay.jetty" % "jetty" % "6.1.18" % "test"
|
||||
lazy val velocity = "org.apache.velocity" % "velocity" % "1.6.2" % "test"
|
||||
lazy val dbcp = "commons-dbcp" % "commons-dbcp" % "1.2.2" % "test"
|
||||
lazy val jdom = "org.jdom" % "jdom" % "1.1" % "test" //JDOM license: ApacheV2 - acknowledgement
|
||||
lazy val vold_jetty = "org.mortbay.jetty" % "jetty" % "6.1.18" % "test" //ApacheV2
|
||||
lazy val velocity = "org.apache.velocity" % "velocity" % "1.6.2" % "test" //ApacheV2
|
||||
lazy val dbcp = "commons-dbcp" % "commons-dbcp" % "1.2.2" % "test" //ApacheV2
|
||||
|
||||
//memcached
|
||||
lazy val spymemcached = "spy" % "memcached" % "2.5" % "compile"
|
||||
|
|
@ -316,8 +314,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
|
||||
|
||||
|
|
@ -399,7 +397,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"
|
||||
|
|
@ -491,7 +489,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
// -------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
class AkkaHttpProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
|
||||
val annotation = Dependencies.annotation
|
||||
val jsr250 = Dependencies.jsr250
|
||||
val atmo = Dependencies.atmo
|
||||
val atmo_jbossweb = Dependencies.atmo_jbossweb
|
||||
val atmo_jersey = Dependencies.atmo_jersey
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue