Merge pull request #591 from chadlwilson/cleanup-deprecations

Clean up obsolete deprecated code

Author: chadlwilson

ext/WarMain.java

@@ -275,21 +275,6 @@ protected int launchJRuby(final URL[] jars) throws Exception {
         return ( outcome instanceof Number ) ? ( (Number) outcome ).intValue() : 0;
     }
 
-    @Deprecated
-    protected String locateExecutable(final Object scriptingContainer) throws Exception {
-        if ( executable == null ) {
-            throw new IllegalStateException("no executable");
-        }
-        final File exec = new File(extractRoot, executable);
-        if ( exec.exists() ) {
-            return exec.getAbsolutePath();
-        }
-        else {
-            final String script = locateExecutableScript(executable, executableScriptEnvPrefix());
-            return (String) invokeMethod(scriptingContainer, "runScriptlet", script);
-        }
-    }
-
     protected String locateExecutable(final Object scriptingContainer, final CharSequence envPreScript)
         throws Exception {
         if ( executable == null ) {

lib/warbler/bundler_helper.rb

@@ -7,14 +7,7 @@
 module Warbler
   module BundlerHelper
     def to_spec(spec)
-      # JRuby <= 1.7.20 does not handle respond_to? with method_missing right
-      # thus a `spec.respond_to?(:to_spec) ? spec.to_spec : spec` won't do :
-      if ::Bundler.const_defined?(:StubSpecification) # since Bundler 1.10.1
-        spec = spec.to_spec if spec.is_a?(::Bundler::StubSpecification)
-      else
-        spec = spec.to_spec if spec.respond_to?(:to_spec)
-      end
-      spec
+      spec.respond_to?(:to_spec) ? spec.to_spec : spec
     end
     module_function :to_spec
   end

lib/warbler/config.rb

@@ -33,9 +33,6 @@ class Config
     # configured.
     attr_accessor :traits
 
-    # Deprecated: No longer has any effect.
-    attr_accessor :staging_dir
-
     # Directory where the war file will be written. Can be used to direct
     # Warbler to place your war file directly in your application server's
     # autodeploy directory. Defaults to the root of the application directory.

lib/warbler/gems.rb

@@ -51,22 +51,18 @@ def specs(gem_dependencies)
 
     # Add a single gem to WEB-INF/gems
     def find_single_gem_files(gem_dependencies, gem_pattern, version = nil)
-      gem_spec_class = Gem::Specification
       case gem_pattern
-      when gem_spec_class
+      when Gem::Specification
         return BundlerHelper.to_spec(gem_pattern)
       when Gem::Dependency
         gem = gem_pattern
       else
         gem = Gem::Dependency.new(gem_pattern, Gem::Requirement.create(version))
       end
       # skip development dependencies
-      return nil if gem.respond_to?(:type) and gem.type != :runtime
+      return nil if gem.type != :runtime
 
-      # Deal with deprecated Gem.source_index and #search
-      matched = gem.respond_to?(:to_spec) ? [ gem.to_spec ] : Gem.source_index.search(gem)
-      fail "gem '#{gem}' not installed" if matched.empty?
-      spec = matched.last
+      spec = gem.to_spec
       return spec unless gem_dependencies
       [spec] + spec.dependencies.map { |dependent_gem| find_single_gem_files(gem_dependencies, dependent_gem) }
     end

lib/warbler/jar.rb

@@ -70,8 +70,6 @@ def run_jrubyc(config, compiled_ruby_files)
       end
       @compiled = true
     end
-    # @deprecated only due compatibility
-    alias_method :run_javac, :run_jrubyc
 
     def sh_jrubyc(cmd)
       sh(cmd) do |ok, res|
@@ -337,12 +335,4 @@ def entry_in_jar(jar, entry)
     # #entry_in_jar with Java version
     require 'warbler_jar' if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.5"
   end
-
-  # Warbler::War is Deprecated. Please use Warbler::Jar.
-  class War < Jar
-    def initialize(*)
-      super
-      warn "Warbler::War is deprecated. Please replace all occurrences with Warbler::Jar."
-    end
-  end
 end

lib/warbler/war.rb

@@ -5,15 +5,13 @@
   <!--
   <display-name>Uncomment and put name :here: for Tomcat Dashboard</display-name>-->
 
-  <%# NOTE: to be renamed to servlet_context_params %>
   <%- webxml.context_params.each do |name, value| -%>
   <context-param>
     <param-name><%= name %></param-name>
     <param-value><%= value %></param-value>
   </context-param>
   <%- end -%>
 
-  <%- if webxml.respond_to?(:servlet_filter) -%>
   <filter>
     <filter-name><%= webxml.servlet_filter_name %></filter-name>
     <filter-class><%= webxml.servlet_filter %></filter-class>
@@ -23,29 +21,12 @@
     <filter-name><%= webxml.servlet_filter_name %></filter-name>
     <url-pattern><%= webxml.servlet_filter_url_pattern %></url-pattern>
   </filter-mapping>
-  <%- else -%> <%# NOTE: due compatibility when warbler gets downgraded to 2.0.0 %>
-  <filter>
-    <filter-name>RackFilter</filter-name>
-    <filter-class>org.jruby.rack.RackFilter</filter-class>
-    <async-supported>true</async-supported>
-  </filter>
-  <filter-mapping>
-    <filter-name>RackFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <%- end -%>
 
-  <%- if webxml.respond_to?(:servlet_context_listeners) -%>
   <%- webxml.servlet_context_listeners.each do |listener| -%>
   <listener>
     <listener-class><%= listener %></listener-class>
   </listener>
   <%- end -%>
-  <%- else -%> <%# NOTE: due compatibility when warbler gets downgraded to 2.0.0 %>
-  <listener>
-    <listener-class><%= webxml.servlet_context_listener %></listener-class>
-  </listener>
-  <%- end -%>
 
   <%- [webxml.jndi].flatten.each do |jndi| -%>
   <resource-ref>