Title: [478] trunk/rails-integration: Update to JRuby 0.9.9, allow objectspace by default
- Revision
- 478
- Author
- tantalon
- Date
- 2007-04-24 02:32:12 -0400 (Tue, 24 Apr 2007)
Log Message
Update to JRuby 0.9.9, allow objectspace by default
Modified Paths
Diff
Modified: trunk/rails-integration/pom.xml (477 => 478)
--- trunk/rails-integration/pom.xml 2007-04-23 20:48:49 UTC (rev 477)
+++ trunk/rails-integration/pom.xml 2007-04-24 06:32:12 UTC (rev 478)
@@ -4,7 +4,7 @@
<groupId>org.jruby.extras</groupId>
<artifactId>rails-integration</artifactId>
<packaging>jar</packaging>
- <version>1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Rails Integration</name>
<description>Rails-Integration allows you to deploy your standard Rails web application
to a J2EE server. You can package up your application as a WAR file for
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>0.9.8</version>
+ <version>0.9.9</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
Modified: trunk/rails-integration/src/main/java/org/jruby/webapp/AbstractRailsServlet.java (477 => 478)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/AbstractRailsServlet.java 2007-04-23 20:48:49 UTC (rev 477)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/AbstractRailsServlet.java 2007-04-24 06:32:12 UTC (rev 478)
@@ -33,11 +33,6 @@
* Initialize the servlet.
*/
public void init() throws ServletException {
- // disable objectspace because of deadlock on tests
- if (System.getProperty("jruby.objectspace.enabled") == null) {
- System.setProperty("jruby.objectspace.enabled", "false");
- }
-
// prepare JRuby home
if (isStandalone()) {
log("Ruby is running in standalone mode");
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
