Diff
Modified: trunk/rails-integration/plugins/goldspike/lib/war_config.rb (951 => 952)
--- trunk/rails-integration/plugins/goldspike/lib/war_config.rb 2008-03-20 06:17:48 UTC (rev 951)
+++ trunk/rails-integration/plugins/goldspike/lib/war_config.rb 2008-03-20 12:33:30 UTC (rev 952)
@@ -92,8 +92,8 @@
@java_libraries = {}
# default java libraries
- add_library(maven_library('org.jruby', 'jruby-complete', '1.1RC2'))
- add_library(maven_library('org.jruby.extras', 'goldspike', '1.5'))
+ add_library(maven_library('org.jruby', 'jruby-complete', '1.1RC3'))
+ add_library(maven_library('org.jruby.extras', 'goldspike', '1.6'))
add_library(maven_library('javax.activation', 'activation', '1.1'))
add_library(maven_library('commons-pool', 'commons-pool', '1.3'))
add_library(maven_library('bouncycastle', 'bcprov-jdk14', '124'))
Modified: trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb (951 => 952)
--- trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb 2008-03-20 06:17:48 UTC (rev 951)
+++ trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb 2008-03-20 12:33:30 UTC (rev 952)
@@ -99,7 +99,7 @@
# default java libraries
@java_libraries = {}
- add_library('goldspike', :version => '1.5', :group => 'org.jruby.extras')
+ add_library('goldspike', :version => '1.6', :group => 'org.jruby.extras')
add_library('activation', :version => '1.1', :group => 'javax.activation')
add_library('commons-pool', :version => '1.3', :group => 'commons-pool')
#add_library('bcprov-jdk14', :version => '124', :group => 'bouncycastle')
@@ -133,7 +133,7 @@
@add_jruby_complete = true
- add_library('jruby-complete', :version => '1.1RC2', :group => 'org.jruby') if @add_jruby_complete
+ add_library('jruby-complete', :version => '1.1RC3', :group => 'org.jruby') if @add_jruby_complete
end # initialize
def war_file(value = @war_file)
Modified: trunk/rails-integration/pom.xml (951 => 952)
--- trunk/rails-integration/pom.xml 2008-03-20 06:17:48 UTC (rev 951)
+++ trunk/rails-integration/pom.xml 2008-03-20 12:33:30 UTC (rev 952)
@@ -4,7 +4,7 @@
<groupId>org.jruby.extras</groupId>
<artifactId>goldspike</artifactId>
<packaging>jar</packaging>
- <version>1.6-SNAPSHOT</version>
+ <version>1.6</version>
<name>GoldSpike</name>
<description>GoldSpike allows you to deploy your standard Rails web application to a J2EE server. You can package up your application as a WAR file for distribution, or simply run it in an expanded form.</description>
@@ -18,7 +18,7 @@
</activation>
<properties>
<java.source.version>1.5</java.source.version>
- <jruby.version>1.1RC2</jruby.version>
+ <jruby.version>1.1RC3</jruby.version>
</properties>
</profile>
</profiles>
Modified: trunk/rails-integration/src/main/java/org/jruby/webapp/RailsServlet.java (951 => 952)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/RailsServlet.java 2008-03-20 06:17:48 UTC (rev 951)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/RailsServlet.java 2008-03-20 12:33:30 UTC (rev 952)
@@ -8,8 +8,8 @@
import org.jruby.RubySymbol;
import org.jruby.webapp.session.SessionHolder;
import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.runtime.Block;
import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.Block;
import org.jruby.exceptions.RaiseException;
import org.apache.commons.pool.ObjectPool;
import javax.servlet.ServletException;
@@ -117,7 +117,7 @@
protected IRubyObject createCgi(Ruby runtime) {
RubyClass cgiClass = runtime.getClass("CGI");
IRubyObject[] cgiArgs = { JavaEmbedUtils.javaToRuby(runtime, "query") };
- return cgiClass.newInstance(cgiArgs, Block.NULL_BLOCK);
+ return cgiClass.newInstance(runtime.getCurrentContext(), cgiArgs, Block.NULL_BLOCK);
}
/*
