You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/03/12 17:50:03 UTC

svn commit: r517276 - /incubator/ode/trunk/Rakefile

Author: mriou
Date: Mon Mar 12 09:50:01 2007
New Revision: 517276

URL: http://svn.apache.org/viewvc?view=rev&rev=517276
Log:
Added a few dependencies here and there (mostly things necessary in the war lib at runtime), removed an unused module from build (dao-jpa-ojpa).

Modified:
    incubator/ode/trunk/Rakefile

Modified: incubator/ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/Rakefile?view=diff&rev=517276&r1=517275&r2=517276
==============================================================================
--- incubator/ode/trunk/Rakefile (original)
+++ incubator/ode/trunk/Rakefile Mon Mar 12 09:50:01 2007
@@ -130,7 +130,7 @@
 
   define "bpel-api" do
     compile.with project("ode:utils"), project("ode:bpel-obj"),
-      project("ode:bpel-schemas"), WSDL4J
+      project("ode:bpel-schemas"), WSDL4J, COMMONS.logging
     package :jar
   end
 
@@ -271,15 +271,9 @@
 
   define "dao-jpa" do
     compile.with project("ode:bpel-api"), project("ode:bpel-dao"), project("ode:utils"),
-      COMMONS.logging, JAVAX.persistence, JAVAX.transaction, OPENJPA
-    package :jar
-  end
-
-  define "dao-jpa-ojpa" do
-    compile.with project("ode:bpel-api"), project("ode:dao-jpa"), project("ode:bpel-dao"),
-      COMMONS.collections, JAVAX.persistence, JAVAX.transaction,
+      COMMONS.collections, COMMONS.logging, JAVAX.persistence, JAVAX.transaction, 
       OPENJPA, XERCES
-
+    
     build do |task|
       if compile.compiled?
         OpenJPA.enhance :output=>compile.target, :classpath=>compile.classpath,
@@ -289,6 +283,20 @@
     package :jar
   end
 
+#  define "dao-jpa-ojpa" do
+#    compile.with project("ode:bpel-api"), project("ode:dao-jpa"), project("ode:bpel-dao"),
+#      COMMONS.collections, JAVAX.persistence, JAVAX.transaction,
+#      OPENJPA, XERCES
+#
+#    compile do |task|
+#      if task.compiled?
+#        OpenJPA.enhance :output=>compile.target, :classpath=>compile.classpath,
+#          :properties=>path_to(:resources_dir, "META-INF/persistence.xml" )
+#      end
+#    end
+#    package :jar
+#  end
+
   define "dao-jpa-ojpa-derby" do
     # Create the Derby SQL file using the OpenJPA mapping tool, and
     # append the Quartz DDL at the end.
@@ -370,7 +378,7 @@
   end
 
   define "jacob-ap" do
-    compile.with File.join(ENV['JAVA_HOME'], "lib/tools.jar")
+    compile.with File.join(ENV['JAVA_HOME'], "lib", "tools.jar")
     package :jar
   end