@@ -9,7 +9,6 @@ generators/warble generators/warble/templates generators/warble/templates/warble.rb generators/warble/warble_generator.rb -lib/jruby-complete-1.3.0RC1.jar lib/jruby-rack-0.9.4.jar lib/warbler lib/warbler/config.rb Manifest.txt @@ -17,7 +17,7 @@ begin p.summary = "Warbler chirpily constructs .war files of your Rails applications." p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n") p.description = p.paragraphs_of('README.txt', 1...2).join("\n\n") - p.extra_deps << ['rake', '>= 0.7.3'] + p.extra_deps += [['rake', '>= 0.7.3'], ['jruby-jars', '>= 1.3.1']] p.test_globs = ["spec/**/*_spec.rb"] end hoe.spec.files = MANIFEST Rakefile @@ -1,5 +1,5 @@ #-- -# (c) Copyright 2007-2008 Sun Microsystems, Inc. +# (c) Copyright 2007-2009 Sun Microsystems, Inc. # See the file LICENSES.txt included with the distribution for # software license details. #++ @@ -91,11 +91,12 @@ module Warbler attr_accessor :webxml def initialize(warbler_home = WARBLER_HOME) + @warbler_home = warbler_home @staging_dir = File.join("tmp", "war") @dirs = TOP_DIRS.select {|d| File.directory?(d)} @includes = FileList[] @excludes = FileList[] - @java_libs = FileList["#{warbler_home}/lib/*.jar"] + @java_libs = default_jar_files @java_classes = FileList[] @gems = Warbler::Gems.new @gem_dependencies = true @@ -146,6 +147,11 @@ module Warbler c end + def default_jar_files + require 'jruby-jars' + FileList["#{@warbler_home}/lib/*.jar", JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path] + end + def auto_detect_frameworks !Warbler.framework_detection || auto_detect_rails || auto_detect_merb || auto_detect_rackup end lib/warbler/config.rb @@ -165,7 +165,7 @@ describe Warbler::Task do it "should define a java_libs task for copying java libraries" do define_tasks "java_libs" Rake::Task["warble:java_libs"].invoke - file_list(%r{WEB-INF/lib/jruby-complete.*\.jar$}).should_not be_empty + file_list(%r{WEB-INF/lib/jruby-.*\.jar$}).should_not be_empty end it "should define an app task for copying application files" do spec/warbler/task_spec.rb lib/jruby-complete-1.3.0RC1.jar e315798ca90a19e965b50812cbabeba7803aeed3 Nick Sieger nick@nicksieger.com http://github.com/nicksieger/warbler/commit/5b54f9c3027c7385968477e0b31e535f760adc21 5b54f9c3027c7385968477e0b31e535f760adc21 2009-08-26T12:55:25-07:00 2009-08-26T12:55:25-07:00 Unbundle jruby-complete in favor of forthcoming jruby-jars gem c4ca6edab91121a983476ab5ad0d3649db04c952 Nick Sieger nick@nicksieger.com