rjack-jetty 6.1.22.1-java → 6.1.23.0-java

data/History.rdoc

@@ -1,3 +1,6 @@
+=== 6.1.23.0 (2010-4-21)
+* Update to Jetty 6.1.23
+
 === 6.1.22.1 (2010-3-6)
 * Set gem platform to java
 * Upgraded to tarpit ~> 1.2.0

data/Manifest.txt

@@ -1,24 +1,21 @@
-Manifest.static
+History.rdoc
 Manifest.txt
 README.rdoc
-History.rdoc
 Rakefile
-pom.xml
 assembly.xml
+pom.xml
+bin/rjack-jetty-service
 lib/rjack-jetty/base.rb
 lib/rjack-jetty.rb
 lib/rjack-jetty/rewrite.rb
 lib/rjack-jetty/test-servlets.rb
-bin/rjack-jetty-service
-src/main/java/rjack/testservlets/PerfTestServlet.java
-src/main/java/rjack/testservlets/SnoopServlet.java
-test/test_jetty.rb
 test/test.txt
-webapps/test/WEB-INF/web.xml
+test/test_jetty.rb
 webapps/test/index.html
+webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty/jetty-6.1.22.jar
-lib/rjack-jetty/jetty-rewrite-handler-6.1.22.jar
-lib/rjack-jetty/jetty-util-6.1.22.jar
+lib/rjack-jetty/jetty-6.1.23.jar
+lib/rjack-jetty/jetty-rewrite-handler-6.1.23.jar
+lib/rjack-jetty/jetty-util-6.1.23.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar
 lib/rjack-jetty/servlet-api-2.5-20081211.jar

data/README.rdoc

@@ -59,7 +59,7 @@ No hard requirements, however:
 
 === rjack-jetty gem
 
-Copyright (c) 2008-2009 David Kellum
+Copyright (c) 2008-2010 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/bin/rjack-jetty-service

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (C) 2008 David Kellum
+# Copyright (c) 2008-2010 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-2009 David Kellum
+# Copyright (c) 2008-2010 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-2009 David Kellum
+# Copyright (c) 2008-2010 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,8 +16,8 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '6.1.22'
-    VERSION = JETTY_VERSION + '.1'
+    JETTY_VERSION = '6.1.23'
+    VERSION = JETTY_VERSION + '.0'
     SERVLET_API_VERSION = '2.5'
     SERVLET_API_DATE = '20081211'
 

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

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2008 David Kellum
+# Copyright (c) 2008-2010 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

@@ -12,19 +12,19 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.22</version>
+      <version>6.1.23</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>6.1.22</version>
+      <version>6.1.23</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-rewrite-handler</artifactId>
-      <version>6.1.22</version>
+      <version>6.1.23</version>
     </dependency>
 
   </dependencies>

data/test/test_jetty.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
 #--
-# Copyright (C) 2008 David Kellum
+# Copyright (c) 2008-2010 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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjack-jetty
 version: !ruby/object:Gem::Version 
-  version: 6.1.22.1
+  prerelease: false
+  segments: 
+    - 6
+    - 1
+    - 23
+    - 0
+  version: 6.1.23.0
 platform: java
 authors: 
   - David Kellum
@@ -9,29 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -08:00
+date: 2010-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-logback
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 9
+              - 17
             version: 0.9.17
-      version: 
+    type: :development
+    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.2.0
-      version: 
+            segments: 
+              - 1
+              - 2
+              - 1
+            version: 1.2.1
+    type: :development
+    version_requirements: *id002
 description: |-
   A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/]
   for JRuby:
@@ -56,28 +70,25 @@ extra_rdoc_files:
   - README.rdoc
   - History.rdoc
 files: 
-  - Manifest.static
+  - History.rdoc
   - Manifest.txt
   - README.rdoc
-  - History.rdoc
   - Rakefile
-  - pom.xml
   - assembly.xml
+  - pom.xml
+  - bin/rjack-jetty-service
   - lib/rjack-jetty/base.rb
   - lib/rjack-jetty.rb
   - lib/rjack-jetty/rewrite.rb
   - lib/rjack-jetty/test-servlets.rb
-  - bin/rjack-jetty-service
-  - src/main/java/rjack/testservlets/PerfTestServlet.java
-  - src/main/java/rjack/testservlets/SnoopServlet.java
-  - test/test_jetty.rb
   - test/test.txt
