Merge branch 'master' of git-proxy:jboner/akka into rpc_amqp
Conflicts: akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala
This commit is contained in:
momania
commit
a97077aab7
37 changed files with 756 additions and 1083 deletions
|
|
@ -66,12 +66,12 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
// lazy val hawtdispatchModuleConfig = ModuleConfiguration("org.fusesource.hawtdispatch", FusesourceSnapshotRepo)
|
||||
lazy val jbossModuleConfig = ModuleConfiguration("org.jboss", JBossRepo)
|
||||
lazy val jdmkModuleConfig = ModuleConfiguration("com.sun.jdmk", SunJDMKRepo)
|
||||
lazy val jmsModuleConfig = ModuleConfiguration("javax.jms", SunJDMKRepo)
|
||||
lazy val jmxModuleConfig = ModuleConfiguration("com.sun.jmx", SunJDMKRepo)
|
||||
lazy val jerseyContrModuleConfig = ModuleConfiguration("com.sun.jersey.contribs", JavaNetRepo)
|
||||
lazy val jerseyModuleConfig = ModuleConfiguration("com.sun.jersey", JavaNetRepo)
|
||||
lazy val jgroupsModuleConfig = ModuleConfiguration("jgroups", JBossRepo)
|
||||
lazy val jmsModuleConfig = ModuleConfiguration("javax.jms", SunJDMKRepo)
|
||||
lazy val jmxModuleConfig = ModuleConfiguration("com.sun.jmx", SunJDMKRepo)
|
||||
lazy val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots)
|
||||
lazy val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsReleases)
|
||||
lazy val multiverseModuleConfig = ModuleConfiguration("org.multiverse", CodehausSnapshotRepo)
|
||||
lazy val nettyModuleConfig = ModuleConfiguration("org.jboss.netty", JBossRepo)
|
||||
lazy val scalaTestModuleConfig = ModuleConfiguration("org.scalatest", ScalaToolsSnapshots)
|
||||
|
|
@ -81,14 +81,14 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
// Versions
|
||||
// -------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
lazy val ATMO_VERSION = "0.6"
|
||||
lazy val ATMO_VERSION = "0.6.1"
|
||||
lazy val CAMEL_VERSION = "2.4.0"
|
||||
lazy val CASSANDRA_VERSION = "0.6.1"
|
||||
lazy val DispatchVersion = "0.7.4"
|
||||
lazy val HAWTDISPATCH_VERSION = "1.0"
|
||||
lazy val JacksonVersion = "1.2.1"
|
||||
lazy val JERSEY_VERSION = "1.2"
|
||||
lazy val LIFT_VERSION = "2.0-scala280-SNAPSHOT"
|
||||
lazy val LIFT_VERSION = "2.1-M1"
|
||||
lazy val MULTIVERSE_VERSION = "0.6-SNAPSHOT"
|
||||
lazy val SCALATEST_VERSION = "1.2-for-scala-2.8.0.final-SNAPSHOT"
|
||||
lazy val Slf4jVersion = "1.6.0"
|
||||
|
|
@ -162,8 +162,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
|
||||
lazy val jta_1_1 = "org.apache.geronimo.specs" % "geronimo-jta_1.1_spec" % "1.1.1" % "compile" intransitive
|
||||
|
||||
lazy val lift_util = "net.liftweb" % "lift-util" % LIFT_VERSION % "compile"
|
||||
lazy val lift_webkit = "net.liftweb" % "lift-webkit" % LIFT_VERSION % "compile"
|
||||
lazy val lift_util = "net.liftweb" % "lift-util_2.8.0" % LIFT_VERSION % "compile"
|
||||
lazy val lift_webkit = "net.liftweb" % "lift-webkit_2.8.0" % LIFT_VERSION % "compile"
|
||||
|
||||
lazy val log4j = "log4j" % "log4j" % "1.2.15" % "compile"
|
||||
|
||||
|
|
@ -266,7 +266,12 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
)
|
||||
|
||||
// Exclude slf4j1.5.11 from the classpath, it's conflicting...
|
||||
override def runClasspath = super.runClasspath --- (super.runClasspath ** "slf4j*1.5.11.jar")
|
||||
override def runClasspath = super.runClasspath +++
|
||||
descendents(info.projectPath / "config", "*") ---
|
||||
(super.runClasspath ** "slf4j*1.5.11.jar")
|
||||
|
||||
override def mainResources = super.mainResources +++
|
||||
descendents(info.projectPath / "config", "*")
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// publishing
|
||||
|
|
@ -343,6 +348,9 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
val sjson = Dependencies.sjson
|
||||
val werkz = Dependencies.werkz
|
||||
val werkz_core = Dependencies.werkz_core
|
||||
val slf4j = Dependencies.slf4j
|
||||
val slf4j_log4j = Dependencies.slf4j_log4j
|
||||
val log4j = Dependencies.log4j
|
||||
|
||||
// testing
|
||||
val junit = Dependencies.junit
|
||||
|
|
@ -421,7 +429,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
// -------------------------------------------------------------------------------------------------------------------
|
||||
// akka-persistence-common subproject
|
||||
// -------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
class AkkaPersistenceCommonProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
|
||||
val commons_pool = Dependencies.commons_pool
|
||||
val thrift = Dependencies.thrift
|
||||
|
|
@ -454,9 +462,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
|
||||
class AkkaCassandraProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
|
||||
val cassandra = Dependencies.cassandra
|
||||
val log4j = Dependencies.log4j
|
||||
val slf4j = Dependencies.slf4j
|
||||
val slf4j_log4j = Dependencies.slf4j_log4j
|
||||
|
||||
// testing
|
||||
val cassandra_clhm = Dependencies.cassandra_clhm
|
||||
|
|
@ -624,6 +629,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
val junit = Dependencies.junit
|
||||
|
||||
def deployPath = AkkaParentProject.this.deployPath
|
||||
override def jarPath = warPath
|
||||
}
|
||||
|
||||
class AkkaSampleRestJavaProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin
|
||||
|
|
@ -635,6 +641,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
}
|
||||
|
||||
class AkkaSampleCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin {
|
||||
//Must be like this to be able to exclude the geronimo-servlet_2.4_spec which is a too old Servlet spec
|
||||
override def ivyXML =
|
||||
<dependencies>
|
||||
<dependency org="org.springframework" name="spring-jms" rev={SPRING_VERSION}>
|
||||
|
|
@ -702,7 +709,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
((outputPath ##) / defaultJarName) +++
|
||||
mainResources +++
|
||||
mainDependencies.scalaJars +++
|
||||
descendents(info.projectPath, "*.conf") +++
|
||||
descendents(info.projectPath / "scripts", "run_akka.sh") +++
|
||||
descendents(info.projectPath / "dist", "*.jar") +++
|
||||
descendents(info.projectPath / "deploy", "*.jar") +++
|
||||
|
|
@ -718,28 +724,28 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
|
|||
|
||||
// ------------------------------------------------------------
|
||||
class AkkaDefaultProject(info: ProjectInfo, val deployPath: Path) extends DefaultProject(info) with DeployProject with OSGiProject
|
||||
}
|
||||
|
||||
trait DeployProject { self: Project =>
|
||||
// defines where the deployTask copies jars to
|
||||
def deployPath: Path
|
||||
trait DeployProject { self: BasicScalaProject =>
|
||||
// defines where the deployTask copies jars to
|
||||
def deployPath: Path
|
||||
|
||||
lazy val dist = distAction
|
||||
def distAction = deployTask(jarPath, packageDocsJar, packageSrcJar, deployPath, true, true, true) dependsOn(
|
||||
`package`, packageDocs, packageSrc) describedAs("Deploying")
|
||||
def deployTask(jar: Path, docs: Path, src: Path, toDir: Path,
|
||||
genJar: Boolean, genDocs: Boolean, genSource: Boolean) = task {
|
||||
gen(jar, toDir, genJar, "Deploying bits") orElse
|
||||
gen(docs, toDir, genDocs, "Deploying docs") orElse
|
||||
gen(src, toDir, genSource, "Deploying sources")
|
||||
}
|
||||
private def gen(jar: Path, toDir: Path, flag: Boolean, msg: String): Option[String] =
|
||||
if (flag) {
|
||||
log.info(msg + " " + jar)
|
||||
FileUtilities.copyFile(jar, toDir / jar.name, log)
|
||||
} else None
|
||||
}
|
||||
lazy val dist = deployTask(jarPath, packageDocsJar, packageSrcJar, deployPath, true, true, true) dependsOn(
|
||||
`package`, packageDocs, packageSrc) describedAs("Deploying")
|
||||
def deployTask(jar: Path, docs: Path, src: Path, toDir: Path,
|
||||
genJar: Boolean, genDocs: Boolean, genSource: Boolean) = task {
|
||||
def gen(jar: Path, toDir: Path, flag: Boolean, msg: String): Option[String] =
|
||||
if (flag) {
|
||||
log.info(msg + " " + jar)
|
||||
FileUtilities.copyFile(jar, toDir / jar.name, log)
|
||||
} else None
|
||||
|
||||
trait OSGiProject extends DefaultProject with BNDPlugin {
|
||||
override def bndExportPackage = Seq("se.scalablesolutions.akka.*;version=%s".format(projectVersion.value))
|
||||
gen(jar, toDir, genJar, "Deploying bits") orElse
|
||||
gen(docs, toDir, genDocs, "Deploying docs") orElse
|
||||
gen(src, toDir, genSource, "Deploying sources")
|
||||
}
|
||||
}
|
||||
|
||||
trait OSGiProject extends BNDPlugin { self: DefaultProject =>
|
||||
override def bndExportPackage = Seq("se.scalablesolutions.akka.*;version=%s".format(projectVersion.value))
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue