rjack-jetty 9.2.10.0-java → 9.2.11.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f0affca82a46a5b974cb2200cb9b783fb97449
-  data.tar.gz: de1202f5b1f96549860bdd872da99a480b36d1c3
+  metadata.gz: ad2dffe9d1d4c37ecc8d26346efecdc97d70a750
+  data.tar.gz: 2952848c6582f314535a93c69588da3c5379e0c2
 SHA512:
-  metadata.gz: 7a9931a8bc363de0d3a8b5fddf5ace183f3967621411774a43cd8301bc47f6ae702280da5b60e08c44284961668235d35e7258ebf4d00aeed0295f27dd1c5568
-  data.tar.gz: ed441ef7239cc75aa1dcfaabd927d391fc1e47a481d18e5de230c22e3d226ae89ce90739f4ae5fe0fb272465115b5dd855278766eb98230e55936ca9ef0f82ec
+  metadata.gz: 4120cecce548b85398d5653bf6ec3e36b0e12a98c63f0f1812f360a607c7e54db1c4184b0f678afb1105e80ae592517048d38ca9a0e6aa0d61f345e8a8b0490c
+  data.tar.gz: 8192602f3006e10538e3cf3f51a6fb6482bae3c12ef18e4f97d509817ad8289af2995a2e1c24438bf8451106c5de51fa50dfb934d1d462b8da3bc22201f4c0f0

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 9.2.11.0 (2015-6-1)
+* Update to Jetty 9.2.11.v20150529
+* Add ServerFactory#connections (and host) properties for creating
+  multiple tcp/ssl connectors (backport from 9.3.0)
+
 === 9.2.10.0 (2015-3-30)
 * Update to Jetty 9.2.10.v20150310
 

data/Manifest.txt

@@ -10,21 +10,22 @@ lib/rjack-jetty.rb
 lib/rjack-jetty/client.rb
 lib/rjack-jetty/rewrite.rb
 lib/rjack-jetty/test-servlets.rb
+test/keystore
 test/test.txt
 test/test_jetty.rb
 webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
 lib/rjack-jetty/javax.servlet-api-3.1.0.jar
-lib/rjack-jetty/jetty-client-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-continuation-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-http-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-io-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-rewrite-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-security-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-server-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-servlet-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-util-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-webapp-9.2.10.v20150310.jar
-lib/rjack-jetty/jetty-xml-9.2.10.v20150310.jar
+lib/rjack-jetty/jetty-client-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-continuation-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-http-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-io-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-rewrite-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-security-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-server-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-servlet-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-util-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-webapp-9.2.11.v20150529.jar
+lib/rjack-jetty/jetty-xml-9.2.11.v20150529.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar

data/lib/rjack-jetty.rb

@@ -14,6 +14,7 @@
 # permissions and limitations under the License.
 #++
 
+require 'uri'
 require 'rjack-jetty/base'
 
 require 'java'
@@ -40,10 +41,14 @@ module RJack
 
     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'
@@ -51,10 +56,12 @@ module RJack
     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'
 
     # A factory for creating complete org.morbay.jetty.Server
@@ -114,18 +121,70 @@ module RJack
     #   server.join
     #
     class ServerFactory
-      attr_accessor( :port, :max_idle_time_ms,
-                     :max_threads, :min_threads,
-                     :static_contexts, :static_welcome_files,
-                     :webapp_contexts,
-                     :servlet_contexts,
-                     :stop_at_shutdown )
+
+      # Default port number or 0 to use any available port, for a
+      # single connection. Default: 0
+      # Deprecated: use #connections instead.
+      attr_accessor :port
+
+      # Default interface to bind to. Default: nil -> 0.0.0.0 -> all
+      # Use #connections instead.
+      attr_accessor :host
+
+      # Default idle time in milliseconds to use for all connections.
+      # Default: 10,000 ms
+      attr_accessor :max_idle_time_ms
+
+      # Maximum number of threads. A minimum value of 7 is used, based
+      # on the testing with the current Jetty version. Default: 20
+      attr_accessor :max_threads
+
+      # Minimum number of threads. A minimum value of 4 is
+      # used. Default: max_threads / 4
+      attr_accessor :min_threads
+
+      # Hash of request path prefixes to local file systems paths for
+      # static content. Default: {}
+      attr_accessor :static_contexts
+
+      # Array of welcome file names. Default: [ 'index.html' ]
+      attr_accessor :static_welcome_files
+
+      # Hash of request path prefexes to java webapp paths
+      # Default: {} (none)
+      attr_accessor :webapp_contexts
+
+      # Hash of request path prefexes to servlet paths. Default: {}
+      attr_accessor :servlet_contexts
+
+      # Explicitly and gracefully stop the server on shutdown?
+      # Default: true
+      attr_accessor :stop_at_shutdown
 
       # Request log output to :stderr or file name (default: nil, no log)
       attr_accessor  :request_log_file
 
