Author: assaf
Date: Wed Apr  4 10:57:23 2007
New Revision: 525567

URL: http://svn.apache.org/viewvc?view=rev&rev=525567
Log:
Reduction in redundant LOCs

Modified:
    incubator/ode/trunk/Rakefile

Modified: incubator/ode/trunk/Rakefile
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/Rakefile?view=diff&rev=525567&r1=525566&r2=525567
==============================================================================
--- incubator/ode/trunk/Rakefile (original)
+++ incubator/ode/trunk/Rakefile Wed Apr  4 10:57:23 2007
@@ -88,15 +88,10 @@
 
   desc "ODE Axis Integration Layer"
   define "axis2" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-connector"),
-      project("ode:bpel-dao"), project("ode:bpel-epr"),
-      project("ode:bpel-runtime"), project("ode:bpel-scheduler-quartz"),
-      project("ode:bpel-schemas"), project("ode:bpel-store"),
-      project("ode:utils"),
-      AXIOM, AXIS2, COMMONS.logging, COMMONS.collections,
-      DERBY, GERONIMO.kernel, GERONIMO.transaction,
-      JAVAX.activation, JAVAX.servlet, JAVAX.stream,
-      JAVAX.transaction, JENCKS, WSDL4J, XMLBEANS
+    compile.with projects("ode:bpel-api", "ode:bpel-connector", 
"ode:bpel-dao", "ode:bpel-epr", "ode:bpel-runtime",
+      "ode:bpel-scheduler-quartz", "ode:bpel-schemas", "ode:bpel-store", 
"ode:utils"),
+      AXIOM, AXIS2, COMMONS.logging, COMMONS.collections, DERBY, 
GERONIMO.kernel, GERONIMO.transaction,
+      JAVAX.activation, JAVAX.servlet, JAVAX.stream, JAVAX.transaction, 
JENCKS, WSDL4J, XMLBEANS
 
     tests.compile.with project("ode:tools")
     tests.run.with XERCES, WOODSTOX, AXIOM, WS_COMMONS.xml_schema, 
JAVAX.javamail
@@ -106,26 +101,15 @@
 
   desc "ODE Axis2 Based Web Application"
   define "axis2-war" do
-    libs = project("ode:axis2"), project("ode:bpel-api"),
-      project("ode:bpel-compiler"), project("ode:bpel-connector"), 
project("ode:bpel-dao"),
-      project("ode:bpel-epr"), project("ode:bpel-obj"),
-      project("ode:bpel-ql"), project("ode:bpel-runtime"),
-      project("ode:bpel-scheduler-quartz"), project("ode:bpel-schemas"),
-      project("ode:bpel-store"),
-      project("ode:dao-hibernate"), project("ode:jacob"),
-      project("ode:jca-ra"), project("ode:jca-server"),
-      project("ode:utils"),
-      project("ode:dao-jpa"),
-      AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec,
-      COMMONS.collections, COMMONS.fileupload, COMMONS.httpclient,
-      COMMONS.lang, COMMONS.pool, DERBY, DERBY_TOOLS,
-      JAXEN,
-      JAVAX.activation, JAVAX.ejb, JAVAX.javamail, JAVAX.connector, JAVAX.jms,
-      JAVAX.persistence, JAVAX.transaction, JAVAX.stream, JENCKS, JIBX,
-      GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J, 
OPENJPA, QUARTZ,
-      SAXON, TRANQL, WOODSTOX, WSDL4J,
-      WS_COMMONS.axiom, WS_COMMONS.neethi, WS_COMMONS.xml_schema,
-      XALAN, XERCES, XMLBEANS
+    libs = projects("ode:axis2", "ode:bpel-api", "ode:bpel-compiler", 
"ode:bpel-connector", "ode:bpel-dao",
+      "ode:bpel-epr", "ode:bpel-obj", "ode:bpel-ql", "ode:bpel-runtime", 
"ode:bpel-scheduler-quartz",
+      "ode:bpel-schemas", "ode:bpel-store", "ode:dao-hibernate", "ode:jacob", 
"ode:jca-ra", "ode:jca-server",
+      "ode:utils", "ode:dao-jpa"),
+      AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, 
COMMONS.fileupload, COMMONS.httpclient,
+      COMMONS.lang, COMMONS.pool, DERBY, DERBY_TOOLS, JAXEN, JAVAX.activation, 
JAVAX.ejb, JAVAX.javamail,
+      JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, 
JAVAX.stream, JENCKS, JIBX,
+      GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J, 
OPENJPA, QUARTZ, SAXON, TRANQL,
+      WOODSTOX, WSDL4J, WS_COMMONS.axiom, WS_COMMONS.neethi, 
WS_COMMONS.xml_schema, XALAN, XERCES, XMLBEANS
 
     package(:war).with(:libs=>libs).path("WEB-INF").tap do |web_inf|
       web_inf.merge project("ode:dao-jpa-ojpa-derby").package(:zip)
@@ -142,8 +126,7 @@
 
   desc "ODE APIs"
   define "bpel-api" do
-    compile.with project("ode:utils"), project("ode:bpel-obj"),
-      project("ode:bpel-schemas"), WSDL4J, COMMONS.logging
+    compile.with projects("ode:utils", "ode:bpel-obj", "ode:bpel-schemas"), 
WSDL4J, COMMONS.logging
     package :jar
   end
 
@@ -155,17 +138,14 @@
 
   desc "ODE BPEL Compiler"
   define "bpel-compiler" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-obj"),
-      project("ode:bpel-schemas"), project("ode:bpel-scripts"),
-      project("ode:utils"),
+    compile.with projects("ode:bpel-api", "ode:bpel-obj", "ode:bpel-schemas", 
"ode:bpel-scripts", "ode:utils"),
       COMMONS.logging, JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES
     package :jar
   end
 
   desc "ODE JCA Connector Implementation"
   define "bpel-connector" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-api-jca"),
-      project("ode:bpel-runtime"), project("ode:jca-ra"), 
project("ode:jca-server")
+    compile.with projects("ode:bpel-api", "ode:bpel-api-jca", 
"ode:bpel-runtime", "ode:jca-ra", "ode:jca-server")
     package :jar
   end
 
@@ -177,10 +157,8 @@
 
   desc "ODE Interface Layers Common"
   define "bpel-epr" do
-    compile.with project("ode:utils"), project("ode:bpel-dao"),
-      project("ode:bpel-api"),
-      COMMONS.logging, DERBY, JAVAX.transaction, GERONIMO.transaction, 
GERONIMO.connector, TRANQL,
-      JAVAX.connector
+    compile.with projects("ode:utils", "ode:bpel-dao", "ode:bpel-api"),
+      COMMONS.logging, DERBY, JAVAX.transaction, GERONIMO.transaction, 
GERONIMO.connector, TRANQL, JAVAX.connector
     package :jar
   end
 
@@ -199,8 +177,7 @@
     prepare Java::JavaCC.jjtree_task(path_to(jjtree_out, 
"org/apache/ode/ql/jcc")=>jjtree_src).using(:build_node_files=>false)
     prepare Java::JavaCC.javacc_task(path_to(javacc_out, 
"org/apache/ode/ql/jcc")=>jjtree_out)
 
-    compile.with project("ode:bpel-api"), project("ode:bpel-compiler"),
-      project("ode:bpel-obj"), project("ode:jacob"), project("ode:utils"),
+    compile.with projects("ode:bpel-api", "ode:bpel-compiler", "ode:bpel-obj", 
"ode:jacob", "ode:utils"),
       jjtree_out, javacc_out
     compile.from jjtree_out, javacc_out
 
@@ -209,23 +186,19 @@
 
   desc "ODE Runtime Engine"
   define "bpel-runtime" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-compiler"), 
project("ode:bpel-dao"),
-      project("ode:bpel-obj"), project("ode:bpel-schemas"), 
project("ode:bpel-store"),
-      project("ode:jacob"), project("ode:jacob-ap"), project("ode:utils"),
-      COMMONS.logging, COMMONS.collections,
-      JAXEN, JAVAX.persistence, JAVAX.stream, SAXON,
-      WSDL4J, XMLBEANS
+    compile.with projects("ode:bpel-api", "ode:bpel-compiler", "ode:bpel-dao", 
"ode:bpel-obj", "ode:bpel-schemas",
+      "ode:bpel-store", "ode:jacob", "ode:jacob-ap", "ode:utils"),
+      COMMONS.logging, COMMONS.collections, JAXEN, JAVAX.persistence, 
JAVAX.stream, SAXON, WSDL4J, XMLBEANS
 
     # Prepare before compile, but we use the same classpath,
     # so define this after compile.with.
