buildr 1.3.5-java → 1.4.0-java

data/lib/buildr/java/jruby.rb

@@ -71,7 +71,7 @@ module Java
     def classpath
       @classpath ||= []
     end
-    
+
     # Most platforms requires tools.jar to be on the classpath, tools.jar contains the
     # Java compiler (OS X and AIX are two exceptions we know about, may be more).
     # Guess where tools.jar is from JAVA_HOME, which hopefully points to the JDK,
@@ -101,13 +101,13 @@ module Java
 
       # Most platforms requires tools.jar to be on the classpath.
       add_path[tools_jar] if tools_jar
-      
-      classpath.map! { |path| Proc === path ? path.call : path }      
+
+      classpath.map! { |path| Proc === path ? path.call : path }
       Buildr.artifacts(classpath).map(&:to_s).each do |path|
         file(path).invoke
         add_path[path]
       end
-      
+
       @loaded = true
       self
     end

data/lib/buildr/java/jtestr_runner.rb.erb

@@ -13,12 +13,12 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-#  ___   ___     _  _  ___ _____    ___ ___ ___ _____    _____ _  _ ___ ___ 
+#  ___   ___     _  _  ___ _____    ___ ___ ___ _____    _____ _  _ ___ ___
 # |   \ / _ \   | \| |/ _ \_   _|  | __|   \_ _|_   _|  |_   _| || |_ _/ __|
 # | |) | (_) |  | .` | (_) || |    | _|| |) | |  | |      | | | __ || |\__ \
 # |___/ \___/   |_|\_|\___/ |_|    |___|___/___| |_|      |_| |_||_|___|___/
-#                                                                          
-#  ___ ___ _    ___ 
+#
+#  ___ ___ _    ___
 # | __|_ _| |  | __|  CHANGES TO THIS FILE WILL BE LOST
 # | _| | || |__| _|   AUTO-GENERATED BY BUILDR on <%= Time.now %>
 # |_| |___|____|___|  PREFER TO EDIT JtestR CONFIGURATION FILE:
@@ -31,46 +31,46 @@ begin
   <%= dependencies.map(&:to_s).inspect %>.each { |dep| $CLASSPATH << dep }
   <%= runner.gems.inspect %>.each { |ary| JRuby.gem(*ary.flatten) }
   <%= runner.requires.inspect %>.each { |rb| Kernel.require rb }
-  
+
   jtestr = JtestR::TestRunner.new
-  
+
   class << jtestr
     def config(&block)
       @config_blocks ||= []
       @config_blocks << block if block
       @config_blocks
     end
-    
+
     def load_configuration
       super
       config.each { |block| @configuration.instance_eval(&block) }
     end
   end
-  
-  jtestr.config do 
+
+  jtestr.config do
     classpath [] # already loaded
     add_common_classpath false
-    
+
     <% ts = ( @jtestr_tests[:junit] & tests ).map { |c| 'Java.' + c } %>
     junit [<%= ts.join(', ') %>]
-    
+
     <% ts = ( @jtestr_tests[:testng] & tests ).map { |c| 'Java.' + c } %>
     testng [<%= ts.join(', ') %>]
-    
+
     <% ts = @jtestr_tests[:testunit] & tests %>
     test_unit <%= ts.inspect %>
-      
+
     <% ts = @jtestr_tests[:story] & tests %>
     story <%= ts.inspect %>
-      
+
     <% ts = @jtestr_tests[:rspec] & tests %>
     rspec <%= ts.inspect %>
-      
+
     <% ts = @jtestr_tests[:expect] & tests %>
     expectations <%= ts.inspect %>
-      
+
     ignore __FILE__
-  
+
     if File.file?(<%= user_config.inspect %>)
       ignore <%= user_config.inspect %>
       load <%= user_config.inspect %>
@@ -86,21 +86,23 @@ begin
   <% else %>
      output = STDOUT
   <% end %>
-  
-  
+
+
   args = [ '<%= spec_dir %>', # the directory to search for jtestr files
-           JtestR::SimpleLogger::ERR, # log level
-           JtestR::GenericResultHandler::QUIET, #output level 
+           JtestR::SimpleLogger::ERR, # log level (DEBUG/WARN/ERR)
+           JtestR::GenericResultHandler::QUIET, #output level (QUIET/VERBOSE)
            fake_out, # output STDOUT
-           [], # groups to run 
+           [], # groups to run
+           # Use JtestR::GenericResultHandler for debugging
            Buildr::TestFramework::TestResult::RSpecResultHandler, # result handler
            []  # classpath
          ]
