jetty-jsp 6.1.14.2.1.1 → 6.1.16.2.1.1

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 (10) hide show
  1. data/History.txt +5 -0
  2. data/Manifest.txt +3 -2
  3. data/Rakefile +6 -11
  4. data/assembly.xml +3 -2
  5. data/lib/jetty-jsp/base.rb +1 -1
  6. data/lib/jetty-jsp/{jsp-2.1-6.1.14.jar → jsp-2.1-glassfish-9.1.1.B51.25.p1.jar} +0 -0
  7. data/lib/jetty-jsp/jsp-2.1-jetty-6.1.16.jar +0 -0
  8. data/lib/jetty-jsp/{jsp-api-2.1-6.1.14.jar → jsp-api-2.1-glassfish-9.1.1.B51.25.p1.jar} +0 -0
  9. data/pom.xml +2 -2
  10. metadata +6 -5
data/History.txt CHANGED
@@ -1,3 +1,8 @@
1
+ === 6.1.16.2.1.1 / 2009-04-04
2
+
3
+ * Update to Jetty 6.1.16 JSP 2.1, which now uses externalized
4
+ jsp-2.1-glassfish and jsp-api-2.1-glassfish (9.1.1.B51.25.p1) gems.
5
+
1
6
  === 6.1.14.2.1.1 / 2008-12-06
2
7
 
3
8
  * Update to Jetty 6.1.14
data/Manifest.txt CHANGED
@@ -6,7 +6,8 @@ pom.xml
6
6
  assembly.xml
7
7
  lib/jetty-jsp.rb
8
8
  lib/jetty-jsp/base.rb
9
+ lib/jetty-jsp/jsp-api-2.1-glassfish-9.1.1.B51.25.p1.jar
9
10
  lib/jetty-jsp/ant-1.6.5.jar
11
+ lib/jetty-jsp/jsp-2.1-jetty-6.1.16.jar
12
+ lib/jetty-jsp/jsp-2.1-glassfish-9.1.1.B51.25.p1.jar
10
13
  lib/jetty-jsp/core-3.1.1.jar
11
- lib/jetty-jsp/jsp-api-2.1-6.1.14.jar
12
- lib/jetty-jsp/jsp-2.1-6.1.14.jar
data/Rakefile CHANGED
@@ -73,24 +73,19 @@ task :clean => :mvn_clean
73
73
 
74
74
  task :tag do
75
75
  tag = "jetty-jsp-#{JettyJsp::VERSION}"
76
- svn_base = 'svn://localhost/subversion.repo/src/gems'
77
- tag_url = "#{svn_base}/tags/#{tag}"
78
-
79
76
  dname = File.dirname( __FILE__ )
80
77
  dname = '.' if Dir.getwd == dname
81
- stat = `svn status #{dname}`
82
- stat.strip! if stat
83
- if ( stat && stat.length > 0 )
84
- $stderr.puts( "Resolve the following before tagging (svn status):" )
85
- $stderr.puts( stat )
86
- else
87
- sh( "svn cp -m 'tag [#{tag}]' #{dname} #{tag_url}" )
78
+ sh( "git status --only #{dname}" ) do |ok,res|
79
+ if ok #changes present
80
+ raise "Commit these changes before tagging."
81
+ end
88
82
  end
83
+ sh %{git tag -s -f -m "tag [#{tag}]" "#{tag}"}
89
84
  end
90
85
 
91
86
  hoe = Hoe.new( "jetty-jsp", JettyJsp::VERSION ) do |p|
92
87
  p.developer( "David Kellum", "dek-ruby@gravitext.com" )
93
- p.extra_deps << [ 'jetty', "~> #{JettyJsp::JETTY_VERSION}" ]
88
+ p.extra_deps << [ 'jetty', "~> #{JettyJsp::JETTY_VERSION}.1" ]
94
89
  p.rubyforge_name = "rjack"
95
90
  p.rdoc_pattern = /^(lib.*\.(rb|txt))|[^\/]*\.txt$/
96
91
  end
data/assembly.xml CHANGED
@@ -7,8 +7,9 @@
7
7
  <dependencySets>
8
8
  <dependencySet>
9
9
  <includes>
10
- <include>org.mortbay.jetty:jsp-2.1</include>
11
- <include>org.mortbay.jetty:jsp-api-2.1</include>
10
+ <include>org.mortbay.jetty:jsp-2.1-jetty</include>
11
+ <include>org.mortbay.jetty:jsp-api-2.1-glassfish</include>
12
+ <include>org.mortbay.jetty:jsp-2.1-glassfish</include>
12
13
  <include>org.eclipse.jdt:core</include>
13
14
  <include>ant:ant</include>
14
15
  </includes>
data/lib/jetty-jsp/base.rb CHANGED
@@ -15,7 +15,7 @@
15
15
  #++
16
16
 
17
17
  module JettyJsp
18
- JETTY_VERSION = '6.1.14'
18
+ JETTY_VERSION = '6.1.16'
19
19
  JSP_VERSION = '2.1'
20
20
  GEM_VERSION = '1'
21
21
 
data/pom.xml CHANGED
@@ -9,8 +9,8 @@
9
9
  <dependencies>
10
10
  <dependency>
11
11
  <groupId>org.mortbay.jetty</groupId>
12
- <artifactId>jsp-2.1</artifactId>
13
- <version>6.1.14</version>
12
+ <artifactId>jsp-2.1-jetty</artifactId>
13
+ <version>6.1.16</version>
14
14
  </dependency>
15
15
  </dependencies>
16
16
 
metadata CHANGED
@@ -40,10 +40,11 @@ files:
40
40
  - assembly.xml
41
41
  - lib/jetty-jsp.rb
42
42
  - lib/jetty-jsp/base.rb
43
+ - lib/jetty-jsp/jsp-api-2.1-glassfish-9.1.1.B51.25.p1.jar
43
44
  - lib/jetty-jsp/ant-1.6.5.jar
45
+ - lib/jetty-jsp/jsp-2.1-jetty-6.1.16.jar
46
+ - lib/jetty-jsp/jsp-2.1-glassfish-9.1.1.B51.25.p1.jar
44
47
  - lib/jetty-jsp/core-3.1.1.jar
45
- - lib/jetty-jsp/jsp-api-2.1-6.1.14.jar
46
- - lib/jetty-jsp/jsp-2.1-6.1.14.jar
47
48
  required_rubygems_version: !ruby/object:Gem::Requirement
48
49
  requirements:
49
50
  - - '>='
@@ -57,12 +58,12 @@ requirements: []
57
58
 
58
59
  authors:
59
60
  - David Kellum
60
- date: 2008-12-06 08:00:00 +00:00
61
+ date: 2009-04-04 08:00:00 +00:00
61
62
  platform: ruby
62
63
  test_files: []
63
64
 
64
65
  version: !ruby/object:Gem::Version
65
- version: 6.1.14.2.1.1
66
+ version: 6.1.16.2.1.1
66
67
  require_paths:
67
68
  - lib
68
69
  dependencies:
@@ -71,7 +72,7 @@ dependencies:
71
72
  requirements:
72
73
  - - ~>
73
74
  - !ruby/object:Gem::Version
74
- version: 6.1.14
75
+ version: 6.1.16.1
75
76
  version:
76
77
  type: :runtime
77
78
  version_requirement: