@@ -17,8 +17,10 @@ Warbler::Config.new do |config| # JRuby and JRuby-Rack are pre-loaded in this list. Be sure to include your # own versions if you directly set the value # config.java_libs += FileList["lib/java/*.jar"] - config.java_libs.delete_if {|f| f =~ /jruby-rack/} - config.java_libs += FileList["../../target/jruby-rack*.jar"] + if ENV['JRUBY_RACK_SRC'] + config.java_libs.delete_if {|f| f =~ /jruby-rack/} + config.java_libs += FileList["../../target/jruby-rack*.jar"] + end # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes. # config.java_classes = FileList["target/classes/**.*"] @@ -60,4 +62,4 @@ Warbler::Config.new do |config| # JNDI data source name # config.webxml.jndi = 'jdbc/rails' -end \ No newline at end of file +end examples/camping/config/warble.rb @@ -17,8 +17,10 @@ Warbler::Config.new do |config| # JRuby and JRuby-Rack are pre-loaded in this list. Be sure to include your # own versions if you directly set the value # config.java_libs += FileList["lib/java/*.jar"] - config.java_libs.delete_if {|f| f =~ /jruby-rack/} - config.java_libs += FileList["../../target/jruby-rack*.jar"] + if ENV['JRUBY_RACK_SRC'] + config.java_libs.delete_if {|f| f =~ /jruby-rack/} + config.java_libs += FileList["../../target/jruby-rack*.jar"] + end # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes. # config.java_classes = FileList["target/classes/**.*"] @@ -65,4 +67,4 @@ Warbler::Config.new do |config| # JNDI data source name # config.webxml.jndi = 'jdbc/rails' -end \ No newline at end of file +end examples/merb/config/warble.rb @@ -17,8 +17,10 @@ Warbler::Config.new do |config| # JRuby and JRuby-Rack are pre-loaded in this list. Be sure to include your # own versions if you directly set the value # config.java_libs += FileList["lib/java/*.jar"] - config.java_libs.delete_if {|f| f =~ /jruby-rack/} - config.java_libs += FileList["../../target/jruby-rack*.jar"] + if ENV['JRUBY_RACK_SRC'] + config.java_libs.delete_if {|f| f =~ /jruby-rack/} + config.java_libs += FileList["../../target/jruby-rack*.jar"] + end # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes. # config.java_classes = FileList["target/classes/**.*"] examples/rails/config/warble.rb @@ -18,8 +18,10 @@ Warbler::Config.new do |config| # JRuby and JRuby-Rack are pre-loaded in this list. Be sure to include your # own versions if you directly set the value # config.java_libs += FileList["lib/java/*.jar"] - config.java_libs.delete_if {|f| f =~ /jruby-rack/} - config.java_libs += FileList["../../target/jruby-rack*.jar"] + if ENV['JRUBY_RACK_SRC'] + config.java_libs.delete_if {|f| f =~ /jruby-rack/} + config.java_libs += FileList["../../target/jruby-rack*.jar"] + end # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes. # config.java_classes = FileList["target/classes/**.*"] examples/sinatra/config/warble.rb bfc6f3a76953c0684ee9225a8adb0231cbba5a84 Nick Sieger nick@nicksieger.com http://github.com/nicksieger/jruby-rack/commit/ef1f216170365d74a6c4f9a89c46085fadf75be5 ef1f216170365d74a6c4f9a89c46085fadf75be5 2009-04-08T13:34:37-07:00 2009-04-08T13:34:37-07:00 Only use locally-built jruby-rack jar if ENV['JRUBY_RACK_SRC'] is set 33a78648c8b670ffed4173a25e00b84de53c6fb2 Nick Sieger nick@nicksieger.com