-  
+
   argv = <%= runner.rspec.inspect %> || []
   argv.push *<%= tests.inspect %>
   Buildr::TestFramework::TestResult::RSpecResultHandler.init(argv, output, output)
-  
+  Buildr::TestFramework::TestResult::RSpecResultHandler.test_files = <%= tests.inspect %>
+
   jtestr.run *args
 
 rescue => e
@@ -109,8 +111,8 @@ rescue => e
 end
 
 exit 0 # let buildr find the erros from the result yaml
-  
+
 # Local Variables:
 # mode: ruby
 # End:
-  
+

data/lib/buildr/java/org/apache/buildr/JavaTestFilter.java

@@ -116,11 +116,16 @@ public class JavaTestFilter {
   }
 
 
-  public String[] filter(String[] names) throws ClassNotFoundException {
+  public String[] filter(String[] names) throws Throwable {
     Vector testCases = new Vector();
     for (int i = names.length ; i-- > 0 ;) {
-      Class cls = _loader.loadClass(names[i]);
-      if (isTest(cls)) { testCases.add(names[i]); }
+      try {
+        Class cls = _loader.loadClass(names[i]);
+        if (isTest(cls)) { testCases.add(names[i]); }
+      } catch (Throwable e) {
+        System.err.println("JavaTestFilter: Unable to load class "+names[i]+" to determine testing ability");
+        throw e;
+      }
     }
     String[] result = new String[testCases.size()];
     testCases.toArray(result);

data/lib/buildr/java/packaging.rb

@@ -166,18 +166,19 @@ module Buildr
             @prerequisites << manifest if String === manifest || Rake::Task === manifest
             [meta_inf].flatten.map { |file| file.to_s }.uniq.each { |file| path('META-INF').include file }
           end
-        
+
           enhance do
             if manifest
               # Tempfiles gets deleted on garbage collection, so we're going to hold on to it
               # through instance variable not closure variable.
               @manifest_tmp = Tempfile.new('MANIFEST.MF')
+              File.chmod 0644, @manifest_tmp.path
               self.manifest = File.read(manifest.to_s) if String === manifest || Rake::Task === manifest
               self.manifest = Manifest.new(manifest) unless Manifest === manifest
               #@manifest_tmp.write Manifest::STANDARD_HEADER
               @manifest_tmp.write manifest.to_s
               @manifest_tmp.write "\n"
-              @manifest_tmp.rewind
+              @manifest_tmp.close
               path('META-INF').include @manifest_tmp.path, :as=>'MANIFEST.MF'
             end
           end
@@ -217,7 +218,7 @@ module Buildr
         # :call-seq:
         #   with(options) => self
         #
-        # Additional 
+        # Additional
         # Pass options to the task. Returns self. ZipTask itself does not support any options,
         # but other tasks (e.g. JarTask, WarTask) do.
         #
@@ -225,7 +226,8 @@ module Buildr
         #   package(:jar).with(:manifest=>'MANIFEST_MF')
         def with(*args)
           super args.pop if Hash === args.last
-          include :from=>args
+          fail "package.with() should not contain nil values" if args.include? nil
+          include :from=>args if args.size > 0
           self
         end
 
@@ -267,7 +269,7 @@ module Buildr
         def classes=(value) #:nodoc:
           @classes = [value].flatten.map { |dir| file(dir.to_s) }
         end
-  
+
       end
 
 
@@ -340,18 +342,18 @@ module Buildr
       # * :map -- A Hash used to map component type to paths within the EAR.
       #     By default each component type is mapped to a directory with the same name,
       #     for example, EJBs are stored in the /ejb path.  To customize:
-      #                       package(:ear).map[:war] = 'web-applications' 
+      #                       package(:ear).map[:war] = 'web-applications'
       #                       package(:ear).map[:lib] = nil # store shared libraries on root of archive
       #
       # EAR components are added by means of the EarTask#add, EarTask#<<, EarTask#push methods
-      # Component type is determined from the artifact's type. 
+      # Component type is determined from the artifact's type.
       #
       #      package(:ear) << project('coolWebService').package(:war)
       #
       # The << method is just an alias for push, with the later you can add multiple components
-      # at the same time. For example.. 
+      # at the same time. For example..
       #
-      #      package(:ear).push 'org.springframework:spring:jar:2.6', 
+      #      package(:ear).push 'org.springframework:spring:jar:2.6',
       #                                   projects('reflectUtils', 'springUtils'),
       #                                   project('coolerWebService').package(:war)
       #
@@ -363,7 +365,7 @@ module Buildr
       #
       #      # will add an ejb entry for the-cool-ejb-2.5.jar in application.xml
       #      package(:ear).add 'org.coolguys:the-cool-ejb:jar:2.5', :type=>:ejb
-      #      # A better syntax for this is: 
+      #      # A better syntax for this is:
       #      package(:ear).add :ejb=>'org.coolguys:the-cool-ejb:jar:2.5'
       #
       # By default, every JAR package is assumed to be a library component, so you need to specify
@@ -372,13 +374,13 @@ module Buildr
       # For WebApplications (:war)s, you can customize the context-root that appears in application.xml.
       # The following example also specifies a different directory inside the EAR where to store the webapp.
       #
-      #      package(:ear).add project(:remoteService).package(:war), 
+      #      package(:ear).add project(:remoteService).package(:war),
       #                                 :path=>'web-services', :context_root=>'/Some/URL/Path'
       #
       # [1] http://java.sun.com/j2ee/sdk_1.2.1/techdocs/guides/ejb/html/Overview5.html#10106
       # [2] http://java.sun.com/j2ee/verified/packaging.html
       class EarTask < JarTask
-        
+
         SUPPORTED_TYPES = [:war, :ejb, :jar, :rar, :lib]
 
         # The display-name entry for application.xml
@@ -416,7 +418,7 @@ module Buildr
               rescue # not an artifact spec, it must me a filename
                 file(pkg)
               end
-            else 
+            else
               raise "Invalid EAR component #{pkg.class}: #{pkg}"
             end
           end
@@ -438,7 +440,7 @@ module Buildr
               end
               raise "Unknown EAR component type: #{type}. Perhaps you may explicity tell what component type to use." unless
                 SUPPORTED_TYPES.include?(type)
-              component = options.merge(:artifact => artifact, :type => type, 
+              component = options.merge(:artifact => artifact, :type => type,
                 :id=>artifact.respond_to?(:to_spec) ? artifact.id : artifact.to_s.pathmap('%n'),
                 :path=>options[:path] || dirs[type].to_s)
               component[:clone] = component_clone(component) unless :lib == type
@@ -448,7 +450,7 @@ module Buildr
           end
           self
         end
-        
+
         alias_method :push, :add
         alias_method :<<, :push
 
@@ -482,7 +484,7 @@ module Buildr
 
         def update_classpath(component)
           package = file(component[:artifact].to_s)
-          package.manifest = (package.manifest || {}).dup # avoid mofifying parent projects manifest  
+          package.manifest = (package.manifest || {}).dup # avoid mofifying parent projects manifest
           package.prepare do
             header = case package.manifest
               when Hash then package.manifest
@@ -506,7 +508,7 @@ module Buildr
         def libs_classpath(component)
           from = component[:path]
           @classpath = @components.select { |comp| comp[:type] == :lib }.
-            map do |lib| 
+            map do |lib|
             basename = lib[:artifact].to_s.pathmap('%f')
             full_path = lib[:path].empty? ? basename : File.join(lib[:path], basename)
             Util.relative_path(full_path, from)
@@ -516,7 +518,7 @@ module Buildr
         def descriptor_xml
           buffer = ""
           xml = Builder::XmlMarkup.new(:target=>buffer, :indent => 2)
-          xml.declare! :DOCTYPE, :application, :PUBLIC, 
+          xml.declare! :DOCTYPE, :application, :PUBLIC,
           "-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN",
           "http://java.sun.com/j2ee/dtds/application_1_2.dtd"
           xml.application do
@@ -527,7 +529,7 @@ module Buildr
               case comp[:type]
               when :war
                 xml.module :id=>comp[:id] do
-                  xml.web do 
+                  xml.web do
                     xml.tag! 'web-uri', uri
                     xml.tag! 'context-root', File.join('', (comp[:context_root] || comp[:id])) unless comp[:context_root] == false
                   end
@@ -543,7 +545,7 @@ module Buildr
           end
           buffer
         end
-        
+
         # return a FileTask to build the ear application.xml file
         def descriptor
           return @descriptor if @descriptor
@@ -559,7 +561,7 @@ module Buildr
             def xml
               @xml ||= ear.send :descriptor_xml
             end
-            
+
             def needed?
               super || xml != File.read(self.to_s) rescue true
             end
@@ -567,18 +569,17 @@ module Buildr
           @descriptor.ear = self
           @descriptor
         end
-        
+
       end
 
 
       include Extension
 
-      before_define do |project|
-        ::Java.load
-        if project.parent && project.parent.manifest 
+      before_define(:package => :build) do |project|
+        if project.parent && project.parent.manifest
           project.manifest = project.parent.manifest.dup
         else
-          project.manifest = { 
+          project.manifest = {
             'Build-By'=>ENV['USER'], 'Build-Jdk'=>ENV_JAVA['java.version'],
             'Implementation-Title'=>project.comment || project.name,
             'Implementation-Version'=>project.version }
@@ -681,7 +682,7 @@ module Buildr
         Java::AarTask.define_task(file_name).tap do |aar|
           aar.with :manifest=>manifest, :meta_inf=>meta_inf
           aar.with :wsdls=>path_to(:source, :main, :axis2, '*.wsdl')
-          aar.with :services_xml=>path_to(:source, :main, :axis2, 'services.xml') 
+          aar.with :services_xml=>path_to(:source, :main, :axis2, 'services.xml')
           aar.with [compile.target, resources.target].compact
           aar.with :libs=>compile.dependencies
         end
@@ -700,8 +701,8 @@ module Buildr
 
       def package_as_javadoc(file_name) #:nodoc:
         ZipTask.define_task(file_name).tap do |zip|
-          zip.include :from=>javadoc.target
-          javadoc.options[:windowtitle] ||= project.comment || project.name
+          zip.include :from=>doc.target
+          doc.options[:windowtitle] ||= project.comment || project.name
         end
       end
 

data/lib/buildr/java/pom.rb

@@ -28,7 +28,7 @@ module Buildr
     attr_reader :parent
 
     class << self
-      
+
       # :call-seq:
       #   POM.load(arg)
       #
@@ -82,8 +82,8 @@ module Buildr
       unless depends = @depends_for_scopes[scopes]
         declared = project["dependencies"].first["dependency"] rescue nil
         depends = (declared || []).reject { |dep| value_of(dep["optional"]) =~ /true/ }.
-          map { |dep| 
-            spec = pom_to_hash(dep, properties) 
+          map { |dep|
+            spec = pom_to_hash(dep, properties)
             apply = managed(spec)
             spec = apply.merge(spec) if apply
 
@@ -93,7 +93,7 @@ module Buildr
 
               exclusions = dep["exclusions"]["exclusion"] rescue nil
               transitive_deps = POM.load(spec).dependencies(SCOPES_TRANSITIVE)
-              transitive_deps = transitive_deps.reject{|dep| 
+              transitive_deps = transitive_deps.reject{|dep|
                 exclusions.find {|ex| dep.index("#{dep['groupdId'].first}:#{dep['artifactId'].first}:") == 0}
               } if exclusions
 

data/lib/buildr/java/rjb.rb

@@ -71,13 +71,13 @@ module Java
     end
 
   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
     # artifacts.  Use when loading the extension to add any additional
     # libraries used by that extension.
@@ -87,7 +87,7 @@ module Java
     def classpath
       @classpath ||= []
     end
-    
+
     # Most platforms requires tools.jar to be on the classpath, tools.jar contains the
     # Java compiler (OS X and AIX are two exceptions we know about, may be more).
     # Guess where tools.jar is from JAVA_HOME, which hopefully points to the JDK,
@@ -99,7 +99,7 @@ module Java
           find { |path| File.exist?(path) }
       end
     end
-    
+
     # Loads the JVM and all the libraries listed on the classpath.  Call this
     # method before accessing any Java class, but only call it from methods
     # used in the build, giving the Buildfile a chance to load all extensions
@@ -107,14 +107,14 @@ module Java
     def load
       return self if @loaded
       classpath << tools_jar if tools_jar
-      
+
       classpath.map! { |path| Proc === path ? path.call : path }
       cp = Buildr.artifacts(classpath).map(&:to_s).each { |path| file(path).invoke }
       java_opts = (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split
       ::Rjb.load cp.join(File::PATH_SEPARATOR), java_opts
 
       props = ::Rjb.import('java.lang.System').getProperties
-      enum = props.propertyNames 
+      enum = props.propertyNames
       while enum.hasMoreElements
         name = enum.nextElement.toString
         ENV_JAVA[name] = props.getProperty(name)