rjack-jetty 7.5.4.0-java → 7.6.0.0-java

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 7.6.0.0 (2012-1-29)
+* Update to Jetty 7.6.0.v20120127
+* Upgrade to tarpit ~> 2.0 (build)
+
 === 7.5.4.0 (2011-11-5)
 * Update to Jetty 7.5.4.v20111024
 

data/Manifest.txt

@@ -15,16 +15,16 @@ test/test_jetty.rb
 webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty/jetty-client-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-continuation-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-http-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-io-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-rewrite-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-security-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-server-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-servlet-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-util-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-webapp-7.5.4.v20111024.jar
-lib/rjack-jetty/jetty-xml-7.5.4.v20111024.jar
+lib/rjack-jetty/jetty-client-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-continuation-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-http-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-io-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-rewrite-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-security-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-server-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-servlet-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-util-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-webapp-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-xml-7.6.0.v20120127.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar
 lib/rjack-jetty/servlet-api-2.5.jar

data/README.rdoc

@@ -22,7 +22,7 @@ jetty-jsp[http://rjack.rubyforge.org/jetty-jsp/] gem.
 == Synopsis
 
   % rjack-jetty-service -v
-  Usage: jetty-service [options]
+  Usage: rjack-jetty-service [options]
       -p, --port N           Port to listen on (default: auto)
       -t, --threads N        Maximum pool threads (default: 20)
       -w, --webapp PATH      Load PATH as root context webapp
@@ -60,7 +60,7 @@ No hard requirements, however:
 
 === rjack-jetty gem
 
-Copyright (c) 2008-2011 David Kellum
+Copyright (c) 2008-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -1,56 +1,18 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-require 'rjack-jetty/base'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.4'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-include RJack
+RJack::TarPit.new( 'rjack-jetty' ) do |tp|
 
-t = TarPit.new( 'rjack-jetty', Jetty::VERSION, :java_platform )
+  tp.rdoc_destinations <<
+    'dekellum@rubyforge.org:/var/www/gforge-projects/rjack/jetty'
 
-t.specify do |h|
-  h.developer( "David Kellum", "dek-oss@gravitext.com" )
-  h.extra_dev_deps << [ 'rjack-logback', '>= 0.9.18', '< 2.0' ]
-  h.rdoc_locations << "dekellum@rubyforge.org:/var/www/gforge-projects/rjack/jetty"
 end
 
-t.jars =
-  begin
-    mods = %w[ webapp xml servlet security server continuation http io util rewrite client ]
-    l = mods.map { |n| "jetty-#{n}-#{ Jetty::JETTY_VERSION }.#{ Jetty::JETTY_BUILD }.jar" }
-    l << "servlet-api-#{ Jetty::SERVLET_API_VERSION }.jar"
-    l << 'rjack-jetty-1.0.jar'
-    l
-  end
-
-file 'Manifest.txt' => [ "lib/#{t.name}/base.rb" ]
-
 file 'webapps/test.war' => [ 'webapps/test/index.html',
                              'webapps/test/WEB-INF/web.xml' ] do
   sh( 'jar cvf webapps/test.war ' +
       '-C webapps/test index.html -C webapps/test WEB-INF/web.xml' )
 end
-
-t.generated_files = 'webapps/test.war'
-
-t.assembly_version = 1.0
-
-task :check_pom_deps do
-  v = "#{ Jetty::JETTY_VERSION }.#{ Jetty::JETTY_BUILD }"
-  t.test_line_match( 'pom.xml', %r{<version>#{ v }</version>} )
-end
-task :check_history_version do
-  t.test_line_match( 'History.rdoc', /^==/, / #{t.version} / )
-end
-task :check_history_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :check_pom_deps, :check_history_version                      ]
-task :tag  => [ :check_pom_deps, :check_history_version, :check_history_date ]
-task :push => [                                          :check_history_date ]
-
-t.define_tasks

data/bin/rjack-jetty-service

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/rjack-jetty.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/rjack-jetty/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,9 +16,9 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '7.5.4'
+    JETTY_VERSION = '7.6.0'
     VERSION = JETTY_VERSION + '.0'
-    JETTY_BUILD = 'v20111024'
+    JETTY_BUILD = 'v20120127'
     SERVLET_API_VERSION = '2.5'
 
     JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:

data/lib/rjack-jetty/test-servlets.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/pom.xml

@@ -16,37 +16,37 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>7.5.4.v20111024</version>
+      <version>7.6.0.v20120127</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.5.4.v20111024</version>
+      <version>7.6.0.v20120127</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>7.5.4.v20111024</version>
+      <version>7.6.0.v20120127</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>7.5.4.v20111024</version>
+      <version>7.6.0.v20120127</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>7.5.4.v20111024</version>
+      <version>7.6.0.v20120127</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>7.5.4.v20111024</version>
+      <version>7.6.0.v20120127</version>
     </dependency>
 
   </dependencies>

data/test/test_jetty.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
+
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,19 +17,15 @@
 # permissions and limitations under the License.
 #++
 
-TEST_DIR = File.dirname(__FILE__)
-
-$LOAD_PATH.unshift File.join( TEST_DIR, "..", "lib" )
-
 require 'rubygems'
+require 'bundler/setup'
 
-# Disable jetty logging if rjack-slf4j is available
-begin
-  gem( 'rjack-slf4j', '~> 1.5' )
-  require 'rjack-slf4j'
-  require 'rjack-slf4j/nop'
-rescue Gem::LoadError
-end
+# Disable Jetty Logging
+require 'rjack-slf4j'
+require 'rjack-slf4j/nop'
+
+require 'minitest/unit'
+require 'minitest/autorun'
 
 require 'rjack-jetty'
 
@@ -36,12 +33,13 @@ require 'rjack-jetty/client'
 require 'rjack-jetty/rewrite'
 require 'rjack-jetty/test-servlets'
 
-require 'test/unit'
 require 'net/http'
 
-class TestJetty < Test::Unit::TestCase
+class TestJetty < MiniTest::Unit::TestCase
   include RJack::Jetty
 
+  TEST_DIR = File.dirname(__FILE__)
+
   def default_factory
     factory = ServerFactory.new
     factory.max_threads = 1

metadata

@@ -2,7 +2,7 @@
 name: rjack-jetty
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 7.5.4.0
+  version: 7.6.0.0
 platform: java
 authors: 
   - David Kellum
@@ -10,12 +10,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: rjack-logback
+    name: minitest
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "2.2"
+    requirement: *id001
     prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rjack-logback
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
@@ -24,32 +34,21 @@ dependencies:
         - - <
           - !ruby/object:Gem::Version 
             version: "2.0"
+    requirement: *id002
+    prerelease: false
     type: :development
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: "2.0"
+    requirement: *id003
+    prerelease: false
     type: :development
-    version_requirements: *id002
-description: |-
-  A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/]
-  for JRuby:
-  
-  * Provides jetty, jetty-util, servlet-api, and jetty-rewrite-handler
-    jars.
-  * A Jetty::ServerFactory for simple programmatic server setup in ruby.
-  * A set of Jetty::TestServlets containing a SnoopServlet and
-    PerfTestServlet (implemented in Java).
-  * A jetty-service bin script for easy testing from the command line.
-  
-  Note that JSP support is provided separately in the companion
-  jetty-jsp[http://rjack.rubyforge.org/jetty-jsp/] gem.
+description: 
 email: 
   - dek-oss@gravitext.com
 executables: 
@@ -57,7 +56,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-  - Manifest.txt
   - History.rdoc
   - README.rdoc
 files: 
@@ -78,20 +76,19 @@ files:
   - webapps/test/index.html
   - webapps/test/WEB-INF/web.xml
   - webapps/test.war
-  - lib/rjack-jetty/jetty-client-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-continuation-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-http-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-io-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-rewrite-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-security-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-server-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-servlet-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-util-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-webapp-7.5.4.v20111024.jar
-  - lib/rjack-jetty/jetty-xml-7.5.4.v20111024.jar
+  - lib/rjack-jetty/jetty-client-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-continuation-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-http-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-io-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-rewrite-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-security-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-server-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-servlet-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-util-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-webapp-7.6.0.v20120127.jar
+  - lib/rjack-jetty/jetty-xml-7.6.0.v20120127.jar
   - lib/rjack-jetty/rjack-jetty-1.0.jar
   - lib/rjack-jetty/servlet-api-2.5.jar
-  - .gemtest
 homepage: http://rjack.rubyforge.org/jetty
 licenses: []
 
@@ -106,19 +103,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 requirements: []
 
-rubyforge_project: rjack-jetty
-rubygems_version: 1.8.9
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: "A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/] for JRuby:  * Provides jetty, jetty-util, servlet-api, and jetty-rewrite-handler jars"
-test_files: 
-  - test/test_jetty.rb
+summary: A gem packaging of the Jetty Web Server for JRuby.
+test_files: []
+