ivy4r 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.7.2 / 2009-09-08
+
+* Fix bug for creating EARs. The package dependencies are added into the root directory
+  of the EAR.
+
 === 0.7.1 / 2009-08-24
 
 * Fix bug that manual added dependencies are overwritten for package task

data/lib/buildr/ivy_extension.rb

@@ -470,7 +470,7 @@ For more configuration options see IvyConfig.
             excludes = project.ivy.compile_exclude
             confs = [project.ivy.compile_conf].flatten
             if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
-              project.compile.with [project.compile.dependencies, deps].flatten
+              project.compile.with [deps, project.compile.dependencies].flatten
               info "Ivy adding compile dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
           end
@@ -482,7 +482,7 @@ For more configuration options see IvyConfig.
             excludes = project.ivy.test_exclude
             confs = [project.ivy.test_conf, project.ivy.compile_conf].flatten.uniq
             if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
-              project.test.with [project.test.dependencies, deps].flatten
+              project.test.with [deps, project.test.dependencies].flatten
               info "Ivy adding test dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
           end
@@ -515,16 +515,29 @@ For more configuration options see IvyConfig.
         end
 
         def add_prod_libs_to_distributeables(project)
-          pkgs = project.packages.find_all { |pkg| [:war, :ear].member? pkg.type }
+          pkgs = project.packages.find_all { |pkg| [:war].member? pkg.type }
           pkgs.each do |pkg|
-            name = "#{pkg.name}deps"
-            task = project.task name => project.ivy.file_project.task('ivy:resolve') do
+            task = project.task "#{pkg.name}deps" => project.ivy.file_project.task('ivy:resolve') do
+              includes = project.ivy.package_include
+              excludes = project.ivy.package_exclude
+              confs = project.ivy.package_conf
+              if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
+                pkg.with :libs => [deps, pkg.libs].flatten
+                info "Adding production libs from conf '#{confs.join(', ')}' to WAR '#{pkg.name}' in project '#{project.name}'"
+              end
+            end
+            project.task :build => task
+          end
+
+          pkgs = project.packages.find_all { |pkg| [:ear].member? pkg.type }
+          pkgs.each do |pkg|
+            task = project.task "#{pkg.name}deps" => project.ivy.file_project.task('ivy:resolve') do
               includes = project.ivy.package_include
               excludes = project.ivy.package_exclude
               confs = project.ivy.package_conf
               if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
-                pkg.with :libs => [pkg.libs, deps].flatten
-                info "Adding production libs from conf '#{confs.join(', ')}' to package '#{pkg.name}' in project '#{project.name}'"
+                pkg.add deps, :type => :lib, :path => ''
+                info "Adding production libs from conf '#{confs.join(', ')}' to EAR '#{pkg.name}' in project '#{project.name}'"
               end
             end
             project.task :build => task

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 
   # Set the ant home directory to load ant classes from if no custom __antwrap__ is provided
   # and the default provided ant version 1.7.1 should not be used.

metadata

@@ -89,14 +89,14 @@ requirements: []
 
 authors: 
 - Klaas Prause
-date: 2009-08-23 22:00:00 +00:00
+date: 2009-09-07 22:00:00 +00:00
 platform: ruby
 test_files: 
 - test/test_ivy4r.rb
 - test/ivy/test_target.rb
 - test/ivy/test_targets.rb
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 require_paths: 
 - lib
 dependencies: