You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2009/11/18 09:09:38 UTC
svn commit: r881696 - in /ode/branches/APACHE_ODE_1.X/tasks: derby.rake
jbi.rake
Author: rr
Date: Wed Nov 18 08:09:38 2009
New Revision: 881696
URL: http://svn.apache.org/viewvc?rev=881696&view=rev
Log:
ODE-702: Deprecation warnings from buildr 1.3.5 fix by Greg Lucas
Modified:
ode/branches/APACHE_ODE_1.X/tasks/derby.rake
ode/branches/APACHE_ODE_1.X/tasks/jbi.rake
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=881696&r1=881695&r2=881696&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/tasks/derby.rake (original)
+++ ode/branches/APACHE_ODE_1.X/tasks/derby.rake Wed Nov 18 08:09:38 2009
@@ -19,7 +19,7 @@
REQUIRES = Buildr.group("derby", "derbytools", :under=>"org.apache.derby", :version=>"10.1.2.1")
- Java.rjb.onload { Java.rjb.classpath << REQUIRES }
+ Java.classpath << REQUIRES
class << self
@@ -45,11 +45,6 @@
end
end
- protected
-
- # 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).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
- end
end
+
end
Modified: ode/branches/APACHE_ODE_1.X/tasks/jbi.rake
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/tasks/jbi.rake?rev=881696&r1=881695&r2=881696&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/tasks/jbi.rake (original)
+++ ode/branches/APACHE_ODE_1.X/tasks/jbi.rake Wed Nov 18 08:09:38 2009
@@ -145,14 +145,13 @@
class Project
- def package_as_jbi(file_name, options)
- # The file name extension is zip, not jbi. And we also need to reset
- # the type on the artifact specification.
- # The file type is ZIP, not JBI, so update the file name/spec accordingly.
- options[:type] = :zip
- file_name = path_to(:target, Artifact.hash_to_file_name(options))
- JBITask.define_task(file_name) unless Rake::Task.task_defined?(file_name)
- file(file_name)
+
+ def package_as_jbi(file_name) #:nodoc
+ JBITask.define_task(file_name)
+ end
+
+ def package_as_jbi_spec(spec) #:nodoc
+ spec.merge({ :type=>:zip })
end
end