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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. data/History.rdoc +3 -0
  2. data/Manifest.txt +5 -1
  3. data/Rakefile +8 -0
  4. data/lib/rjack-jetty-jsp/base.rb +3 -1
  5. data/lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.26.jar +0 -0
  6. data/pom.xml +1 -1
  7. data/test/test_jsp.rb +60 -0
  8. data/webapps/test.war +0 -0
  9. data/webapps/test/WEB-INF/web.xml +7 -0
  10. data/webapps/test/index.jsp +10 -0
  11. metadata +14 -10
  12. data/lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.25.jar +0 -0
data/History.rdoc CHANGED
@@ -1,3 +1,6 @@
1
+ === 6.1.26.2.1.0 (2010-12-28)
2
+ * Update to Jetty 6.1.26 JSP 2.1
3
+
1
4
  === 6.1.25.2.1.0 (2010-8-31)
2
5
  * Update to Jetty 6.1.25 JSP 2.1
3
6
  * Include eclipse.core.compilar:ecj jar
data/Manifest.txt CHANGED
@@ -6,9 +6,13 @@ assembly.xml
6
6
  pom.xml
7
7
  lib/rjack-jetty-jsp/base.rb
8
8
  lib/rjack-jetty-jsp.rb
9
+ test/test_jsp.rb
10
+ webapps/test/index.jsp
11
+ webapps/test/WEB-INF/web.xml
12
+ webapps/test.war
9
13
  lib/rjack-jetty-jsp/ant-1.6.5.jar
10
14
  lib/rjack-jetty-jsp/core-3.1.1.jar
11
15
  lib/rjack-jetty-jsp/ecj-3.5.1.jar
12
16
  lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20091210.jar
13
- lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.25.jar
17
+ lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.26.jar
14
18
  lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20091210.jar
data/Rakefile CHANGED
@@ -20,6 +20,14 @@ t.specify do |h|
20
20
  h.remote_rdoc_dir = 'jetty-jsp'
21
21
  end
22
22
 
23
+ file 'webapps/test.war' => [ 'webapps/test/index.jsp',
24
+ 'webapps/test/WEB-INF/web.xml' ] do
25
+ sh( 'jar cvf webapps/test.war ' +
26
+ '-C webapps/test index.jsp -C webapps/test WEB-INF/web.xml' )
27
+ end
28
+
29
+ t.generated_files = 'webapps/test.war'
30
+
23
31
  t.assembly_version = 1.0
24
32
 
25
33
  task :check_pom_deps do
data/lib/rjack-jetty-jsp/base.rb CHANGED
@@ -17,13 +17,15 @@
17
17
  module RJack
18
18
  module Jetty
19
19
  module Jsp
20
- JETTY_VERSION = '6.1.25'
20
+ JETTY_VERSION = '6.1.26'
21
21
  JSP_VERSION = '2.1'
22
22
  GEM_VERSION = '0'
23
23
 
24
24
  VERSION = [ JETTY_VERSION, JSP_VERSION, GEM_VERSION ].join( '.' )
25
25
 
26
26
  JETTY_JSP_DIR = File.dirname( __FILE__ ) # :nodoc:
27
+
28
+ TEST_WAR = File.join( JETTY_JSP_DIR, '..', '..', 'webapps', 'test.war' )
27
29
  end
28
30
  end
29
31
  end
data/pom.xml CHANGED
@@ -10,7 +10,7 @@
10
10
  <dependency>
11
11
  <groupId>org.mortbay.jetty</groupId>
12
12
  <artifactId>jsp-2.1-jetty</artifactId>
13
- <version>6.1.25</version>
13
+ <version>6.1.26</version>
14
14
  </dependency>
15
15
  </dependencies>
16
16
 
