- Revision
- 143
- Author
- mward
- Date
- 2007-06-05 18:04:32 -0500 (Tue, 05 Jun 2007)
Log Message
clean up calls from RubyScriptDataBinder to Ruby runtime
Modified Paths
- trunk/core/src/main/java/org/codehaus/waffle/bind/RubyDataBinder.java
- trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java
Diff
Modified: trunk/core/src/main/java/org/codehaus/waffle/bind/RubyDataBinder.java (142 => 143)
--- trunk/core/src/main/java/org/codehaus/waffle/bind/RubyDataBinder.java 2007-06-05 23:03:22 UTC (rev 142) +++ trunk/core/src/main/java/org/codehaus/waffle/bind/RubyDataBinder.java 2007-06-05 23:04:32 UTC (rev 143) @@ -1,9 +1,9 @@ package org.codehaus.waffle.bind; import ognl.TypeConverter; +import org.codehaus.waffle.action.ArgumentResolver; import org.codehaus.waffle.controller.RubyController; import org.codehaus.waffle.validation.ErrorsContext; -import org.codehaus.waffle.action.ArgumentResolver; import org.jruby.Ruby; import org.jruby.javasupport.JavaEmbedUtils; import org.jruby.runtime.builtin.IRubyObject;
Modified: trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java (142 => 143)
--- trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java 2007-06-05 23:03:22 UTC (rev 142) +++ trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java 2007-06-05 23:04:32 UTC (rev 143) @@ -28,7 +28,6 @@ public Object getComponentInstance(PicoContainer picoContainer) throws PicoInitializationException, PicoIntrospectionException { Ruby runtime = (Ruby) picoContainer.getComponentInstance(Ruby.class); - runtime.evalScript(rubyClassName); String script = "controller = " + rubyClassName + ".new\n" + // instantiate controller @@ -37,7 +36,7 @@ // inject pico container controller.callMethod(runtime.getCurrentContext(), "__pico_container=", JavaEmbedUtils.javaToRuby(runtime, picoContainer)); - + return controller; }
To unsubscribe from this list please visit:
