buildr 1.4.1-x86-mswin32 → 1.4.2-x86-mswin32

data/lib/buildr/java/commands.rb

@@ -42,7 +42,7 @@ module Java
       # * :verbose -- If true, prints the command and all its argument.
       def java(*args, &block)
         options = Hash === args.last ? args.pop : {}
-        options[:verbose] ||= Buildr.application.options.trace || false
+        options[:verbose] ||= trace?(:java)
         rake_check_options options, :classpath, :java_args, :properties, :name, :verbose
 
         name = options[:name]
@@ -51,8 +51,8 @@ module Java
         end
 
         cmd_args = [path_to_bin('java')]
-        classpath = classpath_from(options)
-        cmd_args << '-classpath' << classpath.join(File::PATH_SEPARATOR) unless classpath.empty?
+        cp = classpath_from(options)
+        cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR) unless cp.empty?
         options[:properties].each { |k, v| cmd_args << "-D#{k}=#{v}" } if options[:properties]
         cmd_args += (options[:java_args] || (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split).flatten
         cmd_args += args.flatten.compact
@@ -84,23 +84,21 @@ module Java
 
         files = args.flatten.map(&:to_s).
           collect { |arg| File.directory?(arg) ? FileList["#{arg}/**/*.java"] : arg }.flatten
-        cmd_args = [ Buildr.application.options.trace ? '-verbose' : '-nowarn' ]
+        cmd_args = [ trace?(:apt) ? '-verbose' : '-nowarn' ]
         if options[:compile]
           cmd_args << '-d' << options[:output].to_s
         else
           cmd_args << '-nocompile' << '-s' << options[:output].to_s
         end
         cmd_args << '-source' << options[:source] if options[:source]
-        classpath = classpath_from(options)
-        tools = Java.tools_jar
-        classpath << tools if tools
-        cmd_args << '-classpath' << classpath.join(File::PATH_SEPARATOR) unless classpath.empty?
+        cp = classpath_from(options)
+        cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR) unless cp.empty?
         cmd_args += files
         unless Buildr.application.options.dryrun
           info 'Running apt'
           trace (['apt'] + cmd_args).join(' ')
           Java.load
-          Java.com.sun.tools.apt.Main.process(cmd_args.to_java(Java.java.lang.String)) == 0 or
+          ::Java::com.sun.tools.apt.Main.process(cmd_args.to_java(::Java::java.lang.String)) == 0 or
             fail 'Failed to process annotations, see errors above'
         end
       end
@@ -122,21 +120,22 @@ module Java
         rake_check_options options, :classpath, :sourcepath, :output, :javac_args, :name
 
         files = args.flatten.each { |f| f.invoke if f.respond_to?(:invoke) }.map(&:to_s).
-          collect { |arg| File.directory?(arg) ? FileList["#{arg}/**/*.java"] : arg }.flatten
+          collect { |arg| File.directory?(arg) ? FileList["#{File.expand_path(arg)}/**/*.java"] : File.expand_path(arg) }.flatten
         name = options[:name] || Dir.pwd
 
         cmd_args = []
-        classpath = classpath_from(options)
-        cmd_args << '-classpath' << classpath.join(File::PATH_SEPARATOR) unless classpath.empty?
-        cmd_args << '-sourcepath' << options[:sourcepath].join(File::PATH_SEPARATOR) if options[:sourcepath]
-        cmd_args << '-d' << options[:output].to_s if options[:output]
+        cp = classpath_from(options)
+        cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR) unless cp.empty?
+        cmd_args << '-sourcepath' << [options[:sourcepath]].flatten.join(File::PATH_SEPARATOR) if options[:sourcepath]
+        cmd_args << '-d' << File.expand_path(options[:output].to_s) if options[:output]
         cmd_args += options[:javac_args].flatten if options[:javac_args]
         cmd_args += files
         unless Buildr.application.options.dryrun
+          mkdir_p options[:output] if options[:output]
           info "Compiling #{files.size} source files in #{name}"
           trace (['javac'] + cmd_args).join(' ')
           Java.load
-          Java.com.sun.tools.javac.Main.compile(cmd_args.to_java(Java.java.lang.String)) == 0 or
+          ::Java::com.sun.tools.javac.Main.compile(cmd_args.to_java(::Java::java.lang.String)) == 0 or
             fail 'Failed to compile, see errors above'
         end
       end
@@ -159,8 +158,9 @@ module Java
       # * array -- Option with set of values separated by spaces.
       def javadoc(*args)
         options = Hash === args.last ? args.pop : {}