+      # An array of connection options, each member being a hash with
+      # the following properties or an equivalent URI string:
+      #
+      # :scheme:: Values 'tcp' or 'ssl'
+      # :host:: The local interface to bind Default: 0.0.0.0 (all)
+      # :port:: Port number or 0 to select an available port
+      #         (Default: top level #port for first connection, 0 )
+      # :max_idle_time_ms:: See above
+      # :key_store_path:: For ssl, the path to the (Java JKS) keystore
+      # :key_store_password:: For ssl, the password to the keystore
+      #
+      # URI examples:
+      #
+      #  tcp://127.0.0.1
+      #  ssl://0.0.0.0:8443?key_store_path=test/keystore&key_store_password=399as8d9
+      #
+      attr_accessor  :connections
+
       def initialize
         @port                 = 0        # Use any available port
+        @host                 = nil
         @max_threads          = 20
         @min_threads          = nil      # Compute from max_threads
         @max_idle_time_ms     = 10000
@@ -135,6 +194,7 @@ module RJack
         @request_log_file     = nil
         @servlet_contexts     = {}
         @stop_at_shutdown     = true
+        @connections          = nil
       end
 
       # Returns a new org.morbay.jetty.Server that is ready to
@@ -166,15 +226,62 @@ module RJack
       end
 
       # Return array of org.eclipse.jetty.Connector instances.
-      #
-      # This implementation returns a single ServerConnector
-      # listening to the given port or an auto-selected avaiable
-      # port. Connections are retained for max_idle_time_ms.
       def create_connectors( server )
-        connector = ServerConnector.new( server )
-        connector.port = @port
-        connector.idle_timeout = @max_idle_time_ms
-        [ connector ]
+        first = true
+        ( connections || [{ scheme: 'tcp' }] ).map do |opts|
+          opts = parse_connection_uri( opts ) if opts.is_a?( String )
+
+          connector = case opts[:scheme]
+                      when 'ssl'
+                        create_https_connector( server, opts )
+                      when 'tcp'
+                        create_http_connector( server, opts )
+                      else
+                        raise "Unsupported connection scheme '#{opts[:scheme]}'"
+                      end
+          h = opts[:host] || @host
+          connector.host = h if h
+          connector.port = opts[:port] || ( first && @port ) || 0
+          connector.idle_timeout = opts[:max_idle_time_ms] || @max_idle_time_ms
+          first = false
+          connector
+        end
+      end
+
+      def parse_connection_uri( uri )
+        u = URI.parse( uri )
+        opts = { scheme: u.scheme,
+                 host: u.host,
+                 port: u.port }
+
+        if u.query
+          params = URI.decode_www_form( u.query )
+          params = params.inject({}) { |m,(k,v)| m[k.to_sym] = v; m }
+          opts.merge!( params )
+        end
+
+        opts
+      end
+      def create_http_connector( server, opts = {} )
+        ServerConnector.new( server )
+      end
+
+      def create_https_connector( server, opts = {} )
+        ctx_f = SslContextFactory.new
+        if opts[:key_store_path]
+          ctx_f.key_store_path = opts[:key_store_path]
+        end
+        if opts[:key_store_password]
+          ctx_f.key_store_password = opts[:key_store_password]
+        end
+        ssl_con_f = SslConnectionFactory.new(ctx_f, HttpVersion::HTTP_1_1.to_s)
+
+        conf = HttpConfiguration.new
+        conf.add_customizer( SecureRequestCustomizer.new )
+        http_con_f = HttpConnectionFactory.new( conf )
+
+        ServerConnector.new( server, ssl_con_f, http_con_f )
+
       end
 
       # Returns an Array of org.eclipse.jetty.Handler instances.

