You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/05/23 12:09:13 UTC
svn commit: r947393 - in /ode/trunk: Rakefile dependencies.rb
Author: vanto
Date: Sun May 23 10:09:13 2010
New Revision: 947393
URL: http://svn.apache.org/viewvc?rev=947393&view=rev
Log:
First attempt to fix buildr build
Modified:
ode/trunk/Rakefile
ode/trunk/dependencies.rb
Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=947393&r1=947392&r2=947393&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Sun May 23 10:09:13 2010
@@ -71,7 +71,7 @@ define "ode" do
libs = projects("axis2", "bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao",
"bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple",
"bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server",
- "utils", "dao-jpa", "agents"),
+ "utils", "dao-jpa", "dao-jpa-ojpa", "agents"),
AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.beanutils,
COMMONS.lang, COMMONS.logging, COMMONS.pool, DERBY, DERBY_TOOLS, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail,
JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, JAVAX.stream, JIBX,
@@ -104,7 +104,7 @@ define "ode" do
end
test.using :testng, :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'] }, :java_args=>['-Xmx1024M', '-XX:MaxPermSize=1024m']
- test.with projects("tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, SLF4J, LOG4J
+ test.with projects("bpel-dao", "dao-jpa", "tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, SLF4J, LOG4J
webapp_dir = "#{test.compile.target}/webapp"
test.setup task(:prepare_webapp) do |task|
cp_r _("src/main/webapp"), test.compile.target.to_s
@@ -166,14 +166,14 @@ define "ode" do
desc "ODE DAO Interfaces"
define "bpel-dao" do
- compile.with project("bpel-api")
+ compile.with project("bpel-api"), JAVAX.transaction
package :jar
end
desc "ODE Interface Layers Common"
define "bpel-epr" do
compile.with projects("utils", "bpel-dao", "bpel-api"),
- AXIOM, COMMONS.lang, COMMONS.logging, COMMONS.beanutils, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS
+ AXIOM, COMMONS.lang, COMMONS.logging, COMMONS.beanutils, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector, H2, TRANQL, XMLBEANS
package :jar
end
@@ -198,7 +198,7 @@ define "ode" do
compile.from apt
compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-schemas",
"bpel-store", "jacob", "jacob-ap", "utils", "agents"),
- COMMONS.logging, COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS,
+ COMMONS.logging, COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.transaction, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS,
SPRING
@@ -217,7 +217,7 @@ define "ode" do
compile.with projects("bpel-api", "utils"), COMMONS.collections, COMMONS.logging, JAVAX.transaction, LOG4J
test.compile.with HSQLDB, GERONIMO.kernel, GERONIMO.transaction
test.with HSQLDB, JAVAX.transaction, JAVAX.resource, JAVAX.connector, LOG4J,
- GERONIMO.kernel, GERONIMO.transaction, GERONIMO.connector, TRANQL, BACKPORT, JAVAX.ejb
+ GERONIMO.kernel, GERONIMO.transaction, GERONIMO.connector, H2, TRANQL, BACKPORT, JAVAX.ejb
package :jar
end
@@ -237,8 +237,6 @@ define "ode" do
compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-obj", "bpel-schemas", "bpel-epr",
"dao-hibernate", "dao-jpa", "utils"),
COMMONS.logging, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J, OPENJPA, SPRING
- compile { open_jpa_enhance }
- resources hibernate_doclet(:package=>"org.apache.ode.store.hib", :excludedtags=>"@version,@author,@todo")
test.with COMMONS.collections, COMMONS.lang, JAVAX.connector, JAVAX.transaction, DOM4J, LOG4J,
XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction
@@ -249,7 +247,7 @@ define "ode" do
define "bpel-test" do
compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-runtime",
"bpel-store", "utils", "bpel-epr", "dao-hibernate", "agents"),
- DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient,
+ DERBY, JUnit.dependencies, JAVAX.persistence, JAVAX.transaction, OPENJPA, WSDL4J, COMMONS.httpclient,
COMMONS.codec
test.with projects("bpel-obj", "jacob", "bpel-schemas",
@@ -262,16 +260,16 @@ define "ode" do
desc "ODE Hibernate DAO Implementation"
define "dao-hibernate" do
- compile.with projects("bpel-api", "bpel-dao", "bpel-ql", "utils"),
+ compile.with projects("bpel-api", "bpel-dao", "bpel-ql", "bpel-epr", "utils"),
COMMONS.lang, COMMONS.logging, JAVAX.transaction, HIBERNATE, DOM4J
- resources hibernate_doclet(:package=>"org.apache.ode.daohib.bpel.hobj", :excludedtags=>"@version,@author,@todo")
+ resources hibernate_doclet(:package=>"org.apache.ode.dao.hib.bpel.hobj", :excludedtags=>"@version,@author,@todo")
# doclet does not support not-found="ignore"
task "hbm-hack" do |task|
- process_instance_hbm_file = project.path_to("target/classes/org/apache/ode/daohib/bpel/hobj/HProcessInstance.hbm.xml")
+ process_instance_hbm_file = project.path_to("target/classes/org/apache/ode/dao/hib/bpel/hobj/HProcessInstance.hbm.xml")
process_instance_hbm = File.read(process_instance_hbm_file)
if !process_instance_hbm.include? "not-found=\"ignore\""
- process_instance_hbm.insert(process_instance_hbm.index("class=\"org.apache.ode.daohib.bpel.hobj.HProcess\"") - 1, "not-found=\"ignore\" ")
+ process_instance_hbm.insert(process_instance_hbm.index("class=\"org.apache.ode.dao.hib.bpel.hobj.HProcess\"") - 1, "not-found=\"ignore\" ")
File.open(process_instance_hbm_file, "w") { |f| f << process_instance_hbm }
end
end
@@ -330,7 +328,7 @@ define "ode" do
package(:zip).include(derby_db)
end
- desc "ODE OpenJPA DAO Implementation"
+ desc "ODE JPA DAO Implementation"
define "dao-jpa" do
compile.with projects("bpel-api", "bpel-dao", "utils"),
COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction,
@@ -339,6 +337,15 @@ define "ode" do
package :jar
end
+ desc "ODE OpenJPA DAO Implementation"
+ define "dao-jpa-ojpa" do
+ compile.with projects("bpel-api", "bpel-dao", "bpel-epr", "dao-jpa", "utils"),
+ COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction,
+ OPENJPA, XERCES
+ #compile { open_jpa_enhance }
+ package :jar
+ end
+
desc "ODE OpenJPA Derby Database"
define "dao-jpa-ojpa-derby" do
%w{ derby mysql oracle }.each do |db|
@@ -348,14 +355,14 @@ define "ode" do
partial_sql = file("target/partial.#{db}.sql"=>db_xml) do |task|
mkpath _("target"), :verbose=>false
Buildr::OpenJPA.mapping_tool :properties=>db_xml, :action=>"build", :sql=>task.name,
- :classpath=>projects("bpel-store", "dao-jpa", "bpel-api", "bpel-dao", "utils" )
+ :classpath=>projects("bpel-store", "dao-jpa", "dao-jpa-ojpa", "bpel-api", "bpel-dao", "utils" )
end
sql = concat(_("target/#{db}.sql")=>[_("src/main/scripts/license-header.sql"), common_sql, partial_sql, scheduler_sql])
build sql
end
derby_db = Derby.create(_("target/derby/jpadb")=>_("target/derby.sql"))
- test.with projects("bpel-api", "bpel-dao", "bpel-obj", "bpel-epr", "dao-jpa", "utils"),
+ test.with projects("bpel-api", "bpel-dao", "bpel-obj", "bpel-epr", "dao-jpa", "dao-jpa-ojpa", "utils"),
BACKPORT, COMMONS.collections, COMMONS.lang, COMMONS.logging, GERONIMO.transaction,
GERONIMO.kernel, GERONIMO.connector, HSQLDB, JAVAX.connector, JAVAX.ejb, JAVAX.persistence,
JAVAX.transaction, LOG4J, OPENJPA, XERCES, WSDL4J
Modified: ode/trunk/dependencies.rb
URL: http://svn.apache.org/viewvc/ode/trunk/dependencies.rb?rev=947393&r1=947392&r2=947393&view=diff
==============================================================================
--- ode/trunk/dependencies.rb (original)
+++ ode/trunk/dependencies.rb Sun May 23 10:09:13 2010
@@ -57,9 +57,10 @@ GERONIMO = struct(
:transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1",
:connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1"
)
-HIBERNATE = [ "org.hibernate:hibernate:jar:3.2.5.ga", "asm:asm:jar:1.5.3",
- "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.1_3", "net.sf.ehcache:ehcache:jar:1.2.3" ]
+HIBERNATE = [ "org.hibernate:hibernate-core:jar:3.3.2.ga", "javassist:javassist:jar:3.4.GA", # shouldn't this be 3.9.0.GA?
+ "antlr:antlr:jar:2.7.6", "org.slf4j:slf4j-api:jar:1.5.8", "net.sf.ehcache:ehcache:jar:1.2.3" ]
HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7"
+H2 = "com.h2database:h2:jar:1.2.131"
JAVAX = struct(
:activation =>"javax.activation:activation:jar:1.1",
#:activation =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4",