You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2009/11/10 19:50:44 UTC
svn commit: r834595 - in /ode/branches/APACHE_ODE_1.X: Rakefile
dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
tasks/derby.rake tasks/nativedb.rake
Author: midon
Date: Tue Nov 10 18:50:44 2009
New Revision: 834595
URL: http://svn.apache.org/viewvc?rev=834595&view=rev
Log:
migrate to buildr 1.3.5
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
ode/branches/APACHE_ODE_1.X/tasks/derby.rake
ode/branches/APACHE_ODE_1.X/tasks/nativedb.rake
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=834595&r1=834594&r2=834595&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Tue Nov 10 18:50:44 2009
@@ -14,7 +14,7 @@
# limitations under the License.
#
-gem "buildr", "~>1.2.4"
+gem "buildr", "~>1.3"
require "buildr"
require "buildr/xmlbeans.rb"
require "buildr/openjpa"
@@ -24,7 +24,6 @@
# Keep this structure to allow the build system to update version numbers.
VERSION_NUMBER = "1.3.4-SNAPSHOT"
-NEXT_VERSION = "1.3.4"
ANNONGEN = "annogen:annogen:jar:0.1.0"
ANT = "ant:ant:jar:1.6.5"
@@ -149,16 +148,7 @@
repositories.remote << "http://ws.zones.apache.org/repository2"
repositories.release_to[:url] ||= "sftp://guest@localhost/home/guest"
-# Changing releases tag names
-class Release
- class << self
- def tag_with_apache_ode(version)
- tag_without_apache_ode("APACHE_ODE_#{version.upcase}")
- end
- alias_method_chain :tag, :apache_ode
- end
-end
-
+Release.find.tag_name = lambda { |version| "APACHE_ODE_#{version.upcase}" }
desc "Apache ODE"
#define "ode", :group=>"org.apache.ode", :version=>VERSION_NUMBER do
@@ -361,7 +351,7 @@
define "bpel-test" do
compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-runtime",
"bpel-store", "utils", "bpel-epr", "dao-jpa", "agents"),
- DERBY, Java::JUnit::JUNIT_REQUIRES, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient,
+ DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient,
COMMONS.codec
test.with projects("bpel-obj", "jacob", "bpel-schemas",
@@ -489,7 +479,6 @@
desc "ODE Jacob APR Code Generation"
define "jacob-ap" do
- compile.with Java.tools_jar
package :jar
end
@@ -570,7 +559,7 @@
desc "ODE Agents"
define "agents" do
compile
- package(:jar, :manifest=>_("target/classes/META-INF/MANIFEST.MF"))
+ package(:jar).with :manifest=>_("src/main/resources/META-INF/MANIFEST.MF")
end
end
Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java?rev=834595&r1=834594&r2=834595&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java Tue Nov 10 18:50:44 2009
@@ -38,7 +38,7 @@
* test that the result is the one expected would take a huge test database
* (with at least a process and an instance for every possible combination).
*/
-public class BaseTestDAO extends TestCase {
+public abstract class BaseTestDAO extends TestCase {
protected BpelDAOConnection daoConn;
private TransactionManager txm;
Modified: ode/branches/APACHE_ODE_1.X/tasks/derby.rake
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/tasks/derby.rake?rev=834595&r1=834594&r2=834595&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/tasks/derby.rake (original)
+++ ode/branches/APACHE_ODE_1.X/tasks/derby.rake Tue Nov 10 18:50:44 2009
@@ -29,7 +29,7 @@
# For example:
# Derby.create "mydb"=>derby.sql
def create(args)
- db, prereqs = Rake.application.resolve_args(args)
+ db, prereqs = args.keys.first, args.values.first
file(File.expand_path(db)=>prereqs) do |task|
rm_rf task.name if File.exist?(task.name)
Buildr.ant("derby") do |ant|
Modified: ode/branches/APACHE_ODE_1.X/tasks/nativedb.rake
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/tasks/nativedb.rake?rev=834595&r1=834594&r2=834595&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/tasks/nativedb.rake (original)
+++ ode/branches/APACHE_ODE_1.X/tasks/nativedb.rake Tue Nov 10 18:50:44 2009
@@ -42,7 +42,7 @@
def create_hib_db(name, args)
if File.exist? SETTINGS
require SETTINGS
- db, dbprops = Rake.application.resolve_args(args)
+ db, dbprops = args.keys.first, args.values.first
file(File.expand_path(db)) do |task|
puts "Creating(preparing) database: #{db}."
rm_rf task.name if File.exist?(task.name)
@@ -67,7 +67,7 @@
def create_jpa_db(base, name, args)
if File.exist? SETTINGS
require SETTINGS
- db, dbprops = Rake.application.resolve_args(args)
+ db, dbprops = args.keys.first, args.values.first
file(File.expand_path(db)) do |task|
puts "Creating(preparing) database: #{db}."
rm_rf task.name if File.exist?(task.name)