-    generated = path_to(:target_dir, "generated/apt")
+    generated = path_to(:target_dir, "generated")
     prepare Java.apt_task(generated=>path_to(:java_src_dir, 
"org/apache/ode/bpel/runtime/channels")).
       using(:classpath=>compile.classpath, :source=>compile.options.source)
     # Include the generated sources.
     compile.from generated
 
-    tests.compile.with project("ode:bpel-scheduler-quartz"),
-      project("ode:dao-jpa"),
+    tests.compile.with projects("ode:bpel-scheduler-quartz", "ode:dao-jpa"),
       COMMONS.pool, COMMONS.lang, DERBY, JAVAX.connector, JAVAX.transaction,
       LOG4J, XERCES, Java::OpenJPA::REQUIRES, QUARTZ, XALAN
     tests.resources 
unzip(project("ode:dao-jpa-ojpa-derby").package(:zip)).into(path_to(:test_target_dir,
 "derby-db"))
@@ -235,8 +208,7 @@
 
   desc "ODE Quartz Interface"
   define "bpel-scheduler-quartz" do
-    compile.with project("ode:bpel-api"), project("ode:utils"),
-      COMMONS.collections, COMMONS.logging, JAVAX.transaction, QUARTZ
+    compile.with projects("ode:bpel-api", "ode:utils"), COMMONS.collections, 
COMMONS.logging, JAVAX.transaction, QUARTZ
     package :jar
   end
 
@@ -260,11 +232,9 @@
 
   desc "ODE Process Store"
   define "bpel-store" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-compiler"),
