From 18a6042177aa3b732c58bc6b5b2437244d7c2a9f Mon Sep 17 00:00:00 2001
From: Per Lundberg <per.lundberg@ecraft.com>
Date: Sun, 12 Jun 2016 20:36:54 +0300
Subject: [PATCH] Use java_import instead of import

The `import` statement is apparently deprecated: https://github.com/jruby/jruby/wiki/CallingJavaFromJRuby#using-a-java-class-without-the-full-path-name, so this would be the recommended approach these days I'd guess.
---
 jetty/lib/rjack-jetty.rb | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/jetty/lib/rjack-jetty.rb b/jetty/lib/rjack-jetty.rb
index 6e30a964..e141d1e6 100644
--- a/jetty/lib/rjack-jetty.rb
+++ b/jetty/lib/rjack-jetty.rb
@@ -41,28 +41,28 @@ def self.require_jar( name )
 
     require File.join( JETTY_DIR, "javax.servlet-api-#{ SERVLET_API_VERSION }.jar" )
 
-    import 'org.eclipse.jetty.http.HttpVersion'
-    import 'org.eclipse.jetty.server.Connector'
-    import 'org.eclipse.jetty.server.Handler'
-    import 'org.eclipse.jetty.server.HttpConfiguration'
-    import 'org.eclipse.jetty.server.NCSARequestLog'
-    import 'org.eclipse.jetty.server.SecureRequestCustomizer'
-    import 'org.eclipse.jetty.server.Server'
-    import 'org.eclipse.jetty.server.SslConnectionFactory'
-    import 'org.eclipse.jetty.server.handler.AbstractHandler'
-    import 'org.eclipse.jetty.server.handler.ContextHandler'
-    import 'org.eclipse.jetty.server.handler.ContextHandlerCollection'
-    import 'org.eclipse.jetty.server.handler.DefaultHandler'
-    import 'org.eclipse.jetty.server.handler.HandlerCollection'
-    import 'org.eclipse.jetty.server.handler.RequestLogHandler'
-    import 'org.eclipse.jetty.server.handler.ResourceHandler'
-    import 'org.eclipse.jetty.server.HttpConnectionFactory'
-    import 'org.eclipse.jetty.server.ServerConnector'
-    import 'org.eclipse.jetty.servlet.ServletContextHandler'
-    import 'org.eclipse.jetty.servlet.ServletHolder'
-    import 'org.eclipse.jetty.webapp.WebAppContext'
-    import 'org.eclipse.jetty.util.ssl.SslContextFactory'
-    import 'org.eclipse.jetty.util.thread.QueuedThreadPool'
+    java_import 'org.eclipse.jetty.http.HttpVersion'
+    java_import 'org.eclipse.jetty.server.Connector'
+    java_import 'org.eclipse.jetty.server.Handler'
+    java_import 'org.eclipse.jetty.server.HttpConfiguration'
+    java_import 'org.eclipse.jetty.server.NCSARequestLog'
+    java_import 'org.eclipse.jetty.server.SecureRequestCustomizer'
+    java_import 'org.eclipse.jetty.server.Server'
+    java_import 'org.eclipse.jetty.server.SslConnectionFactory'
+    java_import 'org.eclipse.jetty.server.handler.AbstractHandler'
+    java_import 'org.eclipse.jetty.server.handler.ContextHandler'
+    java_import 'org.eclipse.jetty.server.handler.ContextHandlerCollection'
+    java_import 'org.eclipse.jetty.server.handler.DefaultHandler'
+    java_import 'org.eclipse.jetty.server.handler.HandlerCollection'
+    java_import 'org.eclipse.jetty.server.handler.RequestLogHandler'
+    java_import 'org.eclipse.jetty.server.handler.ResourceHandler'
+    java_import 'org.eclipse.jetty.server.HttpConnectionFactory'
+    java_import 'org.eclipse.jetty.server.ServerConnector'
+    java_import 'org.eclipse.jetty.servlet.ServletContextHandler'
+    java_import 'org.eclipse.jetty.servlet.ServletHolder'
+    java_import 'org.eclipse.jetty.webapp.WebAppContext'
+    java_import 'org.eclipse.jetty.util.ssl.SslContextFactory'
+    java_import 'org.eclipse.jetty.util.thread.QueuedThreadPool'
 
     # A factory for creating complete org.morbay.jetty.Server
     # instances. Provides a general purpose facade for setup including