rjack-jetty-jsp 7.5.4.0-java → 7.6.0.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 7.6.0.0 (2012-1-29)
+* Update to Jetty 7.6.0.v20120127. The jetty-jsp-2.1 jar is no longer
+  required or available with jetty 7.6.0,
+* Upgrade to tarpit ~> 2.0 (build)
+
 === 7.5.4.0 (2011-11-5)
 * Update to Jetty 7.5.4.v20111024
 * Includes glassfish jsp-impl 2.3.1-b10, ecj 3.7

data/Manifest.txt

@@ -12,6 +12,5 @@ webapps/test/WEB-INF/web.xml
 webapps/test.war
 lib/rjack-jetty-jsp/ecj-3.7.jar
 lib/rjack-jetty-jsp/el-api-2.1.2-b02.jar
-lib/rjack-jetty-jsp/jetty-jsp-2.1-7.5.4.v20111024.jar
 lib/rjack-jetty-jsp/jsp-api-2.1.3-b02.jar
 lib/rjack-jetty-jsp/jsp-impl-2.1.3-b10.jar

data/README.rdoc

@@ -14,7 +14,7 @@ rjack-jetty[http://rjack.rubyforge.org/jetty/] gem.
 
 === rjack-jetty-jsp 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,22 +1,14 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-require 'rjack-jetty-jsp/base'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.4'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-include RJack
+RJack::TarPit.new( 'rjack-jetty-jsp' ) do |tp|
 
-t = TarPit.new( 'rjack-jetty-jsp',
-                Jetty::Jsp::VERSION,
-                :jars_from_assembly, :java_platform )
+  tp.rdoc_destinations <<
+    'dekellum@rubyforge.org:/var/www/gforge-projects/rjack/jetty-jsp'
 
-t.specify do |h|
-  h.developer( "David Kellum", "dek-oss@gravitext.com" )
-  h.extra_deps << [ 'rjack-jetty', "~> #{Jetty::Jsp::JETTY_VERSION}.0" ]
-  h.rdoc_locations << "dekellum@rubyforge.org:/var/www/gforge-projects/rjack/jetty-jsp"
 end
 
 file 'webapps/test.war' => [ 'webapps/test/index.jsp',
@@ -24,24 +16,3 @@ file 'webapps/test.war' => [ 'webapps/test/index.jsp',
   sh( 'jar cvf webapps/test.war ' +
       '-C webapps/test index.jsp -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::Jsp::JETTY_VERSION }.#{ Jetty::Jsp::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/assembly.xml

@@ -8,7 +8,6 @@
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
-        <include>org.eclipse.jetty:jetty-jsp-2.1</include>
         <include>org.glassfish.web:jsp-impl</include>
         <include>org.eclipse.jdt.core.compiler:ecj</include>
         <include>javax.servlet.jsp:jsp-api</include>

data/lib/rjack-jetty-jsp.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-jsp/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
@@ -17,10 +17,10 @@
 module RJack
   module Jetty
     module Jsp
-      JETTY_VERSION = '7.5.4'
+      JETTY_VERSION = '7.6.0'
       GEM_VERSION = '0'
       VERSION = [ JETTY_VERSION, GEM_VERSION ].join( '.' )
-      JETTY_BUILD = 'v20111024'
+      JETTY_BUILD = 'v20120127'
       JSP_VERSION = '2.1'
 
       JETTY_JSP_DIR = File.dirname( __FILE__ ) # :nodoc:

data/pom.xml

@@ -11,11 +11,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jsp-2.1</artifactId>
-      <version>7.5.4.v20111024</version>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.web</groupId>
       <artifactId>jsp-impl</artifactId>

data/test/test_jsp.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,25 +17,20 @@
 # 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-jsp'
-require 'test/unit'
 require 'net/http'
 
-class TestJsp < Test::Unit::TestCase
+class TestJsp < MiniTest::Unit::TestCase
   include RJack::Jetty
 
   def default_factory

metadata

@@ -2,7 +2,7 @@
 name: rjack-jetty-jsp
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 7.5.4.0
+  version: 7.6.0.0
 platform: java
 authors: 
   - David Kellum
@@ -10,34 +10,56 @@ 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-jetty
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 7.5.4.0
+            version: 7.6.0.0
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: rjack-tarpit
+    name: minitest
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "2.2"
+    requirement: *id002
     prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rjack-slf4j
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.5.8
+        - - <
+          - !ruby/object:Gem::Version 
+            version: "1.7"
+    requirement: *id003
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rjack-tarpit
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: "2.0"
+    requirement: *id004
+    prerelease: false
     type: :development
-    version_requirements: *id002
-description: |-
-  A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/]
-  JSP 2.1 support for JRuby. This gem is provided as a companion to the
-  rjack-jetty[http://rjack.rubyforge.org/jetty/] gem.
+description: A gem packaging of the Jetty Web Server JSP 2.1 support for JRuby. This gem is provided as a companion to the rjack-jetty gem.
 email: 
   - dek-oss@gravitext.com
 executables: []
@@ -45,7 +67,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - Manifest.txt
   - History.rdoc
   - README.rdoc
 files: 
@@ -63,10 +84,8 @@ files:
   - webapps/test.war
   - lib/rjack-jetty-jsp/ecj-3.7.jar
   - lib/rjack-jetty-jsp/el-api-2.1.2-b02.jar
-  - lib/rjack-jetty-jsp/jetty-jsp-2.1-7.5.4.v20111024.jar
   - lib/rjack-jetty-jsp/jsp-api-2.1.3-b02.jar
   - lib/rjack-jetty-jsp/jsp-impl-2.1.3-b10.jar
-  - .gemtest
 homepage: http://rjack.rubyforge.org/jetty-jsp
 licenses: []
 
@@ -81,19 +100,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-jsp
-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/] JSP 2.1 support for JRuby
-test_files: 
-  - test/test_jsp.rb
+summary: A gem packaging of the Jetty Web Server JSP 2.1 support for JRuby.
+test_files: []
+