svn commit: r657000 - in /incubator/sling/trunk/scripting/ruby: pom.xml src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java

[cz...@apache.org]

Author: cziegeler
Date: Fri May 16 03:15:57 2008
New Revision: 657000

URL: http://svn.apache.org/viewvc?rev=657000&view=rev
Log:
Update jruby to latest release.

Modified:
    incubator/sling/trunk/scripting/ruby/pom.xml
    incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java

Modified: incubator/sling/trunk/scripting/ruby/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/pom.xml?rev=657000&r1=656999&r2=657000&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/ruby/pom.xml (original)
+++ incubator/sling/trunk/scripting/ruby/pom.xml Fri May 16 03:15:57 2008
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.jruby</groupId>
             <artifactId>jruby-complete</artifactId>
-            <version>1.0</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java?rev=657000&r1=656999&r2=657000&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java (original)
+++ incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java Fri May 16 03:15:57 2008
@@ -37,17 +37,17 @@
  */
 public class ErbScriptEngine extends AbstractSlingScriptEngine {
 
-    private Ruby runtime = null;
+    private Ruby runtime;
 
-    private RubySymbol bindingSym = null;
+    private RubySymbol bindingSym;
 
-    private RubyModule erbModule = null;
+    private RubyModule erbModule;
 
     public ErbScriptEngine(ErbScriptEngineFactory factory) {
         super(factory);
 
-        runtime = Ruby.getDefaultInstance();
-        runtime.evalScript("require 'java';require 'erb';self.send :include, ERB::Util;class ERB;def get_binding;binding;end;attr_reader :props;def set_props(p);@props = p;"
+        runtime = Ruby.newInstance();
+        runtime.evalScriptlet("require 'java';require 'erb';self.send :include, ERB::Util;class ERB;def get_binding;binding;end;attr_reader :props;def set_props(p);@props = p;"
             + "for name,v in @props;instance_eval \"def #{name}; @props['#{name}'];end\";end;end;end;");
 
         erbModule = runtime.getClassFromPath("ERB");