warbler 1.4.10 → 2.0.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +12 -29
- data/Gemfile +1 -12
- data/History.txt +5 -7
- data/Mavenfile +1 -2
- data/README.rdoc +51 -53
- data/Rakefile +7 -13
- data/ext/JarMain.java +12 -58
- data/ext/WarMain.java +13 -41
- data/ext/WarblerJar.java +8 -12
- data/lib/warbler.rb +0 -1
- data/lib/warbler/config.rb +11 -2
- data/lib/warbler/gems.rb +9 -9
- data/lib/warbler/jar.rb +2 -4
- data/lib/warbler/rake_helper.rb +0 -7
- data/lib/warbler/traits.rb +0 -1
- data/lib/warbler/traits/bundler.rb +12 -12
- data/lib/warbler/traits/gemspec.rb +12 -22
- data/lib/warbler/traits/rails.rb +5 -5
- data/lib/warbler/traits/war.rb +2 -7
- data/lib/warbler/version.rb +1 -1
- data/lib/warbler/web_server.rb +4 -16
- data/lib/warbler/zip_support.rb +3 -21
- data/lib/warbler_jar.jar +0 -0
- data/pom.xml +23 -6
- data/spec/drb_default_id_conv.rb +48 -50
- data/spec/sample_bundler/Gemfile +1 -1
- data/spec/sample_bundler/vendor/bundle/jruby/{1.8 → 2.2.0}/bin/rake +7 -3
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/cache/rake-10.4.2.gem +0 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.autotest +7 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.gemtest +0 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.rubocop.yml +27 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/.togglerc +7 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/CONTRIBUTING.rdoc +34 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/History.rdoc +651 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/MIT-LICENSE +21 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/Manifest.txt +166 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/README.rdoc +140 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/Rakefile +81 -0
- data/spec/sample_bundler/vendor/bundle/{ruby/1.8/gems/rake-0.8.7 → jruby/2.2.0/gems/rake-10.4.2}/bin/rake +5 -3
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake.rb +79 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/alt_system.rb +110 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/application.rb +790 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/backtrace.rb +23 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/clean.rb +76 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/cloneable.rb +16 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/.document +1 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/compositepublisher.rb +21 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/ftptools.rb +137 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/publisher.rb +81 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/rubyforgepublisher.rb +18 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/sshpublisher.rb +61 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/contrib/sys.rb +4 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/cpu_counter.rb +125 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/default_loader.rb +14 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/dsl_definition.rb +201 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/early_time.rb +21 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/core.rb +25 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/module.rb +2 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/pathname.rb +25 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/string.rb +173 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ext/time.rb +16 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_creation_task.rb +24 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_list.rb +428 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_task.rb +46 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_utils.rb +128 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/file_utils_ext.rb +144 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/gempackagetask.rb +4 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/invocation_chain.rb +56 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/invocation_exception_mixin.rb +16 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/late_time.rb +17 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/linked_list.rb +103 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/loaders/makefile.rb +40 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/multi_task.rb +13 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/name_space.rb +38 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/packagetask.rb +199 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/pathmap.rb +3 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/phony.rb +15 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/private_reader.rb +20 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/promise.rb +99 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/pseudo_status.rb +29 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rake_module.rb +38 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rake_test_loader.rb +22 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rdoctask.rb +4 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/ruby182_test_unit_fix.rb +29 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/rule_recursion_overflow_error.rb +20 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/runtest.rb +27 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/scope.rb +42 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task.rb +383 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task_argument_error.rb +7 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task_arguments.rb +98 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/task_manager.rb +310 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/tasklib.rb +24 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/testtask.rb +212 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/thread_history_display.rb +48 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/thread_pool.rb +164 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/trace_output.rb +22 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/version.rb +7 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/lib/rake/win32.rb +56 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/rakelib/publish.rake +20 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/rakelib/test_times.rake +25 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/file_creation.rb +34 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/helper.rb +130 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/support/rakefile_definitions.rb +478 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/support/ruby_runner.rb +34 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_private_reader.rb +42 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake.rb +40 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_application.rb +643 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_application_options.rb +466 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_backtrace.rb +119 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_clean.rb +61 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_cpu_counter.rb +68 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_definitions.rb +84 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_directory_task.rb +76 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_dsl.rb +40 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_early_time.rb +31 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_extension.rb +59 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_creation_task.rb +56 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_list.rb +655 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_list_path_map.rb +8 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_task.rb +197 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_file_utils.rb +309 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_ftp_file.rb +74 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_functional.rb +482 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_invocation_chain.rb +64 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_late_time.rb +18 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_linked_list.rb +84 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_makefile_loader.rb +46 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_multi_task.rb +64 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_name_space.rb +57 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_package_task.rb +79 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_path_map.rb +168 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_path_map_explode.rb +34 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_path_map_partial.rb +18 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_pathname_extensions.rb +15 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_pseudo_status.rb +21 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_rake_test_loader.rb +20 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_reduce_compat.rb +26 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_require.rb +40 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_rules.rb +388 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_scope.rb +44 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task.rb +393 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_argument_parsing.rb +119 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_arguments.rb +127 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_lib.rb +9 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_manager.rb +178 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_manager_argument_resolution.rb +19 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_task_with_arguments.rb +172 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_test_task.rb +146 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_thread_pool.rb +145 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_top_level_functions.rb +71 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_rake_win32.rb +72 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_thread_history_display.rb +101 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.4.2/test/test_trace_output.rb +52 -0
- data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/specifications/rake-10.4.2.gemspec +43 -0
- data/spec/sample_jar/sample_jar.gemspec +1 -2
- data/spec/spec_helper.rb +2 -8
- data/spec/warbler/bundler_spec.rb +11 -22
- data/spec/warbler/config_spec.rb +0 -3
- data/spec/warbler/jar_spec.rb +3 -77
- data/spec/warbler/task_spec.rb +5 -6
- data/spec/warbler/web_server_spec.rb +2 -2
- data/warble.rb +4 -4
- data/warbler.gemspec +8 -8
- metadata +451 -64
- data/lib/warbler/bundler_helper.rb +0 -22
- data/lib/warbler/traits/merb.rb +0 -35
- data/spec/sample_bundler/vendor/bundle/jruby/1.8/cache/rake-0.8.7.gem +0 -0
- data/spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/bin/rake +0 -31
- data/spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/lib/rake.rb +0 -2506
- data/spec/sample_bundler/vendor/bundle/jruby/1.8/specifications/rake-0.8.7.gemspec +0 -31
- data/spec/sample_bundler/vendor/bundle/jruby/1.9/bin/rake +0 -19
- data/spec/sample_bundler/vendor/bundle/jruby/1.9/cache/rake-0.8.7.gem +0 -0
- data/spec/sample_bundler/vendor/bundle/jruby/1.9/gems/rake-0.8.7/bin/rake +0 -31
- data/spec/sample_bundler/vendor/bundle/jruby/1.9/gems/rake-0.8.7/lib/rake.rb +0 -2506
- data/spec/sample_bundler/vendor/bundle/jruby/1.9/specifications/rake-0.8.7.gemspec +0 -30
- data/spec/sample_bundler/vendor/bundle/ruby/1.8/bin/rake +0 -19
- data/spec/sample_bundler/vendor/bundle/ruby/1.8/cache/rake-0.8.7.gem +0 -0
- data/spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/lib/rake.rb +0 -2506
- data/spec/sample_bundler/vendor/bundle/ruby/1.8/specifications/rake-0.8.7.gemspec +0 -30
- data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/bin/rake +0 -19
- data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/cache/rake-0.8.7.gem +0 -0
- data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/bin/rake +0 -31
- data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/lib/rake.rb +0 -2506
- data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec +0 -30
- data/spec/sample_jar/sbin/sample_jar +0 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4d3af37ee387e01352e92875710cf763c45b05f9
|
4
|
+
data.tar.gz: 747124311e18f4c18b21e7c7232dc113468fcd27
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3414140028e4b7ff61c4c4d392e6b279ce7af0e87c2631061fe1b73893dfae0e6879e9dfc1e8946905bd0c33f2160c1cc1a281350ffa2223e9ca08c62b6bbcae
|
7
|
+
data.tar.gz: ba036780cf02f618ec08035fa126b9f873a50db08d000cf209a3f34af05ef492e55719cc02b82fe14bf177a4030ac5470fdb67d887b6d55e8b3147f3c1bd9f27
|
data/.travis.yml
CHANGED
@@ -1,40 +1,19 @@
|
|
1
|
-
sudo: false
|
2
|
-
language: ruby
|
3
|
-
script: bundle exec rake spec
|
4
1
|
rvm:
|
5
|
-
- jruby-
|
2
|
+
- jruby-9.0.0.0.pre1
|
3
|
+
jdk:
|
4
|
+
- oraclejdk8
|
6
5
|
branches:
|
7
6
|
only:
|
8
7
|
- master
|
9
|
-
-
|
10
|
-
before_install:
|
11
|
-
- ([ "$BUNDLER_VERSION" ] && gem uninstall bundler --all --force && gem install bundler -v "$BUNDLER_VERSION") || true
|
12
|
-
- bundle --version
|
13
|
-
before_script:
|
14
|
-
- export JRUBY_OPTS="$JRUBY_OPTS --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
|
8
|
+
- 2.x-dev
|
15
9
|
env:
|
16
|
-
-
|
10
|
+
- JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
|
17
11
|
matrix:
|
18
12
|
include:
|
19
|
-
- rvm: jruby-
|
20
|
-
env: JRUBY_OPTS="--
|
21
|
-
- rvm: jruby-1.7.24
|
22
|
-
env: JRUBY_OPTS="--1.9" BUNDLER_VERSION="~> 1.11.2" RAKE_VERSION="~> 10.3.2"
|
23
|
-
- rvm: jruby-1.7.8
|
24
|
-
env: JRUBY_OPTS="--1.8" BUNDLER_VERSION="~> 1.8.9" RAKE_VERSION="~> 10.1.1"
|
25
|
-
- rvm: jruby-1.7.16
|
26
|
-
env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.10.2" RAKE_VERSION="~> 10.4.2"
|
27
|
-
- rvm: 1.8.7
|
28
|
-
env: BUNDLER_VERSION="~> 1.6.9" RAKE_VERSION="~> 10.4.2"
|
29
|
-
- rvm: 1.9.2
|
30
|
-
env: BUNDLER_VERSION="~> 1.7.9" RAKE_VERSION="~> 10.5.0"
|
31
|
-
- rvm: 1.9.3
|
32
|
-
env: BUNDLER_VERSION="~> 1.8.9" RAKE_VERSION="~> 10.2.2"
|
33
|
-
- rvm: jruby-1.7.24
|
34
|
-
env: MAVEN_OPTS="-XX:MaxPermSize=128m"
|
35
|
-
script: mvn clean verify
|
13
|
+
- rvm: jruby-head
|
14
|
+
env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
|
36
15
|
allow_failures:
|
37
|
-
-
|
16
|
+
- rvm: jruby-head
|
38
17
|
notifications:
|
39
18
|
irc:
|
40
19
|
channels:
|
@@ -43,3 +22,7 @@ notifications:
|
|
43
22
|
on_failure: always
|
44
23
|
template:
|
45
24
|
- "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
|
25
|
+
before_install:
|
26
|
+
- sudo apt-get update && sudo apt-get install git
|
27
|
+
- git fetch --unshallow
|
28
|
+
- gem install bundler --pre
|
data/Gemfile
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
source "
|
1
|
+
source "http://rubygems.org/"
|
2
2
|
|
3
3
|
gemspec
|
4
4
|
|
@@ -8,14 +8,3 @@ group :development do
|
|
8
8
|
gem "childprocess", :platform => :mri
|
9
9
|
gem "maven-tools", "~> 0.34.5"
|
10
10
|
end
|
11
|
-
|
12
|
-
group :development, :test do
|
13
|
-
gem 'rdoc', '~> 3.10', :require => nil
|
14
|
-
gem 'rake', ENV['RAKE_VERSION'], :require => nil if ENV['RAKE_VERSION']
|
15
|
-
end
|
16
|
-
|
17
|
-
if ENV['RUBYZIP_VERSION']
|
18
|
-
gem 'rubyzip', ENV['RUBYZIP_VERSION']
|
19
|
-
elsif RUBY_VERSION < "1.9"
|
20
|
-
gem 'rubyzip', '~> 0.9'
|
21
|
-
end
|
data/History.txt
CHANGED
@@ -1,14 +1,12 @@
|
|
1
|
-
==
|
1
|
+
== 2x-dev
|
2
2
|
|
3
|
-
== 1.4.9
|
4
3
|
|
5
|
-
-
|
6
|
-
|
4
|
+
- Added the ability to set custom port for Jetty launcher with
|
5
|
+
warbler.port or PORT env var
|
7
6
|
|
8
7
|
== 1.4.7
|
9
8
|
|
10
|
-
-
|
11
|
-
warbler.port or PORT env var
|
9
|
+
- #319: Adds capacity to use the jruby-jars gem version for JRuby 9k.
|
12
10
|
|
13
11
|
== 1.4.6
|
14
12
|
- #318: polish *scripts/rails* - require_relative should no longer be used
|
@@ -261,7 +259,7 @@
|
|
261
259
|
- RailsConf 2009 edition.
|
262
260
|
- Only bundled JRuby and JRuby-Rack upgrades. Bug fixes will have to come in 0.9.14.
|
263
261
|
- This should also be the last release with bundled JRuby and JRuby-Rack.
|
264
|
-
- Upgrade to JRuby 1.3.0RC1 and JRuby-Rack 0.9.4. The latter allows
|
262
|
+
- Upgrade to JRuby 1.3.0RC1 and JRuby-Rack 0.9.4. The latter allows
|
265
263
|
Rails 2.3 to work with Warbler.
|
266
264
|
|
267
265
|
== 0.9.12
|
data/Mavenfile
CHANGED
@@ -7,8 +7,7 @@ gemspec( :jar => 'warbler_jar.jar',
|
|
7
7
|
|
8
8
|
# just dump the POM as pom.xml as read-only file
|
9
9
|
properties( 'tesla.dump.pom' => 'pom.xml',
|
10
|
-
'tesla.dump.readOnly' => true
|
11
|
-
'jruby.plugins.version' => '1.0.10' )
|
10
|
+
'tesla.dump.readOnly' => true )
|
12
11
|
|
13
12
|
# dependencies needed for compilation
|
14
13
|
scope :provided do
|
data/README.rdoc
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
= Warbler {<img src="https://badge.fury.io/rb/warbler.svg" alt="Gem Version" />}[http://badge.fury.io/rb/warbler] {<img src="https://travis-ci.org/jruby/warbler.png" />}[https://travis-ci.org/jruby/warbler]
|
2
2
|
|
3
|
-
Warbler is a gem to make a Java jar or war file out of any Ruby, Rails or Rack
|
4
|
-
application. Warbler provides a minimal, flexible, Ruby-like way to bundle up
|
3
|
+
Warbler is a gem to make a Java jar or war file out of any Ruby, Rails or Rack
|
4
|
+
application. Warbler provides a minimal, flexible, Ruby-like way to bundle up
|
5
5
|
all of your application files for deployment to a Java environment.
|
6
6
|
|
7
7
|
Warbler provides a sane set of out-of-the box defaults that should allow most
|
@@ -18,7 +18,7 @@ Version 1.4.x of Warbler supports versions of JRuby up to 1.7.x. The {2.x-dev br
|
|
18
18
|
3. Choose one:
|
19
19
|
|
20
20
|
* For a web project, deploy your +myapp.war+ file to your favorite Java application server.
|
21
|
-
|
21
|
+
|
22
22
|
* For a standalone applications, just run it: <tt>java -jar myapp.jar</tt>.
|
23
23
|
|
24
24
|
== Usage
|
@@ -43,9 +43,9 @@ Type <tt>warble</tt> to create the jar or war file.
|
|
43
43
|
|
44
44
|
== Features
|
45
45
|
|
46
|
-
Warbler "features" are small Rake tasks that run before the creation of the war
|
47
|
-
file and make manipulations to the archive structure. For instance, the
|
48
|
-
+executable+ feature makes your war file capable of running on its own,
|
46
|
+
Warbler "features" are small Rake tasks that run before the creation of the war
|
47
|
+
file and make manipulations to the archive structure. For instance, the
|
48
|
+
+executable+ feature makes your war file capable of running on its own,
|
49
49
|
without a servlet container (using an embedded web server) :
|
50
50
|
|
51
51
|
warble executable war
|
@@ -64,73 +64,73 @@ Currently, the following features are available :
|
|
64
64
|
number of files in the .war. This is mostly useful for Google
|
65
65
|
AppEngine where the number of files per application has a limit.
|
66
66
|
(Note: not applicable for jar-based applications.)
|
67
|
-
* +runnable+: This makes a (standard Java) runnable .war archive thus you can
|
68
|
-
execute binary bundled (gem) commands e.g. "rake". You should use the -S
|
69
|
-
switch to specify the binary followed by any arguments in takes e.g.
|
67
|
+
* +runnable+: This makes a (standard Java) runnable .war archive thus you can
|
68
|
+
execute binary bundled (gem) commands e.g. "rake". You should use the -S
|
69
|
+
switch to specify the binary followed by any arguments in takes e.g.
|
70
70
|
<tt>java -jar myrailsapp.war -S rake db:migrate</tt>.
|
71
|
-
* +executable+: This bundles an embedded web server into the .war so that it
|
72
|
-
can either be deployed into a traditional java web server or run as a
|
71
|
+
* +executable+: This bundles an embedded web server into the .war so that it
|
72
|
+
can either be deployed into a traditional java web server or run as a
|
73
73
|
standalone application using <tt>java -jar myapp.war</tt>.
|
74
74
|
(Note: jar-based applications are executable by default.)
|
75
75
|
* +compiled+: This uses +jrubyc+ to precompile all .rb files in your application
|
76
|
-
to .class files and includes those in the .war instead of the Ruby sources.
|
77
|
-
NOTE: The war file will still contain .rb files, but they will be short stubs
|
76
|
+
to .class files and includes those in the .war instead of the Ruby sources.
|
77
|
+
NOTE: The war file will still contain .rb files, but they will be short stubs
|
78
78
|
containing the following code : <tt>load __FILE__.sub(/\.rb$/, '.class')</tt>
|
79
79
|
|
80
|
-
Features may form the basis for a third-party plugin system (in the future)
|
80
|
+
Features may form the basis for a third-party plugin system (in the future)
|
81
81
|
if there is demand.
|
82
82
|
|
83
|
-
NOTE: Feature tasks must be included in the same command invocation and
|
84
|
-
inserted before the +war+ task in order to take effect. For example,
|
85
|
-
<tt>warble compiled; warble war</tt> does not compile and obfuscate +.rb+
|
86
|
-
sources because the second invocation of +warble+ does not run the +compiled+
|
83
|
+
NOTE: Feature tasks must be included in the same command invocation and
|
84
|
+
inserted before the +war+ task in order to take effect. For example,
|
85
|
+
<tt>warble compiled; warble war</tt> does not compile and obfuscate +.rb+
|
86
|
+
sources because the second invocation of +warble+ does not run the +compiled+
|
87
87
|
feature and creates a basic war with the sources included, make sure you run :
|
88
88
|
|
89
89
|
warble compiled war
|
90
90
|
|
91
|
-
or, if it's important that the war always be compiled, use the option above to
|
91
|
+
or, if it's important that the war always be compiled, use the option above to
|
92
92
|
put the feature in your <tt>config/warble.rb</tt>.
|
93
93
|
|
94
94
|
== War or Jar?
|
95
95
|
|
96
|
-
War-based projects are for Rails, Merb, or Rack-based web applications.
|
97
|
-
They usually contain a +config/environment.rb+ file, a +config/init.rb+ file,
|
96
|
+
War-based projects are for Rails, Merb, or Rack-based web applications.
|
97
|
+
They usually contain a +config/environment.rb+ file, a +config/init.rb+ file,
|
98
98
|
or a +config.ru+ file.
|
99
|
-
The presence of these files are used to determine if the project is a web
|
99
|
+
The presence of these files are used to determine if the project is a web
|
100
100
|
application, and thus a Java EE compatible war file is built for the project.
|
101
101
|
|
102
|
-
Jar-based projects are for standalone Ruby applications. Usually a Ruby
|
103
|
-
application has a launcher script in the +bin+ directory and Ruby code
|
104
|
-
in the <tt>lib</tt> directory. Warbler packages the application so that
|
102
|
+
Jar-based projects are for standalone Ruby applications. Usually a Ruby
|
103
|
+
application has a launcher script in the +bin+ directory and Ruby code
|
104
|
+
in the <tt>lib</tt> directory. Warbler packages the application so that
|
105
105
|
<tt>java -jar myapp.jar</tt> runs the launcher script.
|
106
106
|
|
107
107
|
== Jar Files
|
108
108
|
|
109
109
|
=== Gem Specification (gemspec) Files
|
110
110
|
|
111
|
-
If your project has a <tt>.gemspec</tt> file in the top directory, it will be
|
112
|
-
used to configure the project's dependencies, launcher script, require paths,
|
113
|
-
and the files to be included in the archive. For best results make sure your
|
111
|
+
If your project has a <tt>.gemspec</tt> file in the top directory, it will be
|
112
|
+
used to configure the project's dependencies, launcher script, require paths,
|
113
|
+
and the files to be included in the archive. For best results make sure your
|
114
114
|
gemspec specifies all of the following attributes:
|
115
115
|
|
116
116
|
* +executables+
|
117
117
|
* +require_paths+
|
118
118
|
* runtime dependencies added with +add_dependency+
|
119
119
|
|
120
|
-
If your project do not have a <tt>.gemspec</tt>, Warbler will attempt to guess
|
121
|
-
the launcher from the contents of the <tt>bin</tt> directory and use the
|
122
|
-
<tt>lib</tt> directory as the lone require path. All files in the project
|
120
|
+
If your project do not have a <tt>.gemspec</tt>, Warbler will attempt to guess
|
121
|
+
the launcher from the contents of the <tt>bin</tt> directory and use the
|
122
|
+
<tt>lib</tt> directory as the lone require path. All files in the project
|
123
123
|
will be included in the archive.
|
124
124
|
|
125
125
|
=== Bundler
|
126
126
|
|
127
|
-
Applications that use Bundler[http://gembundler.com/], detected via presence of
|
128
|
-
a +Gemfile+, will have the gems packaged up into the archive along with the
|
129
|
-
Gemfile. The Bundler groups named ":development", ":test" and ":assets" will be
|
130
|
-
excluded by default, unless you specify with <tt>config.bundle_without</tt> in
|
127
|
+
Applications that use Bundler[http://gembundler.com/], detected via presence of
|
128
|
+
a +Gemfile+, will have the gems packaged up into the archive along with the
|
129
|
+
Gemfile. The Bundler groups named ":development", ":test" and ":assets" will be
|
130
|
+
excluded by default, unless you specify with <tt>config.bundle_without</tt> in
|
131
131
|
+config/warble.rb+.
|
132
132
|
|
133
|
-
Warbler supports Bundler for gems and git repositories, but not for plain path
|
133
|
+
Warbler supports Bundler for gems and git repositories, but not for plain path
|
134
134
|
components. Warbler will warn when a +:path+ component is found in the +Gemfile+
|
135
135
|
and will refuse to include it in the archive.
|
136
136
|
|
@@ -146,18 +146,18 @@ via presence of a +Jarfile+, will have the jars packaged up into the archive. th
|
|
146
146
|
Rails applications are detected automatically and configured appropriately.
|
147
147
|
The following items are set up for you:
|
148
148
|
|
149
|
-
* Your application runs in the +production+ environment by default.
|
149
|
+
* Your application runs in the +production+ environment by default.
|
150
150
|
Change it in +config/warble.rb+ (see below).
|
151
151
|
* The Rails gem is packaged if you haven't vendored Rails (Rails <= 2.x).
|
152
152
|
* Other gems configured in Rails.configuration.gems are packaged (2.1 - 2.3)
|
153
|
-
* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and
|
153
|
+
* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and
|
154
154
|
runtime pooling is disabled.
|
155
155
|
|
156
156
|
=== Other Rack-based applications
|
157
157
|
|
158
|
-
If you have a +config.ru+ file in the top directory or one of the immediate
|
159
|
-
subdirectories of your application, it will be included and used as the rackup
|
160
|
-
script for your Rack-based application. You will probably need to specify
|
158
|
+
If you have a +config.ru+ file in the top directory or one of the immediate
|
159
|
+
subdirectories of your application, it will be included and used as the rackup
|
160
|
+
script for your Rack-based application. You will probably need to specify
|
161
161
|
framework and application gems in +config/warble.rb+ unless you're using Bundler
|
162
162
|
to manage your gems. <tt>ENV['RACK_ENV']</tt> will be set to +production+.
|
163
163
|
|
@@ -166,13 +166,13 @@ of how to configure Warbler to package Camping and Sinatra apps.
|
|
166
166
|
|
167
167
|
=== Configuration auto-detect notes
|
168
168
|
|
169
|
-
* Warbler will load the +environment+ Rake task in a Rails application to try
|
170
|
-
to detect some configuration. If you don't have database access in the
|
171
|
-
environment where you package your application, you may wish to set
|
172
|
-
<tt>Warbler.framework_detection = false</tt> at the top of +config.rb+.
|
173
|
-
In this case you may need to specify additional details such as booter, gems
|
169
|
+
* Warbler will load the +environment+ Rake task in a Rails application to try
|
170
|
+
to detect some configuration. If you don't have database access in the
|
171
|
+
environment where you package your application, you may wish to set
|
172
|
+
<tt>Warbler.framework_detection = false</tt> at the top of +config.rb+.
|
173
|
+
In this case you may need to specify additional details such as booter, gems
|
174
174
|
and other settings that would normally be gleaned from the app configuration.
|
175
|
-
* Is it possible to more generally detect what gems an application uses?
|
175
|
+
* Is it possible to more generally detect what gems an application uses?
|
176
176
|
<tt>Gem.loaded_specs</tt> is available, but the application needs to be
|
177
177
|
loaded first before its contents are reliable.
|
178
178
|
|
@@ -185,7 +185,7 @@ doing this. With the gem, simply run
|
|
185
185
|
|
186
186
|
warble config
|
187
187
|
|
188
|
-
Finally, edit the +config/warble.rb+ to your taste. The generated file is
|
188
|
+
Finally, edit the +config/warble.rb+ to your taste. The generated file is
|
189
189
|
fully-documented with the available options and default values.
|
190
190
|
|
191
191
|
=== War layout
|
@@ -244,7 +244,7 @@ lock the <tt>rubyzip</tt> gem to a version before 1.0.0.
|
|
244
244
|
|
245
245
|
== Troubleshooting
|
246
246
|
|
247
|
-
If Warbler isn't packaging the files you were expecting, use the +war:debug+
|
247
|
+
If Warbler isn't packaging the files you were expecting, use the +war:debug+
|
248
248
|
task to give you more insight into what's going on.
|
249
249
|
|
250
250
|
If you think you found a bug, please file one at
|
@@ -262,7 +262,7 @@ https://github.com/jruby/warbler/tarball/master.
|
|
262
262
|
|
263
263
|
== Development
|
264
264
|
|
265
|
-
You can develop Warbler with any implementation of Ruby. To write Warbler code
|
265
|
+
You can develop Warbler with any implementation of Ruby. To write Warbler code
|
266
266
|
and run specs, you need to have Bundler installed and run <tt>bundle</tt> once.
|
267
267
|
|
268
268
|
After that, simply run <tt>rake</tt>.
|
@@ -284,8 +284,6 @@ http://maven.apache.org/ Be aware the homebrew installs 3.0.5, which doesn't wor
|
|
284
284
|
|
285
285
|
Warbler is provided under the terms of the MIT license.
|
286
286
|
|
287
|
-
Warbler (c) 2013
|
288
|
-
|
289
|
-
Warbler (c) 2010-2012 Engine Yard, Inc.
|
287
|
+
Warbler (c) 2010-2013 Engine Yard, Inc.
|
290
288
|
|
291
289
|
Warbler (c) 2007-2009 Sun Microsystems, Inc.
|
data/Rakefile
CHANGED
@@ -6,15 +6,15 @@
|
|
6
6
|
# See the file LICENSE.txt for details.
|
7
7
|
#++
|
8
8
|
|
9
|
-
|
10
|
-
|
11
|
-
rescue LoadError
|
12
|
-
warn "\nPlease `gem install bundler' and run `bundle install' to ensure you have all dependencies.\n\n"
|
13
|
-
else
|
14
|
-
require 'bundler/gem_helper'
|
15
|
-
Bundler::GemHelper.install_tasks :dir => File.dirname(__FILE__)
|
9
|
+
unless defined? Bundler
|
10
|
+
warn "\nPlease `gem install bundler' and run `bundle install' to ensure you have all dependencies and run inside a bundler context 'bundle exec rake'.\n\n"
|
16
11
|
end
|
17
12
|
|
13
|
+
require 'bundler/gem_helper'
|
14
|
+
gem_helper = Bundler::GemHelper.new(File.dirname(__FILE__))
|
15
|
+
gem_helper.install
|
16
|
+
gemspec = gem_helper.gemspec
|
17
|
+
|
18
18
|
require 'rake/clean'
|
19
19
|
CLEAN << "pkg" << "doc" << Dir['integration/**/target']
|
20
20
|
|
@@ -42,13 +42,8 @@ end
|
|
42
42
|
# the jar tasks is part of maven-tasks
|
43
43
|
task :build => :jar
|
44
44
|
|
45
|
-
load_gemspec = lambda do
|
46
|
-
Gem::Specification.load(File.expand_path('warbler.gemspec', File.dirname(__FILE__)))
|
47
|
-
end
|
48
|
-
|
49
45
|
require 'rdoc/task'
|
50
46
|
RDoc::Task.new(:docs) do |rd|
|
51
|
-
gemspec = load_gemspec.call
|
52
47
|
rd.rdoc_dir = "doc"
|
53
48
|
rd.rdoc_files.include("README.rdoc", "History.txt", "LICENSE.txt")
|
54
49
|
rd.rdoc_files += gemspec.require_paths
|
@@ -59,7 +54,6 @@ end
|
|
59
54
|
task :release_docs => :docs do
|
60
55
|
config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml"))) rescue nil
|
61
56
|
if config
|
62
|
-
gemspec = load_gemspec.call
|
63
57
|
dir = "/var/www/gforge-projects/#{gemspec.rubyforge_project}/#{gemspec.name}"
|
64
58
|
dest = "#{config["username"]}@rubyforge.org:#{dir}"
|
65
59
|
sh %{rsync -rl --delete doc/ #{dest}}
|
data/ext/JarMain.java
CHANGED
@@ -28,6 +28,8 @@ public class JarMain implements Runnable {
|
|
28
28
|
|
29
29
|
static final String MAIN = "/" + JarMain.class.getName().replace('.', '/') + ".class";
|
30
30
|
|
31
|
+
final boolean debug = isDebug();
|
32
|
+
|
31
33
|
protected final String[] args;
|
32
34
|
protected final String archive;
|
33
35
|
private final String path;
|
@@ -124,7 +126,7 @@ public class JarMain implements Runnable {
|
|
124
126
|
}
|
125
127
|
|
126
128
|
protected Object newScriptingContainer(final URL[] jars) throws Exception {
|
127
|
-
|
129
|
+
System.setProperty("org.jruby.embed.class.path", "");
|
128
130
|
classLoader = new URLClassLoader(jars);
|
129
131
|
Class scriptingContainerClass = Class.forName("org.jruby.embed.ScriptingContainer", true, classLoader);
|
130
132
|
Object scriptingContainer = scriptingContainerClass.newInstance();
|
@@ -162,12 +164,12 @@ public class JarMain implements Runnable {
|
|
162
164
|
}
|
163
165
|
|
164
166
|
protected void debug(String msg, Throwable t) {
|
165
|
-
if (
|
166
|
-
if (
|
167
|
+
if (debug) System.out.println(msg);
|
168
|
+
if (debug && t != null) t.printStackTrace(System.out);
|
167
169
|
}
|
168
170
|
|
169
171
|
protected static void debug(Throwable t) {
|
170
|
-
if (
|
172
|
+
if (isDebug()) t.printStackTrace(System.out);
|
171
173
|
}
|
172
174
|
|
173
175
|
protected void warn(String msg) {
|
@@ -223,9 +225,9 @@ public class JarMain implements Runnable {
|
|
223
225
|
}
|
224
226
|
|
225
227
|
protected static void doStart(final JarMain main) {
|
226
|
-
int exit;
|
227
228
|
try {
|
228
|
-
exit = main.start();
|
229
|
+
int exit = main.start();
|
230
|
+
if (isSystemExitEnabled()) System.exit(exit);
|
229
231
|
}
|
230
232
|
catch (Exception e) {
|
231
233
|
Throwable t = e;
|
@@ -233,13 +235,7 @@ public class JarMain implements Runnable {
|
|
233
235
|
t = t.getCause();
|
234
236
|
}
|
235
237
|
error(e.toString(), t);
|
236
|
-
exit
|
237
|
-
}
|
238
|
-
try {
|
239
|
-
if ( isSystemExitEnabled() ) System.exit(exit);
|
240
|
-
}
|
241
|
-
catch (SecurityException e) {
|
242
|
-
debug(e);
|
238
|
+
System.exit(1);
|
243
239
|
}
|
244
240
|
}
|
245
241
|
|
@@ -266,59 +262,17 @@ public class JarMain implements Runnable {
|
|
266
262
|
}
|
267
263
|
}
|
268
264
|
|
269
|
-
|
270
|
-
|
271
|
-
debug = Boolean.parseBoolean( getSystemProperty("warbler.debug", "false") );
|
265
|
+
static boolean isDebug() {
|
266
|
+
return Boolean.getBoolean("warbler.debug");
|
272
267
|
}
|
273
268
|
|
274
|
-
static boolean isDebug() { return debug; }
|
275
|
-
|
276
269
|
/**
|
277
270
|
* if warbler.skip_system_exit system property is defined, we will not
|
278
271
|
* call System.exit in the normal flow. System.exit can cause problems
|
279
272
|
* for wrappers like procrun
|
280
273
|
*/
|
281
274
|
private static boolean isSystemExitEnabled(){
|
282
|
-
return
|
283
|
-
}
|
284
|
-
|
285
|
-
static String getSystemProperty(final String name) {
|
286
|
-
return getSystemProperty(name, null);
|
287
|
-
}
|
288
|
-
|
289
|
-
static String getSystemProperty(final String name, final String defaultValue) {
|
290
|
-
try {
|
291
|
-
return System.getProperty(name, defaultValue);
|
292
|
-
}
|
293
|
-
catch (SecurityException e) {
|
294
|
-
return defaultValue;
|
295
|
-
}
|
296
|
-
}
|
297
|
-
|
298
|
-
static boolean setSystemProperty(final String name, final String value) {
|
299
|
-
try {
|
300
|
-
System.setProperty(name, value);
|
301
|
-
return true;
|
302
|
-
}
|
303
|
-
catch (SecurityException e) {
|
304
|
-
return false;
|
305
|
-
}
|
306
|
-
}
|
307
|
-
|
308
|
-
static String getENV(final String name) {
|
309
|
-
return getENV(name, null);
|
310
|
-
}
|
311
|
-
|
312
|
-
static String getENV(final String name, final String defaultValue) {
|
313
|
-
try {
|
314
|
-
if ( System.getenv().containsKey(name) ) {
|
315
|
-
return System.getenv().get(name);
|
316
|
-
}
|
317
|
-
return defaultValue;
|
318
|
-
}
|
319
|
-
catch (SecurityException e) {
|
320
|
-
return defaultValue;
|
321
|
-
}
|
275
|
+
return System.getProperty("warbler.skip_system_exit") == null; //omission enables System.exit use
|
322
276
|
}
|
323
277
|
|
324
278
|
}
|