From 4aabc07be27ade6c746771da3b1eeb4b5f0e4993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Fri, 5 Mar 2010 09:17:15 +0100 Subject: [PATCH] cleaned up buildfile --- project/build/AkkaProject.scala | 166 ++++++++++++++++---------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index b865af998a..f3ef2987de 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -1,7 +1,7 @@ import sbt._ class AkkaParent(info: ProjectInfo) extends ParentProject(info) { - //repos + // repos val sunjdmk = "sunjdmk" at "http://wp5.e-taxonomy.eu/cdmlib/mavenrepo" val databinder = "DataBinder" at "http://databinder.net/repo" val configgy = "Configgy" at "http://www.lag.net/repo" @@ -12,57 +12,58 @@ class AkkaParent(info: ProjectInfo) extends ParentProject(info) { val google = "google" at "http://google-maven-repository.googlecode.com/svn/repository" val m2 = "m2" at "http://download.java.net/maven/2" - //project versions - val JERSEYVERSION = "1.1.5" - val ATMOVERSION = "0.6-SNAPSHOT" - val CASSANDRAVERSION = "0.5.0" + // project versions + val JERSEY_VERSION = "1.1.5" + val ATMO_VERSION = "0.6-SNAPSHOT" + val CASSANDRA_VERSION = "0.5.0" - //project defintions - lazy val javautil = project("akka-util-java", "akka-java-util", new AkkaJavaUtilProject(_)) - lazy val util = project("akka-util", "akka-util",new AkkaUtilProject(_)) - lazy val core = project("akka-core", "akka-core", new AkkaCoreProject(_), util, javautil) - lazy val amqp = project("akka-amqp", "akka-amqp", new AkkaAMQPProject(_), core) - lazy val rest = project("akka-rest", "akka-rest", new AkkaRestProject(_), core) - lazy val comet = project("akka-comet", "akka-comet",new AkkaCometProject(_), rest) - lazy val patterns = project("akka-patterns", "akka-patterns", new AkkaPatternsProject(_), core) - lazy val security = project("akka-security", "akka-security", new AkkaSecurityProject(_), core) - lazy val persistence = project("akka-persistence", "akka-persistence", new AkkaPersistenceParentProject(_)) - lazy val cluster = project("akka-cluster", "akka-cluster", new AkkaClusterParentProject(_)) - lazy val kernel = project("akka-kernel","akka-kernel", new AkkaKernelProject(_),core,rest,persistence,cluster,amqp,security,comet) - //examples - lazy val funtest = project("akka-fun-test-java","akka-fun-test-java", new AkkaFunTestProject(_),kernel) - lazy val samples = project("akka-samples","akka-samples", new AkkaSamplesParentProject(_)) + // project defintions + lazy val akka_java_util = project("akka-util-java", "akka-java-util", new AkkaJavaUtilProject(_)) + lazy val akka_util = project("akka-util", "akka-util",new AkkaUtilProject(_)) + lazy val akka_core = project("akka-core", "akka-core", new AkkaCoreProject(_), akka_util, akka_java_util) + lazy val akka_amqp = project("akka-amqp", "akka-amqp", new AkkaAMQPProject(_), akka_core) + lazy val akka_rest = project("akka-rest", "akka-rest", new AkkaRestProject(_), akka_core) + lazy val akka_comet = project("akka-comet", "akka-comet",new AkkaCometProject(_), akka_rest) + lazy val akka_patterns = project("akka-patterns", "akka-patterns", new AkkaPatternsProject(_), akka_core) + lazy val akka_security = project("akka-security", "akka-security", new AkkaSecurityProject(_), akka_core) + lazy val akka_persistence = project("akka-persistence", "akka-persistence", new AkkaPersistenceParentProject(_)) + lazy val akka_cluster = project("akka-cluster", "akka-cluster", new AkkaClusterParentProject(_)) + lazy val akka_kernel = project("akka-kernel","akka-kernel", new AkkaKernelProject(_),akka_core,akka_rest,akka_persistence,akka_cluster,akka_amqp,akka_security,akka_comet) + + // examples + lazy val akka_fun_test = project("akka-fun-test-java","akka-fun-test-java", new AkkaFunTestProject(_),akka_kernel) + lazy val akka_samples = project("akka-samples","akka-samples", new AkkaSamplesParentProject(_)) // subprojects class AkkaCoreProject(info: ProjectInfo) extends DefaultProject(info) { val sjson = "sjson.json" % "sjson" % "0.4" % "compile" - val aspec = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % "2.1" % "compile" - val apsec_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % "2.1" % "compile" - val commonsio = "commons-io" % "commons-io" % "1.4" % "compile" - val netdatabinder = "net.databinder" % "dispatch-json_2.7.7" % "0.6.4" % "compile" - val netdatabinderhttp = "net.databinder" % "dispatch-http_2.7.7" % "0.6.4" % "compile" + val werkz = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % "2.1" % "compile" + val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % "2.1" % "compile" + val commons_io = "commons-io" % "commons-io" % "1.4" % "compile" + val dispatch_json = "net.databinder" % "dispatch-json_2.7.7" % "0.6.4" % "compile" + val dispatch_http = "net.databinder" % "dispatch-http_2.7.7" % "0.6.4" % "compile" val sbinary = "sbinary" % "sbinary" % "0.3" % "compile" - val jack = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.2.1" % "compile" - val jackcore = "org.codehaus.jackson" % "jackson-core-asl" % "1.2.1" % "compile" - val volde = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile" - val scalajavautil = "org.scala-tools" % "javautils" % "2.7.4-0.1" % "compile" + val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.2.1" % "compile" + val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % "1.2.1" % "compile" + val voldemort = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile" + val javautils = "org.scala-tools" % "javautils" % "2.7.4-0.1" % "compile" val netty = "org.jboss.netty" % "netty" % "3.2.0.ALPHA3" % "compile" - //testing + // testing val scalatest= "org.scalatest" % "scalatest" % "1.0" % "test" val junit = "junit" % "junit" % "4.5" % "test" } class AkkaUtilProject(info: ProjectInfo) extends DefaultProject(info) { - val aspec = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % "2.1" % "compile" - val apsec_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % "2.1" % "compile" + val werkz = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % "2.1" % "compile" + val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % "2.1" % "compile" val configgy = "net.lag" % "configgy" % "1.4.7" % "compile" } class AkkaJavaUtilProject(info: ProjectInfo) extends DefaultProject(info) { val guicey = "org.guiceyfruit" % "guice-core" % "2.0-beta-4" % "compile" - val proto = "com.google.protobuf" % "protobuf-java" % "2.2.0" % "compile" - val multi = "org.multiverse" % "multiverse-alpha" % "0.3" % "compile" + val protobuf = "com.google.protobuf" % "protobuf-java" % "2.2.0" % "compile" + val multiverse = "org.multiverse" % "multiverse-alpha" % "0.3" % "compile" } class AkkaAMQPProject(info:ProjectInfo) extends DefaultProject(info) { @@ -71,43 +72,43 @@ class AkkaParent(info: ProjectInfo) extends ParentProject(info) { class AkkaRestProject(info:ProjectInfo) extends DefaultProject(info) { val servlet = "javax.servlet" % "servlet-api" % "2.5" % "provided" - val jersey = "com.sun.jersey" % "jersey-core" % JERSEYVERSION % "compile" - val jerseyserver = "com.sun.jersey" % "jersey-server" % JERSEYVERSION % "compile" - val jerseyjson = "com.sun.jersey" % "jersey-json" % JERSEYVERSION % "compile" - val jerseycontrib = "com.sun.jersey.contribs" % "jersey-scala" % JERSEYVERSION % "compile" - val jsr = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" + val jersey = "com.sun.jersey" % "jersey-core" % JERSEY_VERSION % "compile" + val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" + val jersey_json = "com.sun.jersey" % "jersey-json" % JERSEY_VERSION % "compile" + val jersey_contrib = "com.sun.jersey.contribs" % "jersey-scala" % JERSEY_VERSION % "compile" + val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" } class AkkaCometProject(info:ProjectInfo) extends DefaultProject(info) { val grizzly = "com.sun.grizzly" % "grizzly-comet-webserver" % "1.9.18-i" % "compile" val servlet = "javax.servlet" % "servlet-api" % "2.5" % "provided" - val atmo = "org.atmosphere" % "atmosphere-annotations" % ATMOVERSION % "compile" - val atmojersey = "org.atmosphere" % "atmosphere-jersey" % ATMOVERSION % "compile" - val atmoruntime = "org.atmosphere" % "atmosphere-runtime" % ATMOVERSION % "compile" + val atmo = "org.atmosphere" % "atmosphere-annotations" % ATMO_VERSION % "compile" + val atmo_jersey = "org.atmosphere" % "atmosphere-jersey" % ATMO_VERSION % "compile" + val atmo_runtime = "org.atmosphere" % "atmosphere-runtime" % ATMO_VERSION % "compile" } class AkkaPatternsProject(info:ProjectInfo) extends DefaultProject(info) { - //testing + // testing val scalatest= "org.scalatest" % "scalatest" % "1.0" % "test" val junit = "junit" % "junit" % "4.5" % "test" } class AkkaSecurityProject(info:ProjectInfo) extends DefaultProject(info) { val annotation = "javax.annotation" % "jsr250-api" % "1.0" - val jerseyserver = "com.sun.jersey" % "jersey-server" % JERSEYVERSION % "compile" - val jsr = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" - val liftutil = "net.liftweb" % "lift-util" % "1.1-M6" % "compile" - //testing + val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" + val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" + val lift_util = "net.liftweb" % "lift-util" % "1.1-M6" % "compile" + // testing val scalatest= "org.scalatest" % "scalatest" % "1.0" % "test" val junit = "junit" % "junit" % "4.5" % "test" val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" } - class AkkaPersistenceCommonProject(info:ProjectInfo) extends DefaultProject(info) { - val facebook = "com.facebook" % "thrift" % "1.0" % "compile" - val commonspool = "commons-pool" % "commons-pool" % "1.5.1" % "compile" + val thrift = "com.facebook" % "thrift" % "1.0" % "compile" + val commons_pool = "commons-pool" % "commons-pool" % "1.5.1" % "compile" } + class AkkaRedisProject(info:ProjectInfo) extends DefaultProject(info) { val redis = "com.redis" % "redisclient" % "1.1" % "compile" } @@ -117,22 +118,21 @@ class AkkaParent(info: ProjectInfo) extends ParentProject(info) { } class AkkaCassandraProject(info:ProjectInfo) extends DefaultProject(info) { - val cassandra = "org.apache.cassandra" % "cassandra" % CASSANDRAVERSION % "compile" - val cassandralib = "org.apache.cassandra" % "high-scale-lib" % CASSANDRAVERSION % "test" - val cassandraclhm = "org.apache.cassandra" % "clhm-production" % CASSANDRAVERSION % "test" - val commonscoll = "commons-collections" % "commons-collections" % "3.2.1" % "test" - val googlecoll = "com.google.collections" % "google-collections" % "1.0" % "test" + val cassandra = "org.apache.cassandra" % "cassandra" % CASSANDRA_VERSION % "compile" + val high_scale = "org.apache.cassandra" % "high-scale-lib" % CASSANDRA_VERSION % "test" + val cassandra_clhm = "org.apache.cassandra" % "clhm-production" % CASSANDRA_VERSION % "test" + val commons_coll = "commons-collections" % "commons-collections" % "3.2.1" % "test" + val google_coll = "com.google.collections" % "google-collections" % "1.0" % "test" val slf4j = "org.slf4j" % "slf4j-api" % "1.5.8" % "test" - val slf4jlog4j = "org.slf4j" % "slf4j-log4j12" % "1.5.8" % "test" - + val slf4j_log4j = "org.slf4j" % "slf4j-log4j12" % "1.5.8" % "test" val log4j = "log4j" % "log4j" % "1.2.15" % "test" } class AkkaPersistenceParentProject(info:ProjectInfo) extends ParentProject(info) { - lazy val akkapersistencecommon = project ("akka-persistence-common", "akka-persistence-common", new AkkaPersistenceCommonProject(_),core) - lazy val redis = project("akka-persistence-redis","akka-persistence-redis", new AkkaRedisProject(_),akkapersistencecommon) - lazy val mongo = project("akka-persistence-mongo","akka-persistence-mongo", new AkkaMongoProject(_),akkapersistencecommon) - lazy val cassandra = project("akka-persistence-cassandra","akka-persistence-cassandra", new AkkaCassandraProject(_),akkapersistencecommon) + lazy val akka_persistence_common = project ("akka-persistence-common", "akka-persistence-common", new AkkaPersistenceCommonProject(_),akka_core) + lazy val akka_persistence_redis = project("akka-persistence-redis","akka-persistence-redis", new AkkaRedisProject(_),akka_persistence_common) + lazy val akka_persistence_mongo = project("akka-persistence-mongo","akka-persistence-mongo", new AkkaMongoProject(_),akka_persistence_common) + lazy val akka_persistence_cassandra = project("akka-persistence-cassandra","akka-persistence-cassandra", new AkkaCassandraProject(_),akka_persistence_common) } @@ -142,29 +142,29 @@ class AkkaParent(info: ProjectInfo) extends ParentProject(info) { class AkkaShoalProject(info:ProjectInfo) extends DefaultProject(info) { val shoal = "shoal-jxta" % "shoal" % "1.1-20090818" % "compile" - val shoalextra = "shoal-jxta" % "jxta" % "1.1-20090818" % "compile" + val shoal_extra = "shoal-jxta" % "jxta" % "1.1-20090818" % "compile" } class AkkaClusterParentProject(info:ProjectInfo) extends ParentProject(info) { - lazy val jgroups = project("akka-cluster-jgroups","akka-cluster-jgroups", new AkkaJgroupsProject(_),core) - lazy val shoal = project("akka-cluster-shoal","akka-cluster-shoal", new AkkaShoalProject(_),core) + lazy val akka_cluster_jgroups = project("akka-cluster-jgroups","akka-cluster-jgroups", new AkkaJgroupsProject(_),akka_core) + lazy val akka_cluster_shoal = project("akka-cluster-shoal","akka-cluster-shoal", new AkkaShoalProject(_),akka_core) } class AkkaKernelProject(info:ProjectInfo) extends DefaultProject(info) { - val jerseyserver = "com.sun.jersey" % "jersey-server" % JERSEYVERSION % "compile" - val atmo = "org.atmosphere" % "atmosphere-annotations" % ATMOVERSION % "compile" - val atmojersey = "org.atmosphere" % "atmosphere-jersey" % ATMOVERSION % "compile" - val atmoruntime = "org.atmosphere" % "atmosphere-runtime" % ATMOVERSION % "compile" + val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" + val atmo = "org.atmosphere" % "atmosphere-annotations" % ATMO_VERSION % "compile" + val atmo_jersey = "org.atmosphere" % "atmosphere-jersey" % ATMO_VERSION % "compile" + val atmo_runtime = "org.atmosphere" % "atmosphere-runtime" % ATMO_VERSION % "compile" } - //examples + // examples class AkkaFunTestProject(info:ProjectInfo) extends DefaultProject(info) { val protobuf = "com.google.protobuf" % "protobuf-java" % "2.2.0" val grizzly = "com.sun.grizzly" % "grizzly-comet-webserver" % "1.9.18-i" % "compile" - val jerseyserver = "com.sun.jersey" % "jersey-server" % JERSEYVERSION % "compile" - val jerseyjson = "com.sun.jersey" % "jersey-json" % JERSEYVERSION % "compile" - val jerseyatom = "com.sun.jersey" % "jersey-atom" % JERSEYVERSION % "compile" - //testing + val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" + val jersey_json = "com.sun.jersey" % "jersey-json" % JERSEY_VERSION % "compile" + val jersey_atom = "com.sun.jersey" % "jersey-atom" % JERSEY_VERSION % "compile" + // testing val junit = "junit" % "junit" % "4.5" % "test" val jmock = "org.jmock" % "jmock" % "2.4.0" % "test" } @@ -173,10 +173,10 @@ class AkkaParent(info: ProjectInfo) extends ParentProject(info) { class AkkaSampleChatProject(info:ProjectInfo) extends DefaultProject(info) class AkkaSampleLiftProject(info:ProjectInfo) extends DefaultProject(info) { - val liftutil = "net.liftweb" % "lift-util" % "1.1-M6" % "compile" val lift = "net.liftweb" % "lift-webkit" % "1.1-M6" % "compile" + val lift_util = "net.liftweb" % "lift-util" % "1.1-M6" % "compile" val servlet = "javax.servlet" % "servlet-api" % "2.5" % "provided" - //testing + // testing val jetty = "org.mortbay.jetty" % "jetty" % "6.1.6" % "test" val junit = "junit" % "junit" % "4.5" % "test" } @@ -184,19 +184,19 @@ class AkkaParent(info: ProjectInfo) extends ParentProject(info) { class AkkaSampleRestJavaProject(info:ProjectInfo) extends DefaultProject(info) class AkkaSampleRestScalaProject(info:ProjectInfo) extends DefaultProject(info) { - val jsr = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" + val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" } class AkkaSampleSecurityProject(info:ProjectInfo) extends DefaultProject(info) { - val jsr = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" - val annotation = "javax.annotation" % "jsr250-api" % "1.0" + val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1" % "compile" + val jsr250 = "javax.annotation" % "jsr250-api" % "1.0" } class AkkaSamplesParentProject(info:ProjectInfo) extends ParentProject(info) { - lazy val chat = project("akka-sample-chat","akka-sample-chat",new AkkaSampleChatProject(_),kernel) - lazy val lift = project("akka-sample-lift","akka-sample-lift",new AkkaSampleLiftProject(_),kernel) - lazy val restjava = project("akka-sample-rest-java","akka-sample-rest-java",new AkkaSampleRestJavaProject(_),kernel) - lazy val restscala = project("akka-sample-rest-scala","akka-sample-rest-scala",new AkkaSampleRestScalaProject(_),kernel) - lazy val security = project("akka-sample-security","akka-sample-security",new AkkaSampleSecurityProject(_),kernel) + lazy val akka_sample_chat = project("akka-sample-chat","akka-sample-chat",new AkkaSampleChatProject(_),akka_kernel) + lazy val akka_sample_lift = project("akka-sample-lift","akka-sample-lift",new AkkaSampleLiftProject(_),akka_kernel) + lazy val akka_sample_rest_java = project("akka-sample-rest-java","akka-sample-rest-java",new AkkaSampleRestJavaProject(_),akka_kernel) + lazy val akka_sample_rest_scala = project("akka-sample-rest-scala","akka-sample-rest-scala",new AkkaSampleRestScalaProject(_),akka_kernel) + lazy val akka_sample_security = project("akka-sample-security","akka-sample-security",new AkkaSampleSecurityProject(_),akka_kernel) } }