RubyGems - rjack-jetty-jsp - Versions diffs - 6.1.25.2.1.0-java → 6.1.26.2.1.0-java - Mend

rjack-jetty-jsp 6.1.25.2.1.0-java → 6.1.26.2.1.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

data/History.rdoc +3 -0
data/Manifest.txt +5 -1
data/Rakefile +8 -0
data/lib/rjack-jetty-jsp/base.rb +3 -1
data/lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.26.jar +0 -0
data/pom.xml +1 -1
data/test/test_jsp.rb +60 -0
data/webapps/test.war +0 -0
data/webapps/test/WEB-INF/web.xml +7 -0
data/webapps/test/index.jsp +10 -0
metadata +14 -10
data/lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.25.jar +0 -0

data/History.rdoc CHANGED Viewed

@@ -1,3 +1,6 @@
+=== 6.1.26.2.1.0 (2010-12-28)
+* Update to Jetty 6.1.26 JSP 2.1
 === 6.1.25.2.1.0 (2010-8-31)
 * Update to Jetty 6.1.25 JSP 2.1
 * Include eclipse.core.compilar:ecj jar

data/Manifest.txt CHANGED Viewed

@@ -6,9 +6,13 @@ assembly.xml
 pom.xml
 lib/rjack-jetty-jsp/base.rb
 lib/rjack-jetty-jsp.rb
+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.25.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

data/Rakefile CHANGED Viewed

@@ -20,6 +20,14 @@ t.specify do |h|
   h.remote_rdoc_dir = 'jetty-jsp'
 end
+file 'webapps/test.war' => [ 'webapps/test/index.jsp',
+                             'webapps/test/WEB-INF/web.xml' ] do
+  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

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

@@ -17,13 +17,15 @@
 module RJack
   module Jetty
     module Jsp
-      JETTY_VERSION = '6.1.25'
+      JETTY_VERSION = '6.1.26'
       JSP_VERSION = '2.1'
       GEM_VERSION = '0'
       VERSION = [ JETTY_VERSION, JSP_VERSION, GEM_VERSION ].join( '.' )
       JETTY_JSP_DIR = File.dirname( __FILE__ ) # :nodoc:
+      TEST_WAR = File.join( JETTY_JSP_DIR, '..', '..', 'webapps', 'test.war' )
     end
   end
 end

data/lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.26.jar ADDED Viewed

Binary file

data/pom.xml CHANGED Viewed

@@ -10,7 +10,7 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-jetty</artifactId>
-      <version>6.1.25</version>
+      <version>6.1.26</version>
     </dependency>
   </dependencies>

data/test/test_jsp.rb ADDED Viewed

@@ -0,0 +1,60 @@
+#!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+#--
+# 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
+# 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.
+#++
+TEST_DIR = File.dirname(__FILE__)
+$LOAD_PATH.unshift File.join( TEST_DIR, "..", "lib" )
+require 'rubygems'
+# 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
+require 'rjack-jetty-jsp'
+require 'test/unit'
+require 'net/http'
+class TestJsp < Test::Unit::TestCase
+  include RJack::Jetty
+  def default_factory
+    factory = ServerFactory.new
+    factory.max_threads = 1
+    factory.stop_at_shutdown = false
+    factory
+  end
+  def test_webapp
+    factory = default_factory
+    factory.webapp_contexts[ '/' ] = Jsp::TEST_WAR
+    server = factory.create
+    server.start
+    port = server.connectors[0].local_port
+    jsp_out = Net::HTTP.get( 'localhost', '/', port )
+    assert( jsp_out =~ /Hello World!/, jsp_out )
+    server.stop
+  end
+end

data/webapps/test.war ADDED Viewed

Binary file

data/webapps/test/WEB-INF/web.xml ADDED Viewed

@@ -0,0 +1,7 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<web-app>
+  <display-name>Test Webapp</display-name>
+</web-app>

data/webapps/test/index.jsp ADDED Viewed

@@ -0,0 +1,10 @@
+<html>
+<body>
+<h2>Test JSP Page</h2>
+<% String hello = "Hello World"; %>
+<p><%= hello %>!</p>
+</body>
+</html>

metadata CHANGED Viewed

@@ -5,11 +5,11 @@ version: !ruby/object:Gem::Version
   segments:
     - 6
     - 1
-    - 25
+    - 26
     - 2
     - 1
     - 0
-  version: 6.1.25.2.1.0
+  version: 6.1.26.2.1.0
 platform: java
 authors:
   - David Kellum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-12-28 00:00:00 -08:00
 default_executable:
 dependencies:
   - !ruby/object:Gem::Dependency
@@ -30,9 +30,9 @@ dependencies:
             segments:
               - 6
               - 1
-              - 25
+              - 26
               - 0
-            version: 6.1.25.0
+            version: 6.1.26.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency
@@ -45,8 +45,8 @@ dependencies:
             segments:
               - 1
               - 2
-              - 2
-            version: 1.2.2
+              - 3
+            version: 1.2.3
     type: :development
     version_requirements: *id002
 description: |-
@@ -72,11 +72,15 @@ files:
   - pom.xml
   - lib/rjack-jetty-jsp/base.rb
   - lib/rjack-jetty-jsp.rb
+  - 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.25.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
 has_rdoc: true
 homepage: http://rjack.rubyforge.org
@@ -109,5 +113,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/] JSP 2.1 support for JRuby
-test_files: []
+test_files:
+  - test/test_jsp.rb

data/lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.25.jar DELETED Viewed

Binary file