data/lib/rjack-jetty/base.rb

@@ -16,9 +16,9 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '9.2.10'
+    JETTY_VERSION = '9.2.11'
     VERSION = JETTY_VERSION + '.0'
-    JETTY_BUILD = 'v20150310'
+    JETTY_BUILD = 'v20150529'
     SERVLET_API_VERSION = '3.1.0'
 
     JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:

data/pom.xml

@@ -16,43 +16,43 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.2.10.v20150310</version>
+      <version>9.2.11.v20150529</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.2.10.v20150310</version>
+      <version>9.2.11.v20150529</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>9.2.10.v20150310</version>
+      <version>9.2.11.v20150529</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>9.2.10.v20150310</version>
+      <version>9.2.11.v20150529</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>9.2.10.v20150310</version>
+      <version>9.2.11.v20150529</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.2.10.v20150310</version>
+      <version>9.2.11.v20150529</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-continuation</artifactId>
-      <version>9.2.10.v20150310</version>
+      <version>9.2.11.v20150529</version>
     </dependency>
 
   </dependencies>

data/test/test_jetty.rb

@@ -73,6 +73,36 @@ class TestJetty < MiniTest::Unit::TestCase
     server.join
   end
 
+  def test_static_ssl
+    factory = default_factory
+    factory.connections = [ { scheme: 'tcp' },
+                            { scheme: 'ssl',
+                              key_store_path: 'test/keystore',
+                              key_store_password: 'password'} ]
+    factory.static_contexts[ '/' ] = TEST_DIR
+    server = factory.create
+    server.start
+    port = server.connectors[1].local_port
+    test_text = get( '/test.txt', port, :ssl ).body
+    assert_equal( File.read( File.join( TEST_DIR, 'test.txt' ) ), test_text )
+    server.stop
+    server.join
+  end
+
+  def test_static_ssl_uri
+    factory = default_factory
+    factory.connections = [ 'tcp://0.0.0.0',
+                            'ssl://127.0.0.1?key_store_path=test/keystore&key_store_password=password' ]
+    factory.static_contexts[ '/' ] = TEST_DIR
+    server = factory.create
+    server.start
+    port = server.connectors[1].local_port
+    test_text = get( '/test.txt', port, :ssl ).body
+    assert_equal( File.read( File.join( TEST_DIR, 'test.txt' ) ), test_text )
+    server.stop
+    server.join
+  end
+
   class TestHandler < AbstractHandler
     TEST_TEXT = 'test handler text'
 
@@ -157,8 +187,12 @@ class TestJetty < MiniTest::Unit::TestCase
     server.join
   end
 
-  def get( path, port )
-    Net::HTTP.start( 'localhost', port ) do |http|
+  def get( path, port, scheme = :tcp )
+    args = [ 'localhost', port, nil, nil, nil, nil ]
+    if scheme == :ssl
+      args << { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE }
+    end
+    Net::HTTP.start( *args ) do |http|
       http.open_timeout = 1.0
       http.read_timeout = 1.0
       http.get( path )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjack-jetty
 version: !ruby/object:Gem::Version
-  version: 9.2.10.0
+  version: 9.2.11.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -106,21 +106,22 @@ files:
 - lib/rjack-jetty/base.rb
 - lib/rjack-jetty/client.rb
 - lib/rjack-jetty/javax.servlet-api-3.1.0.jar
-- lib/rjack-jetty/jetty-client-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-continuation-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-http-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-io-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-rewrite-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-security-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-server-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-servlet-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-util-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-webapp-9.2.10.v20150310.jar
-- lib/rjack-jetty/jetty-xml-9.2.10.v20150310.jar
+- lib/rjack-jetty/jetty-client-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-continuation-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-http-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-io-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-rewrite-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-security-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-server-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-servlet-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-util-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-webapp-9.2.11.v20150529.jar
+- lib/rjack-jetty/jetty-xml-9.2.11.v20150529.jar
 - lib/rjack-jetty/rewrite.rb
 - lib/rjack-jetty/rjack-jetty-1.0.jar
 - lib/rjack-jetty/test-servlets.rb
 - pom.xml
+- test/keystore
 - test/test.txt
 - test/test_jetty.rb
 - webapps/test.war
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: A gem packaging of the Jetty Web Server for JRuby.