buildr 1.4.7.pre2-java → 1.4.8-java

data/lib/buildr/ide/idea.rb

@@ -238,6 +238,114 @@ module Buildr
         @skip_content = true
       end
 
+      def add_gwt_facet(modules = {}, options = {})
+        name = options[:name] || "GWT"
+        settings =
+          {
+            :webFacet => "Web",
+            :compilerMaxHeapSize => "512",
+            :compilerParameters => "-draftCompile -localWorkers 2 -strict",
+            :gwtSdkUrl => "file://$GWT_TOOLS$",
+            :gwtScriptOutputStyle => "PRETTY"
+          }.merge(options[:settings] || {})
+
+        add_facet(name, "gwt") do |f|
+          f.configuration do |c|
+            settings.each_pair do |k, v|
+              c.setting :name => k.to_s, :value => v.to_s
+            end
+            c.packaging do |d|
+              modules.each_pair do |k, v|
+                d.module :name => k, :enabled => v
+              end
+            end
+          end
+        end
+      end
+
+      def add_web_facet(options = {})
+        name = options[:name] || "Web"
+        url_base = options[:url_base] || "/"
+        default_webroots = [buildr_project._(:source, :main, :webapp)]
+        webroots = options[:webroots] || default_webroots
+        default_web_xml = "#{buildr_project._(:source, :main, :webapp)}/WEB-INF/web.xml"
+        web_xml = options[:web_xml] || default_web_xml
+        version = options[:version] || "3.0"
+
+        add_facet(name, "web") do |f|
+          f.configuration do |c|
+            c.descriptors do |d|
+              if File.exist?(web_xml) || default_web_xml != web_xml
+                d.deploymentDescriptor :name => 'web.xml', :url => file_path(web_xml), :optional => "true", :version => version
+              end
+            end
+            c.webroots do |w|
+              webroots.each do |webroot|
+                w.root :url => file_path(webroot), :relative => url_base
+              end
+            end
+          end
+        end
+      end
+
+      def add_jruby_facet(options = {})
+        name = options[:name] || "JRuby"
+        jruby_version = options[:jruby_version] || "jruby-1.5.2-p249"
+        add_facet(name, "JRUBY") do |f|
+          f.configuration(:number => 0) do |c|
+            c.JRUBY_FACET_CONFIG_ID :NAME => "JRUBY_SDK_NAME", :VALUE => jruby_version
+          end
+        end
+      end
+
+      def add_jpa_facet(options = {})
+        name = options[:name] || "JPA"
+        factory_entry = options[:factory_entry] || buildr_project.name.to_s
+        validation_enabled = options[:validation_enabled].nil? ? true : options[:validation_enabled]
+        provider_enabled = options[:provider_enabled] || 'Hibernate'
+        default_persistence_xml = buildr_project._(:source, :main, :resources, "META-INF/persistence.xml")
+        persistence_xml = options[:persistence_xml] || default_persistence_xml
+        default_orm_xml = buildr_project._(:source, :main, :resources, "META-INF/orm.xml")
+        orm_xml = options[:orm_xml] || default_orm_xml
+        add_facet(name, "jpa") do |f|
+          f.configuration do |c|
+            c.setting :name => "validation-enabled", :value => validation_enabled
+            c.setting :name => "provider-name", :value => provider_enabled
+            c.tag!('datasource-mapping') do |ds|
+              ds.tag!('factory-entry', :name => factory_entry)
+            end
+            if File.exist?(persistence_xml) || default_persistence_xml != persistence_xml
+              c.deploymentDescriptor :name => 'persistence.xml', :url => file_path(persistence_xml)
+            end
+            if File.exist?(orm_xml) || default_orm_xml != orm_xml
+              c.deploymentDescriptor :name => 'orm.xml', :url => file_path(orm_xml)
+            end
+          end
+        end
+      end
+
+      def add_ejb_facet(options = {})
+        name = options[:name] || "EJB"
+        default_ejb_xml = buildr_project._(:source, :main, :resources, "WEB-INF/ejb-jar.xml")
+        ejb_xml = options[:ejb_xml] || default_ejb_xml
+        ejb_roots = options[:ejb_roots] || [buildr_project.compile.sources, buildr_project.resources.sources].flatten
+
+        add_facet(name, "ejb") do |facet|
+          facet.configuration do |c|
+            c.descriptors do |d|
+              if File.exist?(ejb_xml) || default_ejb_xml != ejb_xml
+                d.deploymentDescriptor :name => 'ejb-jar.xml', :url => file_path(ejb_xml)
+              end
+            end
+            c.ejbRoots do |e|
+              ejb_roots.each do |ejb_root|
+                e.root :url => file_path(ejb_root)
+              end
+            end
+          end
+        end
+      end
+
       protected
 
       def test_dependency_details
@@ -445,6 +553,153 @@ module Buildr
         end
       end
 
+      def add_exploded_war_artifact(project, options = {})
+        artifact_name = options[:name] || project.iml.id
+        build_on_make = options[:build_on_make].nil? ? false : options[:build_on_make]
+
+        add_artifact(artifact_name, "exploded-war", build_on_make) do |xml|
+          dependencies = (options[:dependencies] || ([project] + project.compile.dependencies)).flatten
+          libraries, projects = partition_dependencies(dependencies)
+
+          ## The content here can not be indented
+          output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
+          xml.tag!('output-path', output_dir)
+
+          xml.root :id => "root" do
+            xml.element :id => "directory", :name => "WEB-INF" do
+              xml.element :id => "directory", :name => "classes" do
+                projects.each do |p|
+                  xml.element :id => "module-output", :name => p.iml.id
+                end
+                if options[:enable_jpa]
+                  module_names = options[:jpa_module_names] || [project.iml.id]
+                  module_names.each do |module_name|
+                    facet_name = options[:jpa_facet_name] || "JPA"
+                    xml.element :id => "jpa-descriptors", :facet => "#{module_name}/jpa/#{facet_name}"
+                  end
+                end
+                if options[:enable_ejb]
+                  module_names = options[:ejb_module_names] || [project.iml.id]
+                  module_names.each do |module_name|
+                    facet_name = options[:ejb_facet_name] || "EJB"
+                    xml.element :id => "javaee-facet-resources", :facet => "#{module_name}/ejb/#{facet_name}"
+                  end
+                end
+              end
+              xml.element :id => "directory", :name => "lib" do
+                libraries.each(&:invoke).map(&:to_s).each do |dependency_path|
+                  xml.element :id => "file-copy", :path => resolve_path(dependency_path)
+                end
+              end
+            end
+
+            if options[:enable_war].nil? || options[:enable_war]
+              module_names = options[:war_module_names] || [project.iml.id]
+              module_names.each do |module_name|
+                facet_name = options[:war_facet_name] || "Web"
+                xml.element :id => "javaee-facet-resources", :facet => "#{module_name}/web/#{facet_name}"
+              end
+            end
+
+            if options[:enable_gwt]
+              module_names = options[:gwt_module_names] || [project.iml.id]
+              module_names.each do |module_name|
+                facet_name = options[:gwt_facet_name] || "GWT"
+                xml.element :id => "gwt-compiler-output", :facet => "#{module_name}/gwt/#{facet_name}"
+              end
+            end
+          end
+        end
+      end
+
+      def add_exploded_ear_artifact(project, options ={})
+
+        artifact_name = options[:name] || project.iml.id
+        build_on_make = options[:build_on_make].nil? ? true : options[:build_on_make]
+
+        add_artifact(artifact_name, "exploded-ear", build_on_make) do |xml|
+          dependencies = (options[:dependencies] || ([project] + project.compile.dependencies)).flatten
+          libraries, projects = partition_dependencies(dependencies)
+
+          ## The content here can not be indented
+          output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
+          xml.tag!('output-path', output_dir)
+
+          xml.root :id => "root" do
+
+            xml.element :id => "module-output", :name => project.iml.id
+
+            projects.each do |p|
+              xml.element :id => "directory", :name => p.iml.id do
+                xml.element :id => "module-output", :name => p.iml.id
+              end
+            end
+
+            xml.element :id => "directory", :name => "lib" do
+              libraries.each(&:invoke).map(&:to_s).each do |dependency_path|
+                xml.element :id => "file-copy", :path => resolve_path(dependency_path)
+              end
+            end
+
+          end
+        end
+      end
+
+      def add_exploded_ejb_artifact(project, options = {})
+
+        artifact_name = options[:name] || project.iml.id
+        build_on_make = options[:build_on_make].nil? ? true : options[:build_on_make]
+
+        add_artifact(artifact_name, "exploded-ejb", build_on_make) do |xml|
+          dependencies = (options[:dependencies] || ([project] + project.compile.dependencies)).flatten
+          libraries, projects = partition_dependencies(dependencies)
+
+          ## The content here can not be indented
+          output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
+          xml.tag!('output-path', output_dir)
+
+          xml.root :id => "root" do
+
+            xml.element :id => "module-output", :name => project.iml.id
+
+            if options[:enable_jpa]
+              module_names = options[:jpa_module_names] || [project.iml.id]
+              module_names.each do |module_name|
+                facet_name = options[:jpa_facet_name] || "JPA"
+                xml.element :id => "jpa-descriptors", :facet => "#{module_name}/jpa/#{facet_name}"
+              end
+            end
+
+            if options[:enable_ejb].nil? || options[:enable_ejb]
+              module_names = options[:ejb_module_names] || [project.iml.id]
+              module_names.each do |module_name|
+                facet_name = options[:ejb_facet_name] || "EJB"
+                xml.element :id => "javaee-facet-resources", :facet => "#{module_name}/ejb/#{facet_name}"
+              end
+            end
+
+          end
+        end
+      end
+
+
+      def add_gwt_configuration(launch_page, project, options = {})
+        name = options[:name] || "Run #{launch_page}"
+        shell_parameters = options[:shell_parameters] || ""
+        vm_parameters = options[:vm_parameters] || "-Xmx512m"
+
+        add_configuration(name, "GWT.ConfigurationType", "GWT Configuration") do |xml|
+          xml.module(:name => project.iml.id)
+          xml.option(:name => "RUN_PAGE", :value => launch_page)
+          xml.option(:name => "SHELL_PARAMETERS", :value => shell_parameters)
+          xml.option(:name => "VM_PARAMETERS", :value => vm_parameters)
+
+          xml.RunnerSettings(:RunnerId => "Run")
+          xml.ConfigurationWrapper(:RunnerId => "Run")
+          xml.method()
+        end
+      end
+
       protected
 
       def extension