-      project("ode:bpel-dao"), project("ode:bpel-obj"), 
project("ode:bpel-schemas"),
-      project("ode:dao-hibernate"), project("ode:utils"),
-      COMMONS.logging, JAVAX.persistence, JAVAX.stream,
-      HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J
+    compile.with projects("ode:bpel-api", "ode:bpel-compiler", "ode:bpel-dao", 
"ode:bpel-obj", "ode:bpel-schemas",
+      "ode:dao-hibernate", "ode:utils"),
+      COMMONS.logging, JAVAX.persistence, JAVAX.stream, HIBERNATE, HSQLDB, 
XMLBEANS, XERCES, WSDL4J
 
     compile do |task|
       Java::OpenJPA.enhance(:output=>compile.target, 
:classpath=>compile.classpath,
@@ -278,25 +248,21 @@
 
   desc "ODE BPEL Tests"
   define "bpel-test" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-compiler"),
-      project("ode:bpel-dao"), project("ode:bpel-runtime"),
-      project("ode:bpel-store"), project("ode:utils"),
+    compile.with projects("ode:bpel-api", "ode:bpel-compiler", "ode:bpel-dao", 
"ode:bpel-runtime", "ode:bpel-store", "ode:utils"),
       DERBY, WSDL4J
 
     tests.compile.with project("ode:dao-jpa"), JAVAX.persistence
-    tests.run.with project("ode:bpel-obj"), project("ode:jacob"), 
project("ode:bpel-schemas"), project("ode:dao-jpa"),
-      COMMONS.collections, COMMONS.lang, COMMONS.logging,
-      JAVAX.connector, JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, LOG4J, 
OPENJPA, SAXON, XERCES, XMLBEANS, XALAN
+    tests.run.with projects("ode:bpel-obj", "ode:jacob", "ode:bpel-schemas", 
"ode:dao-jpa"),
+      COMMONS.collections, COMMONS.lang, COMMONS.logging, JAVAX.connector, 
JAVAX.stream, JAVAX.transaction,
+      JAXEN, HSQLDB, LOG4J, OPENJPA, SAXON, XERCES, XMLBEANS, XALAN
 
     package :jar
   end
 
   desc "ODE Hibernate DAO Implementation"
   define "dao-hibernate" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-dao"),
-      project("ode:bpel-ql"), project("ode:utils"),
+    compile.with projects("ode:bpel-api", "ode:bpel-dao", "ode:bpel-ql", 
"ode:utils"),
       COMMONS.lang, COMMONS.logging, JAVAX.transaction, HIBERNATE, DOM4J
-
     compile do
       Java::Hibernate.xdoclet :source=>compile.sources, :include=>"**/*.java",
         :target=>compile.target, :excludedtags=>"@version,@author,@todo"
@@ -308,8 +274,8 @@
   desc "ODE Hibernate Compatible Databases"
   define "dao-hibernate-db" do
 
-    def predefined_for(name) ; file(path_to(:src_dir, "main", "sql", 
"tables_#{name}.sql")); end
-    def properties_for(name) ; file(path_to(:src_dir, "main", "sql", 
"ode.#{name}.properties")); end
+    predefined_for = lambda { |name| file(path_to(:src_dir, "main", "sql", 
"tables_#{name}.sql")) }
+    properties_for = lambda { |name| file(path_to(:src_dir, "main", "sql", 
"ode.#{name}.properties")) }
 
     dao_hibernate = project("ode:dao-hibernate").compile.target
     bpel_store = project("ode:bpel-store").compile.target
@@ -324,21 +290,22 @@
     end
 
     build file_create(path_to(:target_dir)) { |task| mkpath task.name }
-    runtime_sql = export.call(properties_for(:derby), dao_hibernate, 
path_to(:target_dir, "runtime.sql")) 
-    store_sql = export.call(properties_for(:derby), bpel_store, 
path_to(:target_dir, "store.sql")) 
-    derby_sql = concat(path_to(:target_dir, "derby.sql")=>[ 
predefined_for(:derby), runtime_sql, store_sql ]) 
+    runtime_sql = export.call(properties_for[:derby], dao_hibernate, 
path_to(:target_dir, "runtime.sql")) 
+    store_sql = export.call(properties_for[:derby], bpel_store, 
path_to(:target_dir, "store.sql")) 
+    derby_sql = concat(path_to(:target_dir, "derby.sql")=>[ 
predefined_for[:derby], runtime_sql, store_sql ]) 
     %w{ firebird hsql postgres sqlserver }.each do |db|
-      partial = export.call(properties_for(db), dao_hibernate, 
path_to(:target_dir, "partial.#{db}.sql"))
-      build concat(path_to(:target_dir, "#{db}.sql")=>[ predefined_for(db), 
partial ])
+      partial = export.call(properties_for[db], dao_hibernate, 
path_to(:target_dir, "partial.#{db}.sql"))
+      build concat(path_to(:target_dir, "#{db}.sql")=>[ predefined_for[db], 
partial ])
     end
+    derby_db = Derby.create(path_to(:target_dir, "derby/hibdb")=>derby_sql)
 
-    build derby_db = Derby.create(path_to(:target_dir, 
"derby/hibdb")=>derby_sql)
+    build derby_db
     package :zip, :include=>derby_db
   end
 
   desc "ODE OpenJPA DAO Implementation"
   define "dao-jpa" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-dao"), 
project("ode:utils"),
+    compile.with projects("ode:bpel-api", "ode:bpel-dao", "ode:utils"),
       COMMONS.collections, COMMONS.logging, JAVAX.connector, 
JAVAX.persistence, JAVAX.transaction,
       OPENJPA, XERCES
 
@@ -355,39 +322,38 @@
     # append the Quartz DDL at the end.
     derby_xml = path_to(:src_dir, "main/descriptors/persistence.derby.xml")
     quartz_sql = path_to(:src_dir, "main/scripts/quartz-derby.sql")
-    derby_sql = file(path_to(:target_dir, "derby.sql")=>[derby_xml, 
quartz_sql]) do |task|
+    partial_sql = file(path_to(:target_dir, "partial.sql")=>derby_xml) do 
|task|
       mkpath path_to(:target_dir), :verbose=>false
       Java::OpenJPA.mapping_tool :properties=>derby_xml, :action=>"build", 
:sql=>task.name,
-        :classpath=>artifacts( project("ode:bpel-store"), 
project("ode:dao-jpa"),
-                      project("ode:bpel-api"), project("ode:bpel-dao"),
-                      project("ode:utils") )
-      File.open(task.name, "a") { |file| file.write File.read(quartz_sql) }
+        :classpath=>projects("ode:bpel-store", "ode:dao-jpa", "ode:bpel-api", 
"ode:bpel-dao", "ode:utils" )
     end
+    derby_sql = concat(path_to(:target_dir, "derby.sql")=>[partial_sql, 
quartz_sql])
+    derby_db = Derby.create(path_to(:target_dir, "derby/jpadb")=>derby_sql)
 
-    tests.compile.with project("ode:bpel-api"), project("ode:bpel-dao"),
-      project("ode:bpel-obj"), project("ode:dao-jpa"), project("ode:utils"),
-      COMMONS.collections, COMMONS.logging, JAVAX.persistence, 
JAVAX.transaction, 
-      OPENJPA, XERCES, WSDL4J
+    tests.compile.with projects("ode:bpel-api", "ode:bpel-dao", 
"ode:bpel-obj", "ode:dao-jpa", "ode:utils"),
+      COMMONS.collections, COMMONS.logging, JAVAX.persistence, 
JAVAX.transaction, OPENJPA, XERCES, WSDL4J
 
-    build derby_db = Derby.create(path_to(:target_dir, 
"derby/jpadb")=>derby_sql)
+    build derby_db
     package :zip, :include=>derby_db
   end
 
+  distro_common = lambda do |project, zip|
+    zip.include meta_inf + ["RELEASE_NOTES", "README"].map { |f| 
project.parent.path_to(f) }
+    zip.path("examples").include FileList[project.path_to(:src_dir, 
"examples", "**")]
+    zip.merge project("ode:tools-bin").package(:zip)
+    zip.path("lib").include artifacts(COMMONS.logging, COMMONS.codec, 
COMMONS.httpclient,
+      COMMONS.pool, COMMONS.collections, JAXEN,
+      SAXON, LOG4J, WSDL4J)
+    projects("ode:utils", "ode:tools", "ode:bpel-compiler", "ode:bpel-api", 
"ode:bpel-obj", "ode:bpel-schemas").
+      map(&:packages).flatten.each do |pkg|
+      zip.include(pkg.to_s, :as=>"#{pkg.id}.#{pkg.type}", :path=>"lib")
+    end
+  end
+
   desc "ODE Axis2 Based Distribution"
   define "distro-axis2" do
-    package(:zip, path_to(:target_dir, 
"apache-ode-#{VERSION_NUMBER}-incubating-war.zip")).tap do |zip|
-      zip.include meta_inf + ["RELEASE_NOTES", "README"].map { |f| 
parent.path_to(f) }
-      zip.path("examples").include FileList[path_to(:src_dir, "examples", 
"**")]
-      zip.include path_to(:target_dir, "stage/*")
-      zip.merge project("ode:tools-bin").package(:zip)
-      zip.path("lib").include artifacts(COMMONS.logging, COMMONS.codec, 
COMMONS.httpclient,
-        COMMONS.pool, COMMONS.collections, JAXEN,
-        SAXON, LOG4J, WSDL4J)
-      projects("ode:utils", "ode:tools", "ode:bpel-compiler",
-               "ode:bpel-api", "ode:bpel-obj", "ode:bpel-schemas").
-        map(&:packages).flatten.each do |pkg|
-        zip.include(pkg.to_s, :as=>"#{pkg.id}.#{pkg.type}", :path=>"lib")
-      end
+    package(:zip).tap do |zip|
+      distro_common.call(self, zip)
       zip.include project("ode:axis2-war").package(:war), :as=>"ode.war"
     end
   end
@@ -395,29 +361,17 @@
   desc "ODE JBI Based Distribution"
   define "distro-jbi" do
     package(:zip).tap do |zip|
-      zip.include meta_inf + ["RELEASE_NOTES", "README"].map { |f| 
parent.path_to(f) }
-      zip.path("examples").include FileList[path_to(:src_dir, "examples", 
"**")]
-      zip.merge project("ode:tools-bin").package(:zip)
-      zip.path("lib").include artifacts(COMMONS.logging, COMMONS.codec, 
COMMONS.httpclient,
-        COMMONS.pool, COMMONS.collections, JAXEN,
-        SAXON, LOG4J, WSDL4J)
-      projects("ode:utils", "ode:tools", "ode:bpel-compiler",
-               "ode:bpel-api", "ode:bpel-obj", "ode:bpel-schemas").
-        map(&:packages).flatten.each do |pkg|
-        zip.include(pkg.to_s, :as=>"#{pkg.id}.#{pkg.type}", :path=>"lib")
-      end
+      distro_common.call(self, zip)
       zip.path("jbi-component").include project("ode:jbi").package(:zip)
     end
   end
 
   desc "ODE JAva Concurrent OBjects"
   define "jacob" do
-    compile.with project("ode:utils"), project("ode:jacob-ap"),
-      COMMONS.logging
-
+    compile.with projects("ode:utils", "ode:jacob-ap"), COMMONS.logging
     # Prepare before compile, but we use the same classpath,
     # so define this after compile.with.
-    generated = path_to(:target_dir, "generated/apt")
+    generated = path_to(:target_dir, "generated")
     prepare Java.apt_task(generated=>path_to(:java_src_dir)).
       using(:classpath=>compile.classpath, :source=>compile.options.source)
     # Include the generated sources.
@@ -434,22 +388,17 @@
 
   desc "ODE JBI Integration Layer"
   define "jbi" do
-    compile.with project("ode:bpel-api"), project("ode:bpel-connector"),
-      project("ode:bpel-dao"), project("ode:bpel-epr"), 
project("ode:bpel-obj"),
-      project("ode:bpel-runtime"), project("ode:bpel-scheduler-quartz"),
-      project("ode:bpel-schemas"), project("ode:bpel-store"),
-      project("ode:utils"),
+    compile.with projects("ode:bpel-api", "ode:bpel-connector", 
"ode:bpel-dao", "ode:bpel-epr", "ode:bpel-obj",
+      "ode:bpel-runtime", "ode:bpel-scheduler-quartz", "ode:bpel-schemas", 
"ode:bpel-store", "ode:utils"),
       COMMONS.logging, COMMONS.pool, JAVAX.transaction, JBI, LOG4J, WSDL4J, 
XERCES
 
     package(:jar)
     package(:jbi).tap do |jbi|
-      libs = artifacts(package(:jar), project("ode:bpel-api"), 
project("ode:bpel-api-jca"),
-        project("ode:bpel-compiler"), project("ode:bpel-connector"), 
project("ode:bpel-dao"),
-        project("ode:bpel-epr"), project("ode:jca-ra"), 
project("ode:jca-server"),
-        project("ode:bpel-obj"), project("ode:bpel-ql"), 
project("ode:bpel-runtime"),
-        project("ode:bpel-scheduler-quartz"), project("ode:bpel-schemas"), 
project("ode:bpel-store"),
-        project("ode:dao-hibernate"), project("ode:dao-jpa"), 
project("ode:jacob"), project("ode:jacob-ap"),
-        project("ode:utils"),
+      libs = artifacts(package(:jar),
+        projects("ode:bpel-api", "ode:bpel-api-jca", "ode:bpel-compiler", 
"ode:bpel-connector", "ode:bpel-dao",
+        "ode:bpel-epr", "ode:jca-ra", "ode:jca-server", "ode:bpel-obj", 
"ode:bpel-ql", "ode:bpel-runtime",
+        "ode:bpel-scheduler-quartz", "ode:bpel-schemas", "ode:bpel-store", 
"ode:dao-hibernate", "ode:dao-jpa",
+        "ode:jacob", "ode:jacob-ap", "ode:utils"),
         ANT, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp, 
COMMONS.lang, COMMONS.pool,
         COMMONS.primitives, DOM4J, HIBERNATE, HSQLDB, JAXEN, JAVAX.connector, 
JAVAX.ejb, JAVAX.jms,
         JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J, OPENJPA, 
QUARTZ, SAXON, TRANQL,
@@ -471,30 +420,26 @@
 
   desc "ODE JCA Server"
   define "jca-server" do
-    compile.with project("ode:jca-ra"), project("ode:utils"),
-      COMMONS.logging
+    compile.with projects("ode:jca-ra", "ode:utils"), COMMONS.logging
     package :jar
   end
 
   desc "ODE Tools"
   define "tools" do
-    compile.with project("ode:bpel-compiler"), project("ode:utils"),
-      ANT, COMMONS.httpclient, COMMONS.logging
+    compile.with projects("ode:bpel-compiler", "ode:utils"), ANT, 
COMMONS.httpclient, COMMONS.logging
     package :jar
   end
 
   desc "ODE Tools Binaries"
   define "tools-bin" do
     # Copy binary files over, set permissions on Linux files.
-    bins = file(path_to(:target_dir, "bin")=>path_to(:src_dir, 
"main/dist/bin")) do |task|
-      filter(task.prerequisites).into(File.dirname(task.name)).invoke
-      chmod 0755, FileList[task.name + "/*"].collect.exclude("**/*.bat"), 
:verbose=>false
-    end
+    bins = filter(path_to(:src_dir, 
"main/dist/bin/*")).into(path_to(:target_dir, "bin")).
+      enhance { |task| chmod 0755, FileList[task.target.to_s + "/*.sh"], 
:verbose=>false }
     # Copy docs over.
     docs = filter(path_to(:src_dir, 
"main/dist/doc/*")).into(path_to(:target_dir, "doc"))
 
     build bins, docs
-    package :zip, :include=>[path_to(:target_dir, "bin"), path_to(:target_dir, 
"doc")]
+    package(:zip).include bins.target, docs.target
   end
 
   desc "ODE Utils"


Reply via email to