Title: [906] trunk/rails-integration: Switch to using the 1.5 concurrency classes,
now that JRuby requires it as well
- Revision
- 906
- Author
- tantalon
- Date
- 2008-02-13 17:11:52 -0500 (Wed, 13 Feb 2008)
Log Message
Switch to using the 1.5 concurrency classes, now that JRuby requires it as well
Modified Paths
Diff
Modified: trunk/rails-integration/pom.xml (905 => 906)
--- trunk/rails-integration/pom.xml 2008-02-13 20:06:52 UTC (rev 905)
+++ trunk/rails-integration/pom.xml 2008-02-13 22:11:52 UTC (rev 906)
@@ -170,12 +170,6 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.0</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
Modified: trunk/rails-integration/src/main/java/org/jruby/webapp/FileServlet.java (905 => 906)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/FileServlet.java 2008-02-13 20:06:52 UTC (rev 905)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/FileServlet.java 2008-02-13 22:11:52 UTC (rev 906)
@@ -1,7 +1,6 @@
package org.jruby.webapp;
import org.jruby.webapp.util.FileUtil;
-import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -297,7 +296,7 @@
}
try {
// everything else
- javax.activation.FileTypeMap typeMap =
+ javax.activation.FileTypeMap typeMap =
javax.activation.FileTypeMap.getDefaultFileTypeMap();
return typeMap.getContentType(fileName);
} catch (Throwable t) {
Modified: trunk/rails-integration/src/main/java/org/jruby/webapp/RailsFactory.java (905 => 906)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/RailsFactory.java 2008-02-13 20:06:52 UTC (rev 905)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/RailsFactory.java 2008-02-13 22:11:52 UTC (rev 906)
@@ -1,20 +1,20 @@
package org.jruby.webapp;
import org.apache.commons.pool.PoolableObjectFactory;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
import org.jruby.RubyException;
-import org.jruby.RubyArray;
-import org.jruby.Ruby;
import org.jruby.RubyHash;
import org.jruby.exceptions.RaiseException;
import org.jruby.javasupport.JavaEmbedUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
-import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
/**
* Creates instance of the JRuby runtime and loads Rails.
*
Modified: trunk/rails-integration/src/main/java/org/jruby/webapp/util/CustomObjectPool.java (905 => 906)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/util/CustomObjectPool.java 2008-02-13 20:06:52 UTC (rev 905)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/util/CustomObjectPool.java 2008-02-13 22:11:52 UTC (rev 906)
@@ -1,12 +1,12 @@
package org.jruby.webapp.util;
import org.apache.commons.pool.ObjectPool;
import org.apache.commons.pool.PoolableObjectFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.ArrayBlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.Semaphore;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
import java.util.NoSuchElementException;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* An object pool which assumes that object creation is slow, and should be done in a separate thread.
*
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