-  - webapps/test/WEB-INF/web.xml
+  - test/test_jetty.rb
   - webapps/test/index.html
+  - webapps/test/WEB-INF/web.xml
   - webapps/test.war
-  - lib/rjack-jetty/jetty-6.1.22.jar
-  - lib/rjack-jetty/jetty-rewrite-handler-6.1.22.jar
-  - lib/rjack-jetty/jetty-util-6.1.22.jar
+  - lib/rjack-jetty/jetty-6.1.23.jar
+  - lib/rjack-jetty/jetty-rewrite-handler-6.1.23.jar
+  - lib/rjack-jetty/jetty-util-6.1.23.jar
   - lib/rjack-jetty/rjack-jetty-1.0.jar
   - lib/rjack-jetty/servlet-api-2.5-20081211.jar
 has_rdoc: true
@@ -94,18 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rjack
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 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"

data/Manifest.static

@@ -1,18 +0,0 @@
-Manifest.static
-Manifest.txt
-README.rdoc
-History.rdoc
-Rakefile
-pom.xml
-assembly.xml
-lib/rjack-jetty/base.rb
-lib/rjack-jetty.rb
-lib/rjack-jetty/rewrite.rb
-lib/rjack-jetty/test-servlets.rb
-bin/rjack-jetty-service
-src/main/java/rjack/testservlets/PerfTestServlet.java
-src/main/java/rjack/testservlets/SnoopServlet.java
-test/test_jetty.rb
-test/test.txt
-webapps/test/WEB-INF/web.xml
-webapps/test/index.html

data/src/main/java/rjack/testservlets/PerfTestServlet.java

@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2008 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 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.
- */
-
-package rjack.testservlets;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.math.BigInteger;
-import java.util.Random;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet for perform and chunked output testing.
- * @author David Kellum
- */
-public class PerfTestServlet extends HttpServlet
-{
-
-    @Override
-    protected void doGet( HttpServletRequest req, HttpServletResponse resp )
-        throws ServletException, IOException
-    {
-        int delayConst = getParam( req, "delay", 0 );
-        int delayRandom = getParam( req, "rdelay", 0 );
-
-        int burnConst = getParam( req, "burn", 0 );
-        int burnRandom = getParam( req, "rburn", 0 );
-
-        int size = getParam( req, "size", 0 );
-        int sizeRandom = getParam( req, "rsize", 0 );
-
-        int count = getParam( req, "count", 0 );
-        count += random( getParam( req, "rcount", 0 ) );
-
-        resp.setContentType("text/html; charset=ISO-8859-1" );
-
-        PrintWriter out = resp.getWriter();
-
-        out.println( "<html>" );
-        out.println( "<head>" );
-        out.println( "<title>Wait/Flush Test</title>" );
-        out.println( "</head>" );
-        out.println( "<body>" );
-
-        out.println( "<h2>Usage</h2>" );
-        out.println( "<table><tr><th>GET Parameter</th><th>Meaning</th></tr>" );
-        out.println( "<tr><td>size</td><td>Chunk constant size ~characters.</td></tr>" );
-        out.println( "<tr><td>rsize</td><td>Chunk random [0,n) size ~characters.</td></tr>" );
-        out.println( "<tr><td>delay</td><td>Constant chunk delay in ms</td></tr>" );
-        out.println( "<tr><td>rdelay</td><td>Random [0,n) chunk delay in ms</td></tr>" );
-        out.println( "<tr><td>burn</td><td>Constant chunk CPU burn time in ms</td></tr>" );
-        out.println( "<tr><td>rburn</td><td>Random [0,n) chunk burn time in ms</td></tr>" );
-        out.println( "</table>" );
-
-        out.println( "<h2>Output</h2>" );
-        out.flush();
-
-        out.println( "<p>Writing " + count + " (delayed) chunks...</p>" );
-        out.flush();
-
-        try {
-            for( int b = 0; b < count; ++b ) {
-
-                long delay = delayConst + random( delayRandom );
-                if( delay > 0 ) Thread.sleep( delay );
-
-                int burn = burnConst + random ( burnRandom );
-                if( burn > 0 ) {
-                    delay += burnTime( burn );
-                }
-
-                out.println( "<p>(Delayed " + delay + " ms) " );
-
-                int f = size + random( sizeRandom );
-                while( f > 0 ) {
-                    out.print( FILLER );
-                    f -= FILLER.length();
-                }
-
-                out.println( "</p>" );
-                out.flush();
-            }
-        }
-        catch( InterruptedException x ) {}
-        out.println( "</body>" );
-        out.println( "</html>" );
-        out.flush();
-    }
-
-    private long burnTime( int burn_ms )
-    {
-        long prime = 2;
-        long begin = System.currentTimeMillis();
-        long endTime = begin + burn_ms;
-        long last = 0;
-        do {
-            prime = BigInteger.probablePrime( 64, new Random() ).longValue();
-            last = System.currentTimeMillis();
-        } while( last < endTime );
-
-        if( prime == 2 ) {
-            throw new IllegalStateException( "Not a prime!" );
-        }
-        return last - begin;
-    }
-
-    private int getParam( HttpServletRequest req, String name, int defVal )
-    {
-        int value = defVal;
-        String strVal = req.getParameter( name );
-        if( strVal != null ) {
-            value = Integer.parseInt( strVal );
-        }
-
-        return value;
-    }
-
-    private int random( int range )
-    {
-        Random _random = new Random();
-        if( range > 0 ) return _random.nextInt( range );
-        return 0;
-    }
-
-    private static final String FILLER =
-        "Lorem ipsum dolor sit amet, consectetur adipisicing elit, " +
-        "sed do eiusmod tempor incididunt ut labore et dolore magna " +
-        "aliqua. Ut enim ad minim veniam, quis nostrud exercitation " +
-        "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis " +
-        "aute irure dolor in reprehenderit in voluptate velit esse cillum " +
-        "dolore eu fugiat nulla pariatur. Excepteur sint occaecat " +
-        "cupidatat non proident, sunt in culpa qui officia deserunt " +
-        "mollit anim id est laborum.  ";
-
-    private static final long serialVersionUID = 1L;
-}

data/src/main/java/rjack/testservlets/SnoopServlet.java

@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2008 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 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.
- */
-
-package rjack.testservlets;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class SnoopServlet extends HttpServlet
-{
-
-    @Override
-    protected void doGet( HttpServletRequest request,
-                              HttpServletResponse response )
-        throws ServletException, IOException
-    {
-        response.setContentType("text/html; charset=UTF-8" );
-
-        PrintWriter out = response.getWriter();
-
-        out.println( "<html>" );
-        out.println( "<head>" );
-        out.println( "<title>Wait/Flush Test</title>" );
-        out.println( "</head>" );
-        out.println( "<body>" );
-
-        writeTableHeader( out, "Request Properties", "Property" );
-        writeRow( out, "Request URI", request.getRequestURI() );
-        writeRow( out, "HTTP Method", request.getMethod() );
-        writeRow( out, "Path Info", request.getPathInfo() );
-        writeRow( out, "Path Trans", request.getPathTranslated() );
-        writeRow( out, "Query String", request.getQueryString() );
-        writeRow( out, "Context Path", request.getContextPath() );
-        writeRow( out, "Servlet Path", request.getServletPath() );
-        writeRow( out, "Is Secure", String.valueOf( request.isSecure() ) );
-        writeRow( out, "Auth Type", request.getAuthType() );
-        writeRow( out, "Remote User", request.getRemoteUser() );
-        out.println( "</table>" );
-
-        writeTableHeader( out, "Request Headers", "Header" );
-        Enumeration<?> hNames = request.getHeaderNames();
-        while( hNames.hasMoreElements() ) {
-            String hname = hNames.nextElement().toString();
-            String hvalue = request.getHeader( hname );
-            writeRow( out, hname, hvalue );
-        }
-        out.println( "</table>" );
-
-        Cookie[] cookies = request.getCookies();
-        if (cookies != null) {
-            writeTableHeader( out, "Cookies", "Cookie" );
-            for( Cookie cookie : cookies ) {
-                writeRow( out, cookie.getName(), cookie.getValue() );
-            }
-            out.println( "</table>" );
-        }
-
-        out.println( "</body>" );
-        out.println( "</html>" );
-        out.close();
-    }
-
-    private void writeTableHeader( PrintWriter out,
-                                   String heading, String name )
-    {
-        out.println( "<h2>" + heading + "</h2>" );
-        out.println( "<table><tr><th>" + name + "</th><th>Value</th></tr>" );
-    }
-
-    private void writeRow( PrintWriter out, String name, String value )
-    {
-        out.println( String.format( "<tr><td>%s</td><td>%s</td></tr>",
-                                    name, value ) );
-    }
-
-    private static final long serialVersionUID = 1L;
-}