jetty 6.1.14.1 → 6.1.16.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 6.1.16.1 / 2009-04-04
+
+* Update to Jetty 6.1.16, which now uses externalized
+  org.mortbay.jetty:servlet-api (2.5-20081211) dependency.
+* Add logback as development dependency.
+
 === 6.1.14.1 / 2008-12-06
 
 * Update to Jetty 6.1.14
@@ -10,4 +16,4 @@
 
 === 6.1.11.1 / 2008-11-02
 
-* Inital release based on Jetty Web Server 6.1.11
+* Initial release based on Jetty Web Server 6.1.11

data/Manifest.txt

@@ -5,8 +5,8 @@ Rakefile
 pom.xml
 assembly.xml
 bin/jetty-service
-lib/jetty.rb
 lib/jetty/base.rb
+lib/jetty.rb
 lib/jetty/rewrite.rb
 lib/jetty/test-servlets.rb
 src/main/java/com/gravitext/testservlets/PerfTestServlet.java
@@ -16,8 +16,8 @@ test/test.txt
 webapps/test.war
 webapps/test/WEB-INF/web.xml
 webapps/test/index.html
-lib/jetty/jetty-6.1.14.jar
-lib/jetty/jetty-util-6.1.14.jar
-lib/jetty/jetty-rewrite-handler-6.1.14.jar
-lib/jetty/servlet-api-2.5-6.1.14.jar
+lib/jetty/jetty-6.1.16.jar
+lib/jetty/jetty-util-6.1.16.jar
+lib/jetty/jetty-rewrite-handler-6.1.16.jar
+lib/jetty/servlet-api-2.5-20081211.jar
 lib/jetty/gravitext-testservlets-1.0.jar

data/Rakefile

@@ -26,7 +26,7 @@ require 'jetty/base'
 JARS = %w{ jetty jetty-util jetty-rewrite-handler }.map do |n| 
   "#{n}-#{ Jetty::JETTY_VERSION }.jar" 
 end
-JARS << "servlet-api-#{ Jetty::SERVLET_API_VERSION }-#{ Jetty::JETTY_VERSION }.jar"
+JARS << "servlet-api-#{ Jetty::SERVLET_API_VERSION }-#{ Jetty::SERVLET_API_DATE }.jar"
 JARS << 'gravitext-testservlets-1.0.jar'
 JAR_FILES = JARS.map { |jar| "lib/jetty/#{jar}" }
 
@@ -43,8 +43,8 @@ Rakefile
 pom.xml
 assembly.xml
 bin/jetty-service
-lib/jetty.rb
 lib/jetty/base.rb
+lib/jetty.rb
 lib/jetty/rewrite.rb
 lib/jetty/test-servlets.rb
 src/main/java/com/gravitext/testservlets/PerfTestServlet.java
@@ -89,23 +89,19 @@ task :clean => :mvn_clean
 
 task :tag do
   tag = "jetty-#{Jetty::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", Jetty::VERSION ) do |p|
-  p.developer( "David Kellum", "dek-ruby@gravitext.com" )
+  p.developer( "David Kellum", "dek-oss@gravitext.com" )
+  p.extra_dev_deps << [ 'logback', '>= 0.9.15.1' ]
   p.rubyforge_name = "rjack"
   p.rdoc_pattern = /^(lib.*\.(rb|txt))|[^\/]*\.txt$/
 end

data/assembly.xml

@@ -10,7 +10,7 @@
         <include>org.mortbay.jetty:jetty</include>
         <include>org.mortbay.jetty:jetty-util</include>
         <include>org.mortbay.jetty:jetty-rewrite-handler</include>
-        <include>org.mortbay.jetty:servlet-api-2.5</include>
+        <include>org.mortbay.jetty:servlet-api</include>
         <include>com.gravitext:gravitext-testservlets</include>
       </includes>
     </dependencySet>

data/lib/jetty.rb

@@ -26,7 +26,9 @@ module Jetty
 
   require_jar 'jetty'
   require_jar 'jetty-util'
-  require_jar "servlet-api-#{ SERVLET_API_VERSION }"
+
+  require File.join( JETTY_DIR, 
+    "servlet-api-#{ SERVLET_API_VERSION }-#{ SERVLET_API_DATE }.jar" )
 
   import 'org.mortbay.jetty.Connector'
   import 'org.mortbay.jetty.Handler'

data/lib/jetty/base.rb

@@ -15,9 +15,10 @@
 #++
 
 module Jetty
-  JETTY_VERSION = '6.1.14'
+  JETTY_VERSION = '6.1.16'
   VERSION = JETTY_VERSION + '.1'
   SERVLET_API_VERSION = '2.5'
+  SERVLET_API_DATE = '20081211'
 
   JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:
 end

data/pom.xml

@@ -8,28 +8,23 @@
   <name>Gravitext Test Servlets</name> -->
 
   <dependencies>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api-2.5</artifactId>
-      <version>6.1.14</version>
-    </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.14</version>
+      <version>6.1.16</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>6.1.14</version>
+      <version>6.1.16</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-rewrite-handler</artifactId>
-      <version>6.1.14</version>
+      <version>6.1.16</version>
     </dependency>
 
   </dependencies>

metadata

@@ -6,7 +6,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 email: 
-- dek-ruby@gravitext.com
+- dek-oss@gravitext.com
 cert_chain: []
 
 summary: 'A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/]  for
@@ -44,8 +44,8 @@ files:
 - pom.xml
 - assembly.xml
 - bin/jetty-service
-- lib/jetty.rb
 - lib/jetty/base.rb
+- lib/jetty.rb
 - lib/jetty/rewrite.rb
 - lib/jetty/test-servlets.rb
 - src/main/java/com/gravitext/testservlets/PerfTestServlet.java
@@ -55,10 +55,10 @@ files:
 - webapps/test.war
 - webapps/test/WEB-INF/web.xml
 - webapps/test/index.html
-- lib/jetty/jetty-6.1.14.jar
-- lib/jetty/jetty-util-6.1.14.jar
-- lib/jetty/jetty-rewrite-handler-6.1.14.jar
-- lib/jetty/servlet-api-2.5-6.1.14.jar
+- lib/jetty/jetty-6.1.16.jar
+- lib/jetty/jetty-util-6.1.16.jar
+- lib/jetty/jetty-rewrite-handler-6.1.16.jar
+- lib/jetty/servlet-api-2.5-20081211.jar
 - lib/jetty/gravitext-testservlets-1.0.jar
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -73,15 +73,25 @@ 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: 
 - test/test_jetty.rb
 version: !ruby/object:Gem::Version 
-  version: 6.1.14.1
+  version: 6.1.16.1
 require_paths: 
 - lib
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 0.9.15.1
+    version: 
+  type: :development
+  version_requirement: 
+  name: logback
 - !ruby/object:Gem::Dependency 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: