svn commit: r1021485 - in /ode/trunk: Rakefile tasks/h2.rake tasks/ws-security.rake

[va...@apache.org]

Author: vanto
Date: Mon Oct 11 19:52:06 2010
New Revision: 1021485

URL: http://svn.apache.org/viewvc?rev=1021485&view=rev
Log:
upgrade to buildr 1.4.2

Modified:
    ode/trunk/Rakefile
    ode/trunk/tasks/h2.rake
    ode/trunk/tasks/ws-security.rake

Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1021485&r1=1021484&r2=1021485&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Mon Oct 11 19:52:06 2010
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-gem "buildr", "~>1.3"
+gem "buildr", "~>1.4"
 require "buildr"
 require "buildr/xmlbeans.rb"
 require "buildr/openjpa"
@@ -22,6 +22,12 @@ require "buildr/javacc"
 require "buildr/jetty"
 require "buildr/hibernate"
 
+Buildr.settings.build['jmock'] = "1.2.0"
+
+Buildr::Hibernate::REQUIRES[:xdoclet] = Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module", 
+ :under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"] 
+
+
 require File.join(File.dirname(__FILE__), 'repositories.rb')
 require File.join(File.dirname(__FILE__), 'dependencies.rb')
 
@@ -40,7 +46,8 @@ BUNDLE_VERSIONS = {
   "servicemix.shared.version" => "2009.02-SNAPSHOT",
   "servicemix.specs.version" => "1.4-SNAPSHOT",
 }
-Release.find.tag_name = lambda { |version| "APACHE_ODE_#{version.upcase}" } if Release.find
+
+Release.tag_name = lambda { |version| "APACHE_ODE_#{version.upcase}" } if Release
 
 desc "Apache ODE"
 define "ode" do
@@ -298,16 +305,12 @@ define "ode" do
     dao_hibernate = project("dao-hibernate").compile.target
     bpel_store = project("bpel-store").compile.target
 
-    Buildr::Hibernate::REQUIRES[:xdoclet] =  Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module",
+    hibernate_requires[:xdoclet] = Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module", 
       :under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"] + projects("dao-hibernate")
 
     export = lambda do |properties, source, target|
       file(target=>[properties, source]) do |task|
         mkpath File.dirname(target), :verbose=>false
-        # Protection against a buildr bug until the fix is released, avoids build failure
-
-        class << task ; attr_accessor :ant ; end
-        task.enhance { |task| task.ant = Buildr::Hibernate.schemaexport }
 
         hibernate_schemaexport target do |task, ant|
           ant.schemaexport(:properties=>properties.to_s, :quiet=>"yes", :text=>"yes", :delimiter=>";",
@@ -524,6 +527,8 @@ define "ode" do
      package(:jar).with :manifest=>_("src/main/resources/META-INF/MANIFEST.MF")
   end
 
+  package_with_sources
+  package_with_javadoc unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
 end
 
 define "apache-ode" do
@@ -604,12 +609,12 @@ define "apache-ode" do
     if File.exist?(".svn")
       `svn status -v`.reject { |l| l[0] == ?? || l[0] == ?D || l.strip.empty? || l[0...3] == "---"}.
         map { |l| l.split.last }.reject { |f| File.directory?(f) }.
-        each { |f| zip.include f, :as=>f }
+        each { |f| zip.include f, :as=>f.gsub("\\", "/") }
     else
       zip.include Dir.pwd, :as=>"."
     end
   end
 
-  package(:zip, :id=>"#{id}-docs").include(javadoc(project("ode").projects).target) unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
+  package(:zip, :id=>"#{id}-docs").include(doc.from(project("ode").projects).
+    using(:javadoc, :windowtitle=>"Apache ODE #{project.version}").target, :as=>"#{id}-docs-#{version}") unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
 end
-

Modified: ode/trunk/tasks/h2.rake
URL: http://svn.apache.org/viewvc/ode/trunk/tasks/h2.rake?rev=1021485&r1=1021484&r2=1021485&view=diff
==============================================================================
--- ode/trunk/tasks/h2.rake (original)
+++ ode/trunk/tasks/h2.rake Mon Oct 11 19:52:06 2010
@@ -33,7 +33,7 @@ module H2
       targetDir=File.expand_path(db)
       file(targetDir=>prereqs) do |task|
         rm_rf dbname if File.exist?(dbname)
-        Java::Commands.java "org.h2.tools.RunScript", "-url", "jdbc:h2:file:"+targetDir+File::Separator+dbname+";DB_CLOSE_ON_EXIT=false;user=sa", "-showResults", "-script", prereqs, :classpath => REQUIRES 
+        Java::Commands.java "org.h2.tools.RunScript", "-url", "jdbc:h2:file:"+Util.normalize_path("#{targetDir}/#{dbname}")+";DB_CLOSE_ON_EXIT=false;user=sa", "-showResults", "-script", prereqs, :classpath => REQUIRES
         #Buildr.filter(prereqs).into(dbname).run
         #touch task.name, :verbose=>false
       end

Modified: ode/trunk/tasks/ws-security.rake
URL: http://svn.apache.org/viewvc/ode/trunk/tasks/ws-security.rake?rev=1021485&r1=1021484&r2=1021485&view=diff
==============================================================================
--- ode/trunk/tasks/ws-security.rake (original)
+++ ode/trunk/tasks/ws-security.rake Mon Oct 11 19:52:06 2010
@@ -22,7 +22,7 @@ module WSSecurity
     def prepare_secure_services_tests(test_dir, file_pattern, modules)
       task(test_dir.to_sym) do
         # copy the required modules
-        mkdir "#{test_dir}/modules" unless File.directory? "#{test_dir}/modules"
+        mkdir_p "#{test_dir}/modules" unless File.directory? "#{test_dir}/modules"
         Buildr.artifacts(modules).each(&:invoke)
         cp modules.map {|a| Buildr.repositories.locate(a)} , "#{test_dir}/modules"
         # generate one process per test