rjack-jetty-jsp 6.1.26.2.1.0-java → 7.2.2.0-java

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 7.2.2.0 (2010-12-28)
+* Update to Jetty 7.2.2 (JSP 2.1 only)
+* Includes jsp-(api)-2.1-glassfish-2.1.v201001227
+
 === 6.1.26.2.1.0 (2010-12-28)
 * Update to Jetty 6.1.26 JSP 2.1
 

data/Manifest.txt

@@ -10,9 +10,7 @@ test/test_jsp.rb
 webapps/test/index.jsp
 webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty-jsp/ant-1.6.5.jar
-lib/rjack-jetty-jsp/core-3.1.1.jar
 lib/rjack-jetty-jsp/ecj-3.5.1.jar
-lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20091210.jar
-lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.26.jar
-lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20091210.jar
+lib/rjack-jetty-jsp/jetty-jsp-2.1-7.2.2.v20101205.jar
+lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20100127.jar
+lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20100127.jar

data/README.rdoc

@@ -29,43 +29,20 @@ permissions and limitations under the License.
 
 === Jetty Web Container (Java)
 
-Copyright (c) 1995-2006 Mort Bay Consulting Pty Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright (c) 1995-2009 Mort Bay Consulting Pty Ltd
 
 The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is licensed under the apache 2.0
-license.
+unless otherwise noted. It is dual licensed under the apache 2.0
+license and eclipse 1.0 license. Jetty may be distributed under
+either license.
 
-The javax.servlet package used by Jetty is copyright
-Sun Microsystems, Inc and Apache Software Foundation. It is
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
+The javax.servlet package used was sourced from the Apache
+Software Foundation and is distributed under the apache 2.0
+license.
 
-The UnixCrypt.java code ~Implements the one way cryptography used by
+The UnixCrypt.java code implements the one way cryptography used by
 Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
 modified April 2001  by Iris Van den Broeke, Daniel Deville.
 Permission to use, copy, modify and distribute UnixCrypt
 for non-commercial or commercial purposes and without fee is
 granted provided that the copyright notice appears in all copies.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum
-  1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.

data/Rakefile

@@ -31,8 +31,8 @@ t.generated_files = 'webapps/test.war'
 t.assembly_version = 1.0
 
 task :check_pom_deps do
-  t.test_line_match( 'pom.xml',
-                     %r[<version>#{ Jetty::Jsp::JETTY_VERSION }</version>] )
+  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} / )

data/assembly.xml

@@ -7,12 +7,11 @@
   <dependencySets>
     <dependencySet>
       <includes>
-        <include>org.mortbay.jetty:jsp-2.1-jetty</include>
+        <include>org.eclipse.jetty:jetty-jsp-2.1</include>
         <include>org.mortbay.jetty:jsp-api-2.1-glassfish</include>
         <include>org.mortbay.jetty:jsp-2.1-glassfish</include>
         <include>org.eclipse.jdt:core</include>
         <include>org.eclipse.jdt.core.compiler:ecj</include>
-        <include>ant:ant</include>
       </includes>
     </dependencySet>
   </dependencySets>

data/lib/rjack-jetty-jsp/base.rb

@@ -17,11 +17,11 @@
 module RJack
   module Jetty
     module Jsp
-      JETTY_VERSION = '6.1.26'
-      JSP_VERSION = '2.1'
+      JETTY_VERSION = '7.2.2'
       GEM_VERSION = '0'
-
-      VERSION = [ JETTY_VERSION, JSP_VERSION, GEM_VERSION ].join( '.' )
+      VERSION = [ JETTY_VERSION, GEM_VERSION ].join( '.' )
+      JETTY_BUILD = 'v20101205'
+      JSP_VERSION = '2.1'
 
       JETTY_JSP_DIR = File.dirname( __FILE__ ) # :nodoc:
 

data/pom.xml

@@ -7,10 +7,21 @@
   <version>1.0</version>
 
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jsp-2.1</artifactId>
+      <version>7.2.2.v20101205</version>
+    </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1-jetty</artifactId>
-      <version>6.1.26</version>
+      <artifactId>jsp-2.1-glassfish</artifactId>
+      <version>2.1.v20100127</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

metadata

@@ -3,13 +3,11 @@ name: rjack-jetty-jsp
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-    - 6
-    - 1
-    - 26
+    - 7
+    - 2
     - 2
-    - 1
     - 0
-  version: 6.1.26.2.1.0
+  version: 7.2.2.0
 platform: java
 authors: 
   - David Kellum
@@ -28,11 +26,11 @@ dependencies:
         - - ~>
           - !ruby/object:Gem::Version 
             segments: 
-              - 6
-              - 1
-              - 26
+              - 7
+              - 2
+              - 2
               - 0
-            version: 6.1.26.0
+            version: 7.2.2.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -76,12 +74,10 @@ files:
   - webapps/test/index.jsp
   - webapps/test/WEB-INF/web.xml
   - webapps/test.war
-  - lib/rjack-jetty-jsp/ant-1.6.5.jar
-  - lib/rjack-jetty-jsp/core-3.1.1.jar
   - lib/rjack-jetty-jsp/ecj-3.5.1.jar
-  - lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20091210.jar
-  - lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.26.jar
-  - lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20091210.jar
+  - lib/rjack-jetty-jsp/jetty-jsp-2.1-7.2.2.v20101205.jar
+  - lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20100127.jar
+  - lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20100127.jar
 has_rdoc: true
 homepage: http://rjack.rubyforge.org
 licenses: []