jetty-jsp 6.1.14.2.1.1 → 6.1.16.2.1.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 6.1.16.2.1.1 / 2009-04-04
+
+* Update to Jetty 6.1.16 JSP 2.1, which now uses externalized
+  jsp-2.1-glassfish and jsp-api-2.1-glassfish (9.1.1.B51.25.p1) gems.
+
 === 6.1.14.2.1.1 / 2008-12-06
 
 * Update to Jetty 6.1.14

data/Manifest.txt

@@ -6,7 +6,8 @@ pom.xml
 assembly.xml
 lib/jetty-jsp.rb
 lib/jetty-jsp/base.rb
+lib/jetty-jsp/jsp-api-2.1-glassfish-9.1.1.B51.25.p1.jar
 lib/jetty-jsp/ant-1.6.5.jar
+lib/jetty-jsp/jsp-2.1-jetty-6.1.16.jar
+lib/jetty-jsp/jsp-2.1-glassfish-9.1.1.B51.25.p1.jar
 lib/jetty-jsp/core-3.1.1.jar
-lib/jetty-jsp/jsp-api-2.1-6.1.14.jar
-lib/jetty-jsp/jsp-2.1-6.1.14.jar

data/Rakefile

@@ -73,24 +73,19 @@ task :clean => :mvn_clean
 
 task :tag do
   tag = "jetty-jsp-#{JettyJsp::VERSION}"
-  svn_base = 'svn://localhost/subversion.repo/src/gems'
-  tag_url = "#{svn_base}/tags/#{tag}"
-
   dname = File.dirname( __FILE__ )
   dname = '.' if Dir.getwd == dname
-  stat = `svn status #{dname}`
-  stat.strip! if stat
-  if ( stat && stat.length > 0 )
-    $stderr.puts( "Resolve the following before tagging (svn status):" )
-    $stderr.puts( stat )
-  else
-    sh( "svn cp -m 'tag [#{tag}]' #{dname} #{tag_url}" )
+  sh( "git status --only #{dname}" ) do |ok,res|
+    if ok #changes present
+      raise "Commit these changes before tagging."
+    end
   end
+  sh %{git tag -s -f -m "tag [#{tag}]" "#{tag}"}
 end
 
 hoe = Hoe.new( "jetty-jsp", JettyJsp::VERSION ) do |p|
   p.developer( "David Kellum", "dek-ruby@gravitext.com" )
-  p.extra_deps << [ 'jetty', "~> #{JettyJsp::JETTY_VERSION}" ]
+  p.extra_deps << [ 'jetty', "~> #{JettyJsp::JETTY_VERSION}.1" ]
   p.rubyforge_name = "rjack"
   p.rdoc_pattern = /^(lib.*\.(rb|txt))|[^\/]*\.txt$/
 end

data/assembly.xml

@@ -7,8 +7,9 @@
   <dependencySets>
     <dependencySet>
       <includes>
-        <include>org.mortbay.jetty:jsp-2.1</include>
-        <include>org.mortbay.jetty:jsp-api-2.1</include>
+        <include>org.mortbay.jetty:jsp-2.1-jetty</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>ant:ant</include>
       </includes>

data/lib/jetty-jsp/base.rb

@@ -15,7 +15,7 @@
 #++
 
 module JettyJsp
-  JETTY_VERSION = '6.1.14'
+  JETTY_VERSION = '6.1.16'
   JSP_VERSION = '2.1'
   GEM_VERSION = '1'
 

data/pom.xml

@@ -9,8 +9,8 @@
   <dependencies>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1</artifactId>
-      <version>6.1.14</version>
+      <artifactId>jsp-2.1-jetty</artifactId>
+      <version>6.1.16</version>
     </dependency>
   </dependencies>
 

metadata

@@ -40,10 +40,11 @@ files:
 - assembly.xml
 - lib/jetty-jsp.rb
 - lib/jetty-jsp/base.rb
+- lib/jetty-jsp/jsp-api-2.1-glassfish-9.1.1.B51.25.p1.jar
 - lib/jetty-jsp/ant-1.6.5.jar
+- lib/jetty-jsp/jsp-2.1-jetty-6.1.16.jar
+- lib/jetty-jsp/jsp-2.1-glassfish-9.1.1.B51.25.p1.jar
 - lib/jetty-jsp/core-3.1.1.jar
-- lib/jetty-jsp/jsp-api-2.1-6.1.14.jar
-- lib/jetty-jsp/jsp-2.1-6.1.14.jar
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - '>='
@@ -57,12 +58,12 @@ requirements: []
 
 authors: 
 - David Kellum
-date: 2008-12-06 08:00:00 +00:00
+date: 2009-04-04 08:00:00 +00:00
 platform: ruby
 test_files: []
 
 version: !ruby/object:Gem::Version 
-  version: 6.1.14.2.1.1
+  version: 6.1.16.2.1.1
 require_paths: 
 - lib
 dependencies: 
@@ -71,7 +72,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 6.1.14
+        version: 6.1.16.1
     version: 
   type: :runtime
   version_requirement: