[jruby-rack~main:b8e39a2e] Merge branch 'master' of git@github.com:nicksieger/jruby-rack

[nicksieger@kenai.com]

Project:    jruby-rack
Repository: main
Revision:   b8e39a2e9f2fca155f04e674dbbedfa8e5affb98
Author:     nicksieger
Date:       2010-03-08 17:36:52 UTC
Link:       

Log Message:
------------
Clean up java compiler warnings
Allow javac's -classpath to have spaces
Local jruby-complete usage in merb
Merge branch 'master' of git@github.com:nicksieger/jruby-rack


Revisions:
----------
5d03cf0f0ebdef4455d172a6558890d1102ea7bc
2538c5c36cc8b4e8f250503b192368efd9f36325
092f406dda34e3fd351aa08cb5d2c87390b3763a
b8e39a2e9f2fca155f04e674dbbedfa8e5affb98


Modified Paths:
---------------
Rakefile
pom.xml
src/main/java/org/jruby/rack/input/RubyIORackInput.java
src/main/java/org/jruby/rack/jms/DefaultQueueManager.java
src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java
examples/merb/config/warble.rb


Diffs:
------
diff --git a/Rakefile b/Rakefile
index cb8dabb..83b9815 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,7 +30,7 @@ directory 'target/classes'
 
 desc "Compile java classes"
 task :compile => "target/classes" do |t|
-  sh "javac -classpath #{compile_classpath.join(File::PATH_SEPARATOR)} 
-source 1.5 " +
+  sh "javac -Xlint:deprecation -Xlint:unchecked -classpath 
#{compile_classpath.join(File::PATH_SEPARATOR)} -source 1.5 " +
     "-target 1.5 -d #{t.prerequisites.first} 
#{Dir['src/main/java/**/*.java'].join(' ')}"
 end
 
diff --git a/pom.xml b/pom.xml
index bfe028b..5eb71cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,8 @@
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
+          <showDeprecation>true</showDeprecation>
+          <showWarnings>true</showWarnings>
         </configuration>
       </plugin>
       <plugin>
diff --git a/src/main/java/org/jruby/rack/input/RubyIORackInput.java 
b/src/main/java/org/jruby/rack/input/RubyIORackInput.java
index 48c09e2..1775b49 100644
--- a/src/main/java/org/jruby/rack/input/RubyIORackInput.java
+++ b/src/main/java/org/jruby/rack/input/RubyIORackInput.java
@@ -22,7 +22,7 @@ public class RubyIORackInput implements RackInput {
     }
 
     public IRubyObject gets(ThreadContext context) {
-        return io.gets(context, IRubyObject.NULL_ARRAY);
+        return io.gets(context);
     }
 
     public IRubyObject read(ThreadContext context, IRubyObject[] args) {
diff --git a/src/main/java/org/jruby/rack/jms/DefaultQueueManager.java 
b/src/main/java/org/jruby/rack/jms/DefaultQueueManager.java
index 854503b..5946919 100644
--- a/src/main/java/org/jruby/rack/jms/DefaultQueueManager.java
+++ b/src/main/java/org/jruby/rack/jms/DefaultQueueManager.java
@@ -97,6 +97,7 @@ public class DefaultQueueManager implements QueueManager {
         return jndiContext.lookup(name);
     }
 
+    @SuppressWarnings("unchecked")
     public void destroy() {
         for (Iterator it = queues.entrySet().iterator(); it.hasNext();) {
             Map.Entry<String,Connection> entry = (Map.Entry<String, 
Connection>) it.next();
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java 
b/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java
index a80ebe3..e2f4b9b 100644
--- a/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java
+++ b/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java
@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequestWrapper;
  * Implementation of RackEnvironment for the servlet environment.
  * @author nicksieger
  */
+@SuppressWarnings("deprecation")
 public class ServletRackEnvironment extends HttpServletRequestWrapper
         implements HttpServletRequest, RackEnvironment {
     public ServletRackEnvironment(HttpServletRequest request) {
diff --git a/Rakefile b/Rakefile
index cb8dabb..b4cbc51 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,16 +30,16 @@ directory 'target/classes'
 
 desc "Compile java classes"
 task :compile => "target/classes" do |t|
-  sh "javac -classpath #{compile_classpath.join(File::PATH_SEPARATOR)} 
-source 1.5 " +
-    "-target 1.5 -d #{t.prerequisites.first} 
#{Dir['src/main/java/**/*.java'].join(' ')}"
+  sh 'javac -classpath "' + compile_classpath.join(File::PATH_SEPARATOR) + 
'" -source 1.5 ' +
+    '-target 1.5 -d ' + t.prerequisites.first + ' ' + 
Dir["src/main/java/**/*.java"].join(" ")
 end
 
 directory 'target/test-classes'
 
 desc "Compile classes used for test/spec"
 task :compilespec => "target/test-classes" do |t|
-  sh "javac -classpath #{test_classpath.join(File::PATH_SEPARATOR)} -source 
1.5 " +
-    "-target 1.5 -d #{t.prerequisites.first} 
#{Dir['src/spec/java/**/*.java'].join(' ')}"
+  sh 'javac -classpath "' + test_classpath.join(File::PATH_SEPARATOR) + '" 
-source 1.5 ' +
+    '-target 1.5 -d ' + t.prerequisites.first + ' ' + 
Dir["src/spec/java/**/*.java"].join(" ")
 end
 
 desc "Unpack the rack gem"
diff --git a/examples/merb/config/warble.rb b/examples/merb/config/warble.rb
index c4fda7b..efc8b99 100644
--- a/examples/merb/config/warble.rb
+++ b/examples/merb/config/warble.rb
@@ -21,6 +21,10 @@ Warbler::Config.new do |config|
     config.java_libs.delete_if {|f| f =~ /jruby-rack/}
     config.java_libs += FileList["../../target/jruby-rack*.jar"]
   end
+  if ENV['JRUBY_COMPLETE_SRC']
+    config.java_libs.delete_if {|f| f =~ /jruby-(core|stdlib|complete)/}
+    config.java_libs += FileList[ENV['JRUBY_COMPLETE_SRC']]
+  end
 
   # Loose Java classes and miscellaneous files to be placed in 
WEB-INF/classes.
   # config.java_classes = FileList["target/classes/**.*"]
diff --git a/Rakefile b/Rakefile
index 83b9815..f7ec4d4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,16 +30,16 @@ directory 'target/classes'
 
 desc "Compile java classes"
 task :compile => "target/classes" do |t|
-  sh "javac -Xlint:deprecation -Xlint:unchecked -classpath 
#{compile_classpath.join(File::PATH_SEPARATOR)} -source 1.5 " +
-    "-target 1.5 -d #{t.prerequisites.first} 
#{Dir['src/main/java/**/*.java'].join(' ')}"
+  sh 'javac -Xlint:deprecation -Xlint:unchecked -classpath "' + 
compile_classpath.join(File::PATH_SEPARATOR) + '" -source 1.5 ' +
+    '-target 1.5 -d ' + t.prerequisites.first + ' ' + 
Dir["src/main/java/**/*.java"].join(" ")
 end
 
 directory 'target/test-classes'
 
 desc "Compile classes used for test/spec"
 task :compilespec => "target/test-classes" do |t|
-  sh "javac -classpath #{test_classpath.join(File::PATH_SEPARATOR)} -source 
1.5 " +
-    "-target 1.5 -d #{t.prerequisites.first} 
#{Dir['src/spec/java/**/*.java'].join(' ')}"
+  sh 'javac -classpath "' + test_classpath.join(File::PATH_SEPARATOR) + '" 
-source 1.5 ' +
+    '-target 1.5 -d ' + t.prerequisites.first + ' ' + 
Dir["src/spec/java/**/*.java"].join(" ")
 end
 
 desc "Unpack the rack gem"