@@ -509,7 +764,7 @@ module Buildr
               if subproject.iml.group == true
                 attribs[:group] = subproject.parent.name.gsub(':', '/')
               elsif !subproject.iml.group.nil?
-                attribs[:group] = subproject.group.to_s
+                attribs[:group] = subproject.iml.group.to_s
               end
               xml.module attribs
             end
@@ -544,6 +799,28 @@ module Buildr
       def resolve_path(path)
         resolve_path_from_base(path, "$PROJECT_DIR$")
       end
+
+    private
+
+      def partition_dependencies(dependencies)
+        libraries = []
+        projects = []
+
+        dependencies.each do |dependency|
+          artifacts = Buildr.artifacts(dependency)
+          artifacts_as_strings = artifacts.map(&:to_s)
+          project = Buildr.projects.detect do |project|
+            [project.packages, project.compile.target, project.resources.target, project.test.compile.target, project.test.resources.target].flatten.
+              detect { |component| artifacts_as_strings.include?(component.to_s) }
+          end
+          if project
+            projects << project
+          else
+            libraries += artifacts
+          end
+        end
+        return libraries.uniq, projects.uniq
+      end
     end
 
     module ProjectExtension

data/lib/buildr/java/ant.rb

@@ -22,7 +22,7 @@ module Buildr
   module Ant
 
     # Which version of Ant we're using by default.
-    VERSION = '1.8.0'
+    VERSION = '1.8.3'
 
     class << self
       # Current version of Ant being used.
@@ -34,8 +34,7 @@ module Buildr
       def dependencies
         # Ant-Trax required for running the JUnitReport task, and there's no other place
         # to put it but the root classpath.
-        @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}",
-          "org.apache.ant:ant-trax:jar:#{version}"]
+        @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}"]
       end
 
     private

data/lib/buildr/java/bdd.rb

@@ -115,7 +115,7 @@ module Buildr
     end
 
     def jruby_home
-      @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] :
+      @jruby_home ||= RUBY_PLATFORM =~ /java/ ? RbConfig::CONFIG['prefix'] :
         ( ENV['JRUBY_HOME'] || File.expand_path('~/.jruby') )
     end
 
@@ -166,7 +166,7 @@ module Buildr
        require 'jruby'
        def JRuby.gem(name, version = '>0', *args)
           require 'rbconfig'
-          jruby_home = Config::CONFIG['prefix']
+          jruby_home = RbConfig::CONFIG['prefix']
           expected_version = '#{TestFramework::JRubyBased.version}'
           unless JRUBY_VERSION >= expected_version
             fail "Expected JRuby version \#{expected_version} installed at \#{jruby_home} but got \#{JRUBY_VERSION}"
@@ -194,7 +194,7 @@ module Buildr
       runner.requires ||= []
       runner.requires.unshift File.join(File.dirname(__FILE__), 'test_result')
       runner.gems ||= {}
