Relocate Http11 JRuby extension.

- Renamed http11_java to plain http11 to avoid require conditionals
- Updated Manifest to reflect the change
- Updated JavaExtensionTask to reflect the change

History.txt

@@ -18,7 +18,7 @@ Reorganization:
 * Compile extension using rake-compiler
 * Upgraded http11_parser to work with Ragel 6.2
 * Deprecated obsolete Windows service example scripts (from 2006!)
-
+* Relocate Http11 JRuby extension to share http11 C extension folder and name.
 
 === 1.1.5 / 2008-05-22
 

Manifest.txt

@@ -25,9 +25,9 @@ ext/http11/http11_parser.h
 ext/http11/http11_parser.java.rl
 ext/http11/http11_parser.rl
 ext/http11/http11_parser_common.rl
-ext/http11_java/Http11Service.java
-ext/http11_java/org/jruby/mongrel/Http11.java
-ext/http11_java/org/jruby/mongrel/Http11Parser.java
+ext/http11/Http11Service.java
+ext/http11/org/jruby/mongrel/Http11.java
+ext/http11/org/jruby/mongrel/Http11Parser.java
 lib/mongrel.rb
 lib/mongrel/camping.rb
 lib/mongrel/cgi.rb

tasks/java.rake

@@ -1,5 +1,5 @@
 require 'rake/javaextensiontask'
 
 # build http11 java extension
-Rake::JavaExtensionTask.new('http11_java', HOE.spec) do |ext|
+Rake::JavaExtensionTask.new('http11', HOE.spec) do |ext|
 end