-
-        cmd_args = [ '-d', options[:output], Buildr.application.options.trace ? '-verbose' : '-quiet' ]
+        fail "No output defined for javadoc" if options[:output].nil?
+        options[:output] = File.expand_path(options[:output].to_s)
+        cmd_args = [ '-d', options[:output], trace?(:javadoc) ? '-verbose' : '-quiet' ]
         options.reject { |key, value| [:output, :name, :sourcepath, :classpath].include?(key) }.
           each { |key, value| value.invoke if value.respond_to?(:invoke) }.
           each do |key, value|
@@ -180,13 +180,14 @@ module Java
             cmd_args << "-#{option}" << paths.flatten.map(&:to_s).join(File::PATH_SEPARATOR) unless paths.empty?
           end
         end
-        cmd_args += args.flatten.uniq
+        files = args.each {|arg| arg.invoke if arg.respond_to?(:invoke)}.collect {|arg| arg.is_a?(Project) ? arg.compile.sources.collect{|dir| Dir["#{File.expand_path(dir.to_s)}/**/*.java"]} : File.expand_path(arg.to_s) }
+        cmd_args += files.flatten.uniq.map(&:to_s)
         name = options[:name] || Dir.pwd
         unless Buildr.application.options.dryrun
           info "Generating Javadoc for #{name}"
           trace (['javadoc'] + cmd_args).join(' ')
           Java.load
-          Java.com.sun.tools.javadoc.Main.execute(cmd_args.to_java(Java.java.lang.String)) == 0 or
+          ::Java::com.sun.tools.javadoc.Main.execute(cmd_args.to_java(::Java::java.lang.String)) == 0 or
             fail 'Failed to generate Javadocs, see errors above'
         end
       end
@@ -199,9 +200,9 @@ module Java
       # Returns the path to the specified Java command (with no argument to java itself).
       def path_to_bin(name = nil)
         home = ENV['JAVA_HOME'] or fail 'Are we forgetting something? JAVA_HOME not set.'
-        bin = File.expand_path(File.join(home, 'bin'))
+        bin = Util.normalize_path(File.join(home, 'bin'))
         fail 'JAVA_HOME environment variable does not point to a valid JRE/JDK installation.' unless File.exist? bin
-        File.expand_path(File.join(bin, name.to_s))
+        Util.normalize_path(File.join(bin, name.to_s))
       end
 
       # :call-seq:

data/lib/buildr/java/compiler.rb

@@ -76,7 +76,7 @@ module Buildr
       def javac_args #:nodoc:
         args = []
         args << '-nowarn' unless options[:warnings]
-        args << '-verbose' if Buildr.application.options.trace
+        args << '-verbose' if trace? :javac
         args << '-g' if options[:debug]
         args << '-deprecation' if options[:deprecation]
         args << '-source' << options[:source].to_s if options[:source]
@@ -109,7 +109,7 @@ module Buildr
     def apt(*sources)
       sources = compile.sources if sources.empty?
       file(path_to(:target, 'generated/apt')=>sources) do |task|
-        cmd_args = [ Buildr.application.options.trace ? '-verbose' : '-nowarn' ]
+        cmd_args = [ trace?(:apt) ? '-verbose' : '-nowarn' ]
         cmd_args << '-nocompile' << '-s' << task.name
         cmd_args << '-source' << compile.options.source if compile.options.source
         classpath = Buildr.artifacts(compile.dependencies).map(&:to_s).each { |t| task(t).invoke }

data/lib/buildr/java/doc.rb

@@ -34,7 +34,7 @@ module Buildr
       specify :language => :java, :source_ext => 'java'
 
       def generate(sources, target, options = {})
-        cmd_args = [ '-d', target, Buildr.application.options.trace ? '-verbose' : '-quiet' ]
+        cmd_args = [ '-d', target, trace?(:javadoc) ? '-verbose' : '-quiet' ]
         options.reject { |key, value| [:sourcepath, :classpath].include?(key) }.
           each { |key, value| value.invoke if value.respond_to?(:invoke) }.
           each do |key, value|

data/lib/buildr/java/ecj.rb

@@ -0,0 +1,71 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr
+  module Compiler
+
+    class Ecj < Javac
+
+      OPTIONS = Buildr::Compiler::Javac::OPTIONS
+
+      specify :language=>:java, :sources => 'java', :source_ext => 'java',
+      :target=>'classes', :target_ext=>'class', :packaging=>:jar
+
+
+
+      def compile(sources, target, dependencies) #:nodoc:
+        check_options options, OPTIONS
+        cmd_args = []
+        # tools.jar contains the Java compiler.
+        dependencies << Java.tools_jar if Java.tools_jar
+        cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR) unless dependencies.empty?
+        source_paths = sources.select { |source| File.directory?(source) }
+        cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
+        cmd_args << '-d' << File.expand_path(target)
+        cmd_args += ecj_args
+        cmd_args += files_from_sources(sources)
+        unless Buildr.application.options.dryrun
+          trace((%w[javac -classpath org.eclipse.jdt.internal.compiler.batch.Main] + cmd_args).join(' '))
+          Java.load
+          Java.org.eclipse.jdt.internal.compiler.batch.Main.compile(cmd_args.join(" ")) or
+          fail 'Failed to compile, see errors above'
+        end
+      end
+
+      private
+
+      # See arg list here: http://publib.boulder.ibm.com/infocenter/rsahelp/v7r0m0/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_api_compile.htm
+      def ecj_args #:nodoc:
+        args = []
+        args << '-warn:none' unless options[:warnings]
+        args << '-verbose' if trace?(:ecj)
+        args << '-g' if options[:debug]
+        args << '-deprecation' if options[:deprecation]
+        args << '-source' << options[:source].to_s if options[:source]
+        args << '-target' << options[:target].to_s if options[:target]
+        case options[:lint]
+        when Array  then args << "-Xlint:#{options[:lint].join(',')}"
+        when String then args << "-Xlint:#{options[:lint]}"
+        when true   then args << '-Xlint'
+        end
+        args + Array(options[:other])
+      end
+    end
+  end
+end
+
+Java.classpath << "org.eclipse.jdt.core.compiler:ecj:jar:3.5.1"
+# Adding ecj before javac
+Buildr::Compiler.compilers.unshift Buildr::Compiler::Ecj

data/lib/buildr/java/emma.rb

@@ -62,7 +62,7 @@ module Buildr
         Buildr.ant 'emma' do |ant|
           ant.taskdef :resource=>'emma_ant.properties',
             :classpath=>Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
-          ant.emma :verbosity=>(Buildr.application.options.trace ? 'verbose' : 'warning') do
+          ant.emma :verbosity=>(trace?(:emma) ? 'verbose' : 'warning') do
             yield ant
           end
         end

data/lib/buildr/java/external.rb

@@ -16,13 +16,13 @@
 module Buildr
   module Compiler
     class ExternalJavac< Buildr::Compiler::Javac
-      
+
       OPTIONS = [:jvm, :warnings, :debug, :deprecation, :source, :target, :lint, :other]
-    
+
       specify :language=>:java, :sources => 'java', :source_ext => 'java',
               :target=>'classes', :target_ext=>'class', :packaging=>:jar
-              
-              
+
+
       def compile(sources, target, dependencies) #:nodoc:
         check_options options, OPTIONS
         cmd_args = []
@@ -47,12 +47,12 @@ module Buildr
       end
 
       private
-      
+
       # See arg list here: http://publib.boulder.ibm.com/infocenter/rsahelp/v7r0m0/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_api_compile.htm
       def externaljavac_args #:nodoc:
-        args = []  
+        args = []
         args << '-nowarn' unless options[:warnings]
-        args << '-verbose' if Buildr.application.options.trace
+        args << '-verbose' if trace?(:javac)
         args << '-g' if options[:debug]
         args << '-deprecation' if options[:deprecation]
         args << '-source' << options[:source].to_s if options[:source]
@@ -64,9 +64,9 @@ module Buildr
         end
         args + Array(options[:other])
       end
-      
+
     end
-    
+
   end
 end
 

data/lib/buildr/java/jruby.rb

@@ -59,6 +59,11 @@ module Java
   # Since we already have a JVM loaded, we can use it to guess where JAVA_HOME is.
   # We set JAVA_HOME early so we can use it without calling Java.load first.
   ENV['JAVA_HOME'] ||= java.lang.System.getProperty("java.home")
+  
+  # This version is the minimal version Buildr will support.
+  # Any older version of JRuby will raise an exception.
+  JRUBY_MIN_VERSION = '1.5.1' 
+  raise "JRuby must be at least at version #{JRUBY_MIN_VERSION}" unless JRUBY_VERSION >= JRUBY_MIN_VERSION
 
   class << self
 

data/lib/buildr/java/packaging.rb

@@ -256,8 +256,9 @@ module Buildr
           super
           @classes = []
           @libs = []
-          prepare do
-            @classes.to_a.flatten.each { |classes| path('WEB-INF/classes').include classes, :as=>'.' }
+          enhance do |war|
+            @libs.each {|lib| lib.invoke}
+            @classes.to_a.flatten.each { |classes| include classes, :as => 'WEB-INF/classes' }
             path('WEB-INF/lib').include Buildr.artifacts(@libs) unless @libs.nil? || @libs.empty?
           end
         end
@@ -607,7 +608,7 @@ module Buildr
       # Call this when you want the project (and all its sub-projects) to create a source distribution.
       # You can use the source distribution in an IDE when debugging.
       #
-      # A source distribution is a ZIP package with the classifier 'sources', which includes all the
+      # A source distribution is a jar package with the classifier 'sources', which includes all the
       # sources used by the compile task.
       #
       # Packages use the project's manifest and meta_inf properties, which you can override by passing

data/lib/buildr/java/rjb.rb

@@ -134,12 +134,10 @@ module Java
   private
 
     def __package__(name) #:nodoc:
-      const = name.split('.').map { |part| part.gsub(/^./) { |char| char.upcase } }.join
-      return const_get(const) if constants.include?(const) || constants.include?(const.to_sym)
-      package = Module.new
-      package.extend Package
-      package.instance_variable_set :@name, name
-      const_set(const, package)
+      Module.new.tap do |m|
+        m.extend Package
+        m.instance_variable_set :@name, name
+      end
     end
 
   end

data/lib/buildr/java/tests.rb

@@ -219,10 +219,15 @@ module Buildr
     end
 
     def tests(dependencies) #:nodoc:
-      filter_classes(dependencies,
-                     :interfaces => %w{junit.framework.TestCase},
-                     :class_annotations => %w{org.junit.runner.RunWith},
-                     :method_annotations => %w{org.junit.Test})
+      if (self.class.version[0,1].to_i < 4)
+        filter_classes(dependencies, :interfaces => %w{junit.framework.TestCase})
+      else
+        filter_classes(dependencies,
+                       :interfaces => %w{junit.framework.TestCase},
+                       :class_annotations => %w{org.junit.runner.RunWith},
+                       :method_annotations => %w{org.junit.Test})
+      end
+      
     end
 
     def run(tests, dependencies) #:nodoc:

data/lib/buildr/packaging/archive.rb

@@ -202,6 +202,7 @@ module Buildr
     end
 
     def include_as(source, as)
+        
         @sources << proc { source }
         @actions << proc do |file_map|
           file = source.to_s
@@ -216,11 +217,14 @@ module Buildr
                   file_map[dest] = file
                 end
               end
-            end
-            unless as == "."
-              trace "Adding #{@path}#{as}"
+              unless as == "."
+                trace "Adding #{@path}#{as}/"
+                file_map["#{@path}#{as}/"] = file #as is a folder, so the trailing / is required.
+              end
+            else
               file_map["#{@path}#{as}"] = file
             end
+            
           end
         end
       end

data/lib/buildr/packaging/artifact.rb

@@ -17,6 +17,7 @@
 require 'buildr/core/project'
 require 'buildr/core/transports'
 require 'buildr/packaging/artifact_namespace'
+require 'fileutils'
 
 
 module Buildr
@@ -27,6 +28,9 @@ module Buildr
   desc "Download all artifacts' sources"
   task 'artifacts:sources'
 
+  desc "Download all artifacts' javadoc"
+  task 'artifacts:javadoc'
+
   # Mixin with a task to make it behave like an artifact. Implemented by the packaging tasks.
   #
   # An artifact has an identifier, group identifier, type, version number and
@@ -41,7 +45,7 @@ module Buildr
 
     class << self
     private
-    
+
       # :stopdoc:
       def included(mod)
         mod.extend self
@@ -60,7 +64,7 @@ module Buildr
         base.instance_eval { alias :uninstall :uninstall_old } if base.respond_to? :uninstall_old
         base.instance_eval { alias :upload :upload_old       } if base.respond_to? :upload_old
       end
-      
+
       # :startdoc:
     end
 
@@ -126,6 +130,17 @@ module Buildr
       sources_task
     end
 
+    # :call-seq:
+    #   javadoc_artifact => Artifact
+    #
+    # Convenience method that returns the associated javadoc artifact
+    def javadoc_artifact
+      javadoc_spec = to_spec_hash.merge(:classifier=>'javadoc')
+      javadoc_task = OptionalArtifact.define_task(Buildr.repositories.locate(javadoc_spec))
+      javadoc_task.send :apply_spec, javadoc_spec
+      javadoc_task
+    end
+
     # :call-seq:
     #   pom_xml => string
     #
@@ -143,13 +158,16 @@ module Buildr
     end
 
     def install
-      pom.install if pom && pom != self
       invoke
-      installed = Buildr.repositories.locate(self)
-      unless installed == name # If not already in local repository.
-        mkpath File.dirname(installed)
-        cp name, installed
-        info "Installed #{installed}"
+      in_local_repository = Buildr.repositories.locate(self)
+      if name != in_local_repository
+        if pom && pom != self
+          pom.invoke
+          pom.install
+        end
+        mkpath File.dirname(in_local_repository)
+        cp name, in_local_repository, :preserve => false
+        info "Installed #{name} to #{in_local_repository}"
       end
     end
 
@@ -230,7 +248,7 @@ module Buildr
     # The default artifact type.
     DEFAULT_TYPE = :jar
 
-    include ActsAsArtifact
+    include ActsAsArtifact, Buildr
 
     class << self
 
@@ -332,7 +350,7 @@ module Buildr
         # if the artifact knows how to build itself (e.g. download from a different location),
         # so don't perform it if the task found a different way to create the artifact.
         task.enhance do
-          unless File.exist?(name)
+          if download_needed? task
             info "Downloading #{to_spec}"
             download
             pom.invoke rescue nil if pom && pom != self
@@ -349,30 +367,52 @@ module Buildr
     #   install test
     # See also Buildr#install and Buildr#upload.
     def from(path)
-      path = path.is_a?(Rake::Task) ? path : File.expand_path(path.to_s)
-      unless exist?
-        enhance [path] do
-          path = File.expand_path(path.to_s)
-          mkpath File.dirname(name)
-          pom.invoke unless type == :pom
-
-          cp path, name
-          info "Installed #{path} as #{to_spec}"
-        end
+      @from = path.is_a?(Rake::Task) ? path : File.expand_path(path.to_s)
+      enhance [@from] do
+        mkpath File.dirname(name)
+        cp @from.to_s, name
       end
-      unless type == :pom
-        pom.enhance do
-          unless pom.exist?
-          mkpath File.dirname(pom.name)
-          File.open(pom.name, 'w') { |file| file.write pom.pom_xml }
+      pom.content pom_xml unless pom == self || pom.has_content?
+      self
+    end
+
+    # :call-seq:
+    #   content(string) => self
+    #
+    # Use this when you want to install or upload an artifact from a given content, for example:
+    #   readme = artifact('com.example:readme:txt:1.0').content(<<-EOF
+    #     Please visit our website at http://example.com/readme
+    #   <<EOF
+    #   install readme
+    #
+    # If the argument is not a string, it will be converted to a string using to_s
+    def content(string = nil)
+      return @content unless string
+
+      unless @content
+        enhance do
+          write name, @content
+        end
+
+        class << self
+          # Force overwriting target since we don't have source file
+          # to check for timestamp modification
+          def needed?
+            true
+          end
         end
       end
-      end
+      @content = string
+      pom.content pom_xml unless pom == self || pom.has_content?
       self
     end
 
   protected
 
+    def has_content?
+      @from || @content
+    end
+
     # :call-seq:
     #   download
     #
@@ -389,7 +429,7 @@ module Buildr
       exact_success = remote.find do |repo_url|
         begin
           path = "#{group_path}/#{id}/#{version}/#{File.basename(name)}"
-          URI.download repo_url + path, name
+          download_artifact(repo_url + path)
           true
         rescue URI::NotFoundError
           false
@@ -414,7 +454,8 @@ module Buildr
         snapshot_url = current_snapshot_repo_url(repo_url)
         if snapshot_url
           begin
-            URI.download snapshot_url, name
+            download_artifact snapshot_url
+            true
           rescue URI::NotFoundError
             false
           end
@@ -430,10 +471,13 @@ module Buildr
         metadata_xml = StringIO.new
         URI.download repo_url + metadata_path, metadata_xml
         metadata = REXML::Document.new(metadata_xml.string).root
