You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by as...@apache.org on 2007/04/27 01:48:43 UTC
svn commit: r532914 - in /incubator/ode/trunk: Rakefile
bpel-store/src/main/resources/META-INF/persistence.xml tasks/clover.rake
tasks/hibernate.rake tasks/jdepend.rake
Author: assaf
Date: Thu Apr 26 16:48:42 2007
New Revision: 532914
URL: http://svn.apache.org/viewvc?view=rev&rev=532914
Log:
Updated to use Buildr 0.22.0
Modified:
incubator/ode/trunk/Rakefile
incubator/ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml
incubator/ode/trunk/tasks/clover.rake
incubator/ode/trunk/tasks/hibernate.rake
incubator/ode/trunk/tasks/jdepend.rake
Modified: incubator/ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/Rakefile?view=diff&rev=532914&r1=532913&r2=532914
==============================================================================
--- incubator/ode/trunk/Rakefile (original)
+++ incubator/ode/trunk/Rakefile Thu Apr 26 16:48:42 2007
@@ -1,10 +1,15 @@
-#require "buildr"
-require "buildr/lib/buildr"
+#require "buildr/lib/buildr"
+require "buildr"
+require "buildr/xmlbeans"
+require "buildr/openjpa"
+require "buildr/javacc"
+require "buildr/jetty"
# Keep this structure to allow the build system to update version numbers.
VERSION_NUMBER = "1.0-SNAPSHOT"
NEXT_VERSION = "1.0"
+
ANNONGEN = "annogen:annogen:jar:0.1.0"
ANT = "ant:ant:jar:1.6.5"
AXIOM = group("axiom-api", "axiom-impl", "axiom-dom", :under=>"org.apache.ws.commons.axiom", :version=>"1.2.4")
@@ -14,7 +19,7 @@
"axis2-java2wsdl", "axis2-jibx", "axis2-kernel", "axis2-saaj", "axis2-xmlbeans",
:under=>"org.apache.axis2", :version=>"1.1.1")
BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.0"
-COMMONS = OpenStruct.new(
+COMMONS = struct(
:codec =>"commons-codec:commons-codec:jar:1.3",
:collections =>"commons-collections:commons-collections:jar:3.1",
:dbcp =>"commons-dbcp:commons-dbcp:jar:1.2.1",
@@ -28,7 +33,7 @@
DERBY = "org.apache.derby:derby:jar:10.1.2.1"
DERBY_TOOLS = "org.apache.derby:derbytools:jar:10.1.2.1"
DOM4J = "dom4j:dom4j:jar:1.6.1"
-GERONIMO = OpenStruct.new(
+GERONIMO = struct(
:kernel =>"org.apache.geronimo.modules:geronimo-kernel:jar:1.2-beta",
:transaction =>"org.apache.geronimo.modules:geronimo-transaction:jar:1.2-beta",
:connector =>"org.apache.geronimo.modules:geronimo-connector:jar:1.2-beta"
@@ -37,7 +42,7 @@
"antlr:antlr:jar:2.7.6rc1", "cglib:cglib:jar:2.1_3", "ehcache:ehcache:jar:1.1" ]
HOWL_LOGGER = "howl:howl-logger:jar:0.1.11"
HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7"
-JAVAX = OpenStruct.new(
+JAVAX = struct(
:activation =>"javax.activation:activation:jar:1.1",
#:activation =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4",
:connector =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0",
@@ -54,25 +59,27 @@
JENCKS = "org.jencks:jencks:jar:all:1.3"
JIBX = "jibx:jibx-run:jar:1.1-beta3"
LOG4J = "log4j:log4j:jar:1.2.13"
-OPENJPA = ["org.apache.openjpa:openjpa-all:jar:0.9.7-incubating-SNAPSHOT",
+OPENJPA = ["org.apache.openjpa:openjpa-all:jar:#{Buildr::OpenJPA::VERSION}",
"net.sourceforge.serp:serp:jar:1.12.0"]
QUARTZ = "quartz:quartz:jar:1.5.2"
SAXON = group("saxon", "saxon-xpath", "saxon-dom", :under=>"net.sf.saxon", :version=>"8.7")
-SERVICEMIX = group("servicemix-core", "servicemix-shared", "servicemix-services", :under=>"org.apache.servicemix", :version=>"3.1-incubating")
-SPRING = group("spring-beans", "spring-context", "spring-core", "spring-jmx", :under=>"org.springframework", :version=>"2.0.1")
+SERVICEMIX = group("servicemix-core", "servicemix-shared", "servicemix-services",
+ :under=>"org.apache.servicemix", :version=>"3.1-incubating")
+SPRING = group("spring-beans", "spring-context", "spring-core", "spring-jmx",
+ :under=>"org.springframework", :version=>"2.0.1")
TRANQL = [ "tranql:tranql-connector:jar:1.1", "axion:axion:jar:1.0-M3-dev", COMMONS.primitives ]
-"regexp:regexp:jar:1.3"
WOODSTOX = "woodstox:wstx-asl:jar:3.2.1"
WSDL4J = "wsdl4j:wsdl4j:jar:1.6.1"
XALAN = "org.apache.ode:xalan:jar:2.7.0"
XERCES = "xerces:xercesImpl:jar:2.8.0"
XSTREAM = "xstream:xstream:jar:1.2"
-WS_COMMONS = OpenStruct.new(
+WS_COMMONS = struct(
:axiom =>AXIOM,
:neethi =>"org.apache.ws.commons.neethi:neethi:jar:2.0",
:xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.2"
)
-XBEAN = group("xbean-classloader", "xbean-kernel", "xbean-server", "xbean-spring", :under=>"org.apache.xbean", :version=>"2.8")
+XBEAN = group("xbean-classloader", "xbean-kernel", "xbean-server", "xbean-spring",
+ :under=>"org.apache.xbean", :version=>"2.8")
XMLBEANS = "xmlbeans:xbean:jar:2.2.0"
@@ -205,7 +212,7 @@
test.compile.with projects("ode:bpel-scheduler-quartz", "ode:dao-jpa", "ode:dao-hibernate", "ode:bpel-epr"),
BACKPORT, COMMONS.pool, COMMONS.lang, DERBY, JAVAX.connector, JAVAX.transaction,
GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, HSQLDB, JAVAX.ejb,
- LOG4J, XERCES, OpenJPA::REQUIRES, QUARTZ, XALAN
+ LOG4J, XERCES, Buildr::OpenJPA::REQUIRES, QUARTZ, XALAN
test.junit.with HIBERNATE, DOM4J
package :jar
@@ -315,11 +322,12 @@
quartz_sql = _("src/main/scripts/quartz-derby.sql")
partial_sql = file("target/partial.sql"=>derby_xml) do |task|
mkpath _("target"), :verbose=>false
- OpenJPA.mapping_tool :properties=>derby_xml, :action=>"build", :sql=>task.name,
+ Buildr::OpenJPA.mapping_tool :properties=>derby_xml, :action=>"build", :sql=>task.name,
:classpath=>projects("ode:bpel-store", "ode:dao-jpa", "ode:bpel-api", "ode:bpel-dao", "ode:utils" )
end
derby_sql = concat(_("target/derby.sql")=>[partial_sql, quartz_sql])
derby_db = Derby.create(_("target/derby/jpadb")=>derby_sql)
+
test.with projects("ode:bpel-api", "ode:bpel-dao", "ode:bpel-obj", "ode:bpel-epr", "ode:dao-jpa", "ode:utils"),
BACKPORT, COMMONS.collections, COMMONS.lang, COMMONS.logging, GERONIMO.transaction,
Modified: incubator/ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml?view=diff&rev=532914&r1=532913&r2=532914
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml Thu Apr 26 16:48:42 2007
@@ -32,4 +32,4 @@
<class>org.apache.ode.store.jpa.DeploymentUnitDaoImpl</class>
<class>org.apache.ode.store.jpa.VersionTrackerDAOImpl</class>
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
Modified: incubator/ode/trunk/tasks/clover.rake
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/tasks/clover.rake?view=diff&rev=532914&r1=532913&r2=532914
==============================================================================
--- incubator/ode/trunk/tasks/clover.rake (original)
+++ incubator/ode/trunk/tasks/clover.rake Thu Apr 26 16:48:42 2007
@@ -4,7 +4,7 @@
DATABASE = "clover.db"
task "clover" do
- projects.each do |project|
+ Buildr.projects.each do |project|
unless project.compile.sources.empty?
instrumented = project.file("target/clover")
instrumented.enhance project.compile.sources do |task|
@@ -13,7 +13,7 @@
map { |src| FileList[File.join(src.to_s, "**/*.java")] }.flatten
args << "-verbose" if Rake.application.options.trace
args << { :classpath=>REQUIRES }
- Java.java "com.cenqua.clover.CloverInstr", *args
+ Buildr::Java.java "com.cenqua.clover.CloverInstr", *args
end
file DATABASE=>instrumented
project.compile.sources = [instrumented]
@@ -26,7 +26,7 @@
namespace "clover" do
task "html"=>file("clover.db") do
- Java.java "com.cenqua.clover.reporters.html.HtmlReporter", "-i", DATABASE, "-o", "clover", :classpath=>REQUIRES
+ Buildr::Java.java "com.cenqua.clover.reporters.html.HtmlReporter", "-i", DATABASE, "-o", "clover", :classpath=>REQUIRES
end
end
Modified: incubator/ode/trunk/tasks/hibernate.rake
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/tasks/hibernate.rake?view=diff&rev=532914&r1=532913&r2=532914
==============================================================================
--- incubator/ode/trunk/tasks/hibernate.rake (original)
+++ incubator/ode/trunk/tasks/hibernate.rake Thu Apr 26 16:48:42 2007
@@ -1,12 +1,13 @@
module Hibernate
- REQUIRES = OpenObject.new
- REQUIRES.collections = "commons-collections:commons-collections:jar:3.1"
- REQUIRES.logging = "commons-logging:commons-logging:jar:1.0.3"
- REQUIRES.dom4j = "dom4j:dom4j:jar:1.6.1"
- REQUIRES.hibernate = "org.hibernate:hibernate:jar:3.1.2"
- REQUIRES.xdoclet = Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module",
+ REQUIRES = Buildr.struct(
+ :collections => "commons-collections:commons-collections:jar:3.1",
+ :logging => "commons-logging:commons-logging:jar:1.0.3",
+ :dom4j => "dom4j:dom4j:jar:1.6.1",
+ :hibernate => "org.hibernate:hibernate:jar:3.1.2",
+ :xdoclet => Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module",
:under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"]
+ )
class << self
include Buildr::Ant
@@ -61,7 +62,7 @@
# This will download all the required artifacts before returning a classpath, and we want to do this only once.
def requires()
- @requires ||= Buildr.artifacts(REQUIRES.to_hash.values).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+ @requires ||= Buildr.artifacts(REQUIRES.to_a).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
end
end
Modified: incubator/ode/trunk/tasks/jdepend.rake
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/tasks/jdepend.rake?view=diff&rev=532914&r1=532913&r2=532914
==============================================================================
--- incubator/ode/trunk/tasks/jdepend.rake (original)
+++ incubator/ode/trunk/tasks/jdepend.rake Thu Apr 26 16:48:42 2007
@@ -3,9 +3,9 @@
REQUIRES = ["jdepend:jdepend:jar:2.9.1"]
task "jdepend" do
- paths = projects(:in=>self).map { |prj| prj.path_to("target/classes") }.each { |path| file(path).invoke }.
+ paths = Project.projects.map { |prj| prj.path_to("target/classes") }.each { |path| file(path).invoke }.
select { |path| File.exist?(path) }
- java "jdepend.swingui.JDepend", paths, :classpath=>REQUIRES
+ Buildr.java "jdepend.swingui.JDepend", paths, :classpath=>REQUIRES
end
end