-      runner.rspec ||= ['--format', 'progress', '--format', "html:#{runner.html_report}"]
+      runner.rspec ||= ['--format', 'progress', '--format', 'documentation']
       runner.format.each { |format| runner.rspec << '--format' << format } if runner.format
       runner.rspec.push '--format', "Buildr::TestFramework::TestResult::YamlFormatter"
       runner.rspec.push '-o', runner.result
@@ -240,7 +240,7 @@ module Buildr
 
     def runner_config
       runner = super
-      runner.gems.update 'rspec' => '~> 2.1.0'
+      runner.gems.update 'rspec' => '~> 2.9.0'
       runner.requires.unshift 'rspec'
       runner
     end

data/lib/buildr/java/commands.rb

@@ -62,7 +62,7 @@ module Java
             # If our cmd line is longer, we create a batch file and execute it instead.
           if Util.win_os? &&  cmd_args.map(&:inspect).join(' ').size > 2048
             # remove '-classpath' and the classpath itself from the cmd line.
-            cp_i = cmd_args.index{|x| x.starts_with('-classpath')}
+            cp_i = cmd_args.index{|x| x.to_s =~ /^-classpath/}
             2.times do
               cmd_args.delete_at cp_i unless cp_i.nil?
             end

data/lib/buildr/java/pom.rb

@@ -103,10 +103,10 @@ module Buildr
             if options[:scopes].include?(spec[:scope])
               spec.delete(:scope)
 
-              exclusions = dep["exclusions"]["exclusion"] rescue nil
+              exclusions = dep["exclusions"].first["exclusion"] rescue nil
               transitive_deps = POM.load(spec).dependencies(options[:scopes_transitive] || SCOPES_TRANSITIVE)
               transitive_deps = transitive_deps.reject{|dep|
-                exclusions.find {|ex| dep.index("#{dep['groupdId'].first}:#{dep['artifactId'].first}:") == 0}
+                exclusions.find {|ex| dep.index("#{ex['groupId'].first}:#{ex['artifactId'].first}:") == 0}
               } if exclusions
 
               [Artifact.to_spec(spec)] + transitive_deps
@@ -130,7 +130,7 @@ module Buildr
           hash
         }
         props = project["properties"].first rescue {}
-        props = props.inject({}) { |mapped, pair| mapped[pair.first] = value_of(pair.last, pom) ; mapped }
+        props = props.inject({}) { |mapped, pair| mapped[pair.first] = value_of(pair.last, props) ; mapped }
         (parent ? parent.properties.merge(props) : props).merge(pom)
       end
     end
@@ -164,7 +164,8 @@ module Buildr
     # property substitution.
     def value_of(element, substitute = nil)
       value = element.to_a.join.strip
-      substitute ? value.gsub(/\$\{([^}]+)\}/) { |key| substitute[$1] } : value
+      value = value.gsub(/\$\{([^}]+)\}/) { |key| Array(substitute[$1]).join.strip } if substitute
+      value
     end
 
     # :call-seq:

data/lib/buildr/java/rjb.rb

@@ -13,6 +13,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+if RbConfig::CONFIG['host_os'] =~ /darwin/i
+  # On OS X we attempt to guess where JAVA_HOME is, if not set
+  # We set JAVA_HOME early so we can use it without calling Java.load first.
+  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home'
+end
 
 require 'rjb'
 
@@ -72,10 +77,6 @@ module Java
 
   end
 
-  # On OS X we know where the default JDK is. We can try to guess for other OS.
-  # We set JAVA_HOME early so we can use it without calling Java.load first.
-  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
-
   class << self
 
     # Returns the classpath, an array listing directories, JAR files and

data/lib/buildr/java/test_result.rb

@@ -13,6 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+# It is necessary to require these files here as the bdd plugin directly includes this file
+require 'yaml'
+require 'rspec/core/formatters/base_formatter'
+
 module Buildr #:nodoc:
   module TestFramework
 

data/lib/buildr/packaging/artifact.rb

@@ -814,7 +814,7 @@ module Buildr
   def transitive(*args)
     options = Hash === args.last ? args.pop : {}
     dep_opts = {
-      :scopes   => options[:scopes] || [nil, "compile", "runtime", "provided"],
+      :scopes   => options[:scopes] || [nil, "compile", "runtime"],
       :optional => options[:optional]
     }
     specs = args.flatten

data/lib/buildr/packaging/version_requirement.rb

@@ -49,7 +49,7 @@ module Buildr
     class << self
       # is +str+ a version string?
       def version?(str)
-        /^\s*\d[#{VER_CHARS}]*\s*$/ === str
+        /^\s*r?\d[#{VER_CHARS}]*\s*$/ === str
       end
 
       # is +str+ a version requirement?