data/test/test_jsp.rb ADDED
@@ -0,0 +1,60 @@
1
+ #!/usr/bin/env jruby
2
+ #.hashdot.profile += jruby-shortlived
3
+ #--
4
+ # Copyright (c) 2008-2010 David Kellum
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License"); you
7
+ # may not use this file except in compliance with the License. You
8
+ # may obtain a copy of the License at
9
+ #
10
+ # http://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
15
+ # implied. See the License for the specific language governing
16
+ # permissions and limitations under the License.
17
+ #++
18
+
19
+ TEST_DIR = File.dirname(__FILE__)
20
+
21
+ $LOAD_PATH.unshift File.join( TEST_DIR, "..", "lib" )
22
+
23
+ require 'rubygems'
24
+
25
+ # Disable jetty logging if rjack-slf4j is available
26
+ begin
27
+ gem( 'rjack-slf4j', '~> 1.5' )
28
+ require 'rjack-slf4j'
29
+ require 'rjack-slf4j/nop'
30
+ rescue Gem::LoadError
31
+ end
32
+
33
+ require 'rjack-jetty-jsp'
34
+ require 'test/unit'
35
+ require 'net/http'
36
+
37
+ class TestJsp < Test::Unit::TestCase
38
+ include RJack::Jetty
39
+
40
+ def default_factory
41
+ factory = ServerFactory.new
42
+ factory.max_threads = 1
43
+ factory.stop_at_shutdown = false
44
+ factory
45
+ end
46
+
47
+ def test_webapp
48
+ factory = default_factory
49
+ factory.webapp_contexts[ '/' ] = Jsp::TEST_WAR
50
+
51
+ server = factory.create
52
+ server.start
53
+ port = server.connectors[0].local_port
54
+
55
+ jsp_out = Net::HTTP.get( 'localhost', '/', port )
56
+ assert( jsp_out =~ /Hello World!/, jsp_out )
57
+
58
+ server.stop
59
+ end
60
+ end
data/webapps/test.war ADDED
Binary file
data/webapps/test/WEB-INF/web.xml ADDED
@@ -0,0 +1,7 @@
1
+ <!DOCTYPE web-app PUBLIC
2
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
3
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
4
+
5
+ <web-app>
6
+ <display-name>Test Webapp</display-name>
7
+ </web-app>
data/webapps/test/index.jsp ADDED
@@ -0,0 +1,10 @@
1
+ <html>
2
+ <body>
3
+ <h2>Test JSP Page</h2>
4
+
5
+ <% String hello = "Hello World"; %>
6
+
7
+ <p><%= hello %>!</p>
8
+
9
+ </body>
10
+ </html>
metadata CHANGED
@@ -5,11 +5,11 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 6
7
7
  - 1
8
- - 25
8
+ - 26
9
9
  - 2
10
10
  - 1
11
11
  - 0
12
- version: 6.1.25.2.1.0
12
+ version: 6.1.26.2.1.0
13
13
  platform: java
14
14
  authors:
15
15
  - David Kellum
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2010-08-31 00:00:00 -07:00
20
+ date: 2010-12-28 00:00:00 -08:00
21
21
  default_executable:
22
22
  dependencies:
23
23
  - !ruby/object:Gem::Dependency
@@ -30,9 +30,9 @@ dependencies:
30
30
  segments:
31
31
  - 6
32
32
  - 1
33
- - 25
33
+ - 26
34
34
  - 0
35
- version: 6.1.25.0
35
+ version: 6.1.26.0
36
36
  type: :runtime
37
37
  version_requirements: *id001
38
38
  - !ruby/object:Gem::Dependency
@@ -45,8 +45,8 @@ dependencies:
45
45
  segments:
46
46
  - 1
47
47
  - 2
48
- - 2
49
- version: 1.2.2
48
+ - 3
49
+ version: 1.2.3
50
50
  type: :development
51
51
  version_requirements: *id002
52
52
  description: |-
@@ -72,11 +72,15 @@ files:
72
72
  - pom.xml
73
73
  - lib/rjack-jetty-jsp/base.rb
74
74
  - lib/rjack-jetty-jsp.rb
75
+ - test/test_jsp.rb
76
+ - webapps/test/index.jsp
77
+ - webapps/test/WEB-INF/web.xml
78
+ - webapps/test.war
75
79
  - lib/rjack-jetty-jsp/ant-1.6.5.jar
76
80
  - lib/rjack-jetty-jsp/core-3.1.1.jar
77
81
  - lib/rjack-jetty-jsp/ecj-3.5.1.jar
78
82
  - lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20091210.jar
79
- - lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.25.jar
83
+ - lib/rjack-jetty-jsp/jsp-2.1-jetty-6.1.26.jar
80
84
  - lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20091210.jar
81
85
  has_rdoc: true
82
86
  homepage: http://rjack.rubyforge.org
@@ -109,5 +113,5 @@ rubygems_version: 1.3.6
109
113
  signing_key:
110
114
  specification_version: 3
111
115
  summary: A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/] JSP 2.1 support for JRuby
112
- test_files: []
113
-
116
+ test_files:
117
+ - test/test_jsp.rb