-        timestamp = REXML::XPath.first(metadata, '//timestamp').text
-        build_number = REXML::XPath.first(metadata, '//buildNumber').text
+        timestamp = REXML::XPath.first(metadata, '//timestamp')
+        build_number = REXML::XPath.first(metadata, '//buildNumber')
+        error "No timestamp provided for the snapshot #{to_spec}" if timestamp.nil?
+        error "No build number provided for the snapshot #{to_spec}" if build_number.nil?
+        return nil if timestamp.nil? || build_number.nil?
         snapshot_of = version[0, version.size - 9]
-        repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp}-#{build_number}.#{type}"
+        repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp.text}-#{build_number.text}.#{type}"
       rescue URI::NotFoundError
         nil
       end
@@ -442,6 +486,71 @@ module Buildr
     def fail_download(remote_uris)
       fail "Failed to download #{to_spec}, tried the following repositories:\n#{remote_uris.join("\n")}"
     end
+
+   protected
+  
+    # :call-seq:
+    #   needed?
+    #
+    # Validates whether artifact is required to be downloaded from repository
+    def needed?
+      return true if snapshot? && File.exist?(name) && old?
+      super      
+    end
+    
+  private
+  
+    # :call-seq:
+    #   download_artifact
+    #
+    # Downloads artifact from given repository, 
+    # supports downloading snapshot artifact with relocation on succeed to local repository 
+    def download_artifact(path)
+      download_file = "#{name}.#{Time.new.to_i}"
+      begin
+        URI.download path, download_file
+        if File.exist?(download_file)
+          FileUtils.mkdir_p(File.dirname(name))
+          FileUtils.mv(download_file, name)
+        end
+      ensure
+        File.delete(download_file) if File.exist?(download_file)
+      end
+    end
+    
+    # :call-seq:
+    #   :download_needed?
+    #
+    # Validates whether artifact is required to be downloaded from repository
+    def download_needed?(task)
+      return true if !File.exist?(name)
+
+      if snapshot?
+        return false if offline? && File.exist?(name)
+        return true if update_snapshot? || old?
+      end
+      
+      return false
+    end
+    
+    def update_snapshot?
+      Buildr.application.options.update_snapshots
+    end
+    
+    def offline?
+      Buildr.application.options.work_offline
+    end
+    
+    # :call-seq:
+    #   old?
+    #
+    # Checks whether existing artifact is older than period from build settings or one day 
+    def old?
+      settings = Buildr.application.settings
+      time_to_be_old = settings.user[:expire_time] || settings.build[:expire_time] || 60 * 60 * 24
+      File.mtime(name).to_i < (Time.new.to_i - time_to_be_old)
+    end
+
   end
 
 
@@ -639,15 +748,18 @@ module Buildr
   # To specify an artifact and the means for creating it:
   #   download(artifact('dojo:dojo-widget:zip:2.0')=>
   #     'http://download.dojotoolkit.org/release-2.0/dojo-2.0-widget.zip')
-  def artifact(spec, &block) #:yields:task
+  def artifact(spec, path = nil, &block) #:yields:task
     spec = artifact_ns.fetch(spec) if spec.kind_of?(Symbol)
     spec = Artifact.to_hash(spec)
     unless task = Artifact.lookup(spec)
-      task = Artifact.define_task(repositories.locate(spec))
+      task = Artifact.define_task(path || repositories.locate(spec))
       task.send :apply_spec, spec
       Rake::Task['rake:artifacts'].enhance [task]
       Artifact.register(task)
-      Rake::Task['artifacts:sources'].enhance [task.sources_artifact] unless spec[:type] == :pom
+      unless spec[:type] == :pom
+        Rake::Task['artifacts:sources'].enhance [task.sources_artifact] 
+        Rake::Task['artifacts:javadoc'].enhance [task.javadoc_artifact]
+      end
     end
     task.enhance &block
   end
@@ -748,7 +860,7 @@ module Buildr
   end
 
   # :call-seq:
-  #   install(artifacts)
+  #   install(artifacts) => install_task
   #
   # Installs the specified artifacts in the local repository as part of the install task.
   #
@@ -759,9 +871,12 @@ module Buildr
     artifacts = artifacts(args)
     raise ArgumentError, 'This method can only install artifacts' unless artifacts.all? { |f| f.respond_to?(:to_spec) }
     all = (artifacts + artifacts.map { |artifact| artifact.pom }).uniq
-    task('install').tap do |task|
-      task.enhance all, &block
-      task 'uninstall' do
+    task('install').tap do |install|
+      install.enhance(all) do
+        all.each(&:install)
+      end
+      install.enhance &block if block
+      task('uninstall') do
         all.map(&:to_s ).each { |file| rm file if File.exist?(file) }
       end
     end