You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/05/03 14:01:38 UTC

svn commit: r534808 - in /incubator/tuscany/java/sca/modules/implementation-script: ./ src/main/java/org/apache/tuscany/implementation/script/ src/main/java/org/apache/tuscany/implementation/script/engines/ src/test/java/org/apache/tuscany/implementati...

Author: svkrish
Date: Thu May  3 05:01:37 2007
New Revision: 534808

URL: http://svn.apache.org/viewvc?view=rev&rev=534808
Log:
Fixed RubyScript to work for simple properties

Added:
    incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/engines/
    incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/engines/TuscanyJRubyScriptEngine.java
    incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
      - copied, changed from r533960, incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCaseFIXME.java
Removed:
    incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCaseFIXME.java
Modified:
    incubator/tuscany/java/sca/modules/implementation-script/LICENSE.txt
    incubator/tuscany/java/sca/modules/implementation-script/NOTICE.txt
    incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptComponent.java

Modified: incubator/tuscany/java/sca/modules/implementation-script/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/LICENSE.txt?view=diff&rev=534808&r1=534807&r2=534808
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/LICENSE.txt (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/LICENSE.txt Thu May  3 05:01:37 2007
@@ -200,3 +200,44 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+   
+----------------------------------------------------------------------------------
+  The source code for this Tuscany Script Implementation module includes a 
+  modified copy of a class com.sun.script.ruby.JRubyScriptEngine with the following
+  license
+============================================================================
+                    The script engines BSD License
+============================================================================
+Copyright (c) 2006, Sun Microsystems, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this 
+   list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+
+ - Neither the name of the Sun Microsystems, Inc. nor the names of 
+   contributors may be used to endorse or promote products derived from this 
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+DAMAGE.
+---------------------------------------------------------------------------
\ No newline at end of file

Modified: incubator/tuscany/java/sca/modules/implementation-script/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/NOTICE.txt?view=diff&rev=534808&r1=534807&r2=534808
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/NOTICE.txt (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/NOTICE.txt Thu May  3 05:01:37 2007
@@ -9,6 +9,9 @@
 status is not necessarily a reflection of the completeness or stability of the
 code, it does indicate that the project has yet to be fully endorsed by the ASF.
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
 
+COPYRIGHT NOTICES
+  Tuscany Script Implementation contains modified copy of source from com.sun.script.ruby.JRubyScriptEngine.
+  	- Copyright (c) 2006, Sun Microsystems, Inc.  All rights reserved.
+    See License.txt file for more details.

Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptComponent.java?view=diff&rev=534808&r1=534807&r2=534808
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptComponent.java Thu May  3 05:01:37 2007
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
@@ -34,6 +35,7 @@
 import org.apache.tuscany.core.component.ComponentContextProvider;
 import org.apache.tuscany.core.component.scope.InstanceWrapperBase;
 import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.implementation.script.engines.TuscanyJRubyScriptEngine;
 import org.apache.tuscany.interfacedef.Operation;
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;
@@ -56,6 +58,7 @@
     
     private ScriptPropertyValueObjectFactory propertyValueObjectFactory = null;
     private DataBindingExtensionPoint dataBindingRegistry;
+    private static ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
 
     public ScriptComponent(URI uri, URI groupId, ScriptImplementation impl) {
         super(uri, null, null, groupId, 50);
@@ -85,25 +88,29 @@
     public Object createInstance() throws ObjectCreationException {
         try {
             ObjectFactory<?> propertyValueFactory = null;
-            ScriptEngineManager manager = new ScriptEngineManager();
+            ScriptEngine engine = getScriptEngineByExtension(impl.getScriptLanguage());
+            if (engine == null) {
+                throw new ObjectCreationException("no script engine found for language: " + impl.getScriptLanguage());
+            }
             
             for (String referenceName : references.keySet()) {
                 Object reference = references.get(referenceName);
-                manager.put(referenceName, reference);
+                //manager.put(referenceName, reference);
+                engine.getContext().setAttribute(referenceName, 
+                                                 reference, 
+                                                 ScriptContext.ENGINE_SCOPE);
             }
             
             for (String propertyName : propertyValueFactories.keySet()) {
                 propertyValueFactory = propertyValueFactories.get(propertyName);
                 if ( propertyValueFactory != null) {
-                    manager.put(propertyName, propertyValueFactory.getInstance());
+                    //manager.put(propertyName, propertyValueFactory.getInstance());
+                    engine.getContext().setAttribute(propertyName, 
+                                                     propertyValueFactory.getInstance(), 
+                                                     ScriptContext.ENGINE_SCOPE);
                 }
             }
             
-            ScriptEngine engine = manager.getEngineByExtension(impl.getScriptLanguage());
-            if (engine == null) {
-                throw new ObjectCreationException("no script engine found for language: " + impl.getScriptLanguage());
-            }
-           
             engine.eval(new StringReader(impl.getScriptSrc()));
            
             return engine;
@@ -178,6 +185,14 @@
                 propertyObjectFactory = propertyValueObjectFactory.createValueFactory(aProperty);
                 propertyValueFactories.put(aProperty.getName(), propertyObjectFactory);
             }
+        }
+    }
+    
+    private ScriptEngine getScriptEngineByExtension(String scriptExtn) {
+        if ("rb".equals(scriptExtn)) {
+            return new TuscanyJRubyScriptEngine();
+        } else {
+            return scriptEngineManager.getEngineByExtension(scriptExtn);
         }
     }
 }

Added: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/engines/TuscanyJRubyScriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/engines/TuscanyJRubyScriptEngine.java?view=auto&rev=534808
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/engines/TuscanyJRubyScriptEngine.java (added)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/engines/TuscanyJRubyScriptEngine.java Thu May  3 05:01:37 2007
@@ -0,0 +1,427 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.implementation.script.engines;
+
+import java.io.File;
+import java.io.Reader;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.script.AbstractScriptEngine;
+import javax.script.Bindings;
+import javax.script.Compilable;
+import javax.script.CompiledScript;
+import javax.script.Invocable;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptException;
+import javax.script.SimpleBindings;
+
+import org.jruby.Ruby;
+import org.jruby.ast.Node;
+import org.jruby.internal.runtime.GlobalVariable;
+import org.jruby.internal.runtime.GlobalVariables;
+import org.jruby.internal.runtime.ReadonlyAccessor;
+import org.jruby.javasupport.Java;
+import org.jruby.javasupport.JavaObject;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.IAccessor;
+import org.jruby.runtime.builtin.IRubyObject;
+
+import com.sun.script.jruby.JRubyScriptEngineFactory;
+
+/* 
+ * This class is a copy of the class com.sun.script.ruby.JRubyScriptEngine with some minor modifications.
+ * */
+
+public class TuscanyJRubyScriptEngine extends AbstractScriptEngine 
+        implements Compilable, Invocable { 
+
+    // my factory, may be null
+    private ScriptEngineFactory factory;
+    private Ruby runtime;
+   
+    public TuscanyJRubyScriptEngine() {
+        init(System.getProperty("com.sun.script.jruby.loadpath"));
+    }
+
+    public TuscanyJRubyScriptEngine(String loadPath) {
+        init(loadPath);
+    }
+
+    // my implementation for CompiledScript
+    private class JRubyCompiledScript extends CompiledScript {
+        // my compiled code
+        private Node node;     
+
+        JRubyCompiledScript (Node node) {
+            this.node = node;
+        }
+
+        public ScriptEngine getEngine() {
+            return TuscanyJRubyScriptEngine.this;
+        }
+
+        public Object eval(ScriptContext ctx) throws ScriptException {
+            return evalNode(node, ctx);
+        }
+    }
+
+    // Compilable methods
+    public CompiledScript compile(String script) 
+                                  throws ScriptException {  
+        Node node = compileScript(script, context);
+        return new JRubyCompiledScript(node);
+    }
+
+    public CompiledScript compile (Reader reader) 
+                                  throws ScriptException {  
+        Node node = compileScript(reader, context);
+        return new JRubyCompiledScript(node);
+    }
+
+    // Invocable methods
+    public Object invokeFunction(String name, Object... args) 
+                         throws ScriptException {       
+        return invokeImpl(null, name, args, Object.class);
+    }
+
+    public Object invokeMethod(Object obj, String name, Object... args) 
+                         throws ScriptException {       
+        if (obj == null) {
+            throw new IllegalArgumentException("script object is null");
+        }
+        return invokeImpl(obj, name, args, Object.class);
+    }
+
+    public Object getInterface(Object obj, Class clazz) {
+        if (obj == null) {
+            throw new IllegalArgumentException("script object is null");
+        }
+        return makeInterface(obj, clazz);
+    }
+
+    public Object getInterface(Class clazz) {
+        return makeInterface(null, clazz);
+    }
+
+    private <T> T makeInterface(Object obj, Class<T> clazz) {
+        if (clazz == null || !clazz.isInterface()) {
+            throw new IllegalArgumentException("interface Class expected");
+        }
+        final Object thiz = obj;
+        return (T) Proxy.newProxyInstance(
+              clazz.getClassLoader(),
+              new Class[] { clazz },
+              new InvocationHandler() {
+                  public Object invoke(Object proxy, Method m, Object[] args)
+                                       throws Throwable {
+                      return invokeImpl(thiz, m.getName(),
+                                        args, m.getReturnType());
+                  }
+              });
+    }
+
+    // ScriptEngine methods
+    public synchronized Object eval(String str, ScriptContext ctx) 
+                       throws ScriptException { 
+        Node node = compileScript(str, ctx);
+        return evalNode(node, ctx);
+    }
+
+    public synchronized Object eval(Reader reader, ScriptContext ctx)
+                       throws ScriptException { 
+        Node node = compileScript(reader, ctx);
+        return evalNode(node, ctx);
+    }
+
+    public ScriptEngineFactory getFactory() {
+        synchronized (this) {
+            if (factory == null) {
+                factory = new JRubyScriptEngineFactory();
+            }
+        }
+        return factory;
+    }
+
+    public Bindings createBindings() {
+        return new SimpleBindings();
+    }
+
+    // package-private methods
+    void setFactory(ScriptEngineFactory factory) {
+        this.factory = factory;
+    } 
+
+    // internals only below this point    
+
+    private Object rubyToJava(IRubyObject value) {
+        return rubyToJava(value, Object.class);
+    }
+
+    private Object rubyToJava(IRubyObject value, Class type) {
+        return JavaUtil.convertArgument(
+                 Java.ruby_to_java(value, value, Block.NULL_BLOCK), 
+                 type);
+    }
+
+    private IRubyObject javaToRuby(Object value) {
+        if (value instanceof IRubyObject) {
+            return (IRubyObject) value;
+        }
+        IRubyObject result = JavaUtil.convertJavaToRuby(runtime, value);
+        if (result instanceof JavaObject) {
+            return runtime.getModule("JavaUtilities").callMethod(runtime.getCurrentContext(), "wrap", result);
+        }
+        return result;
+    }   
+
+    private synchronized Node compileScript(String script, ScriptContext ctx) 
+                                 throws ScriptException {        
+        GlobalVariables oldGlobals = runtime.getGlobalVariables();  
+        try {
+            setGlobalVariables(ctx);
+            String filename = (String) ctx.getAttribute(ScriptEngine.FILENAME);
+            if (filename == null) {
+                filename = "<unknown>";
+            }
+            return runtime.parse(script, filename, null);
+        } catch (Exception exp) {
+            throw new ScriptException(exp);
+        } finally {
+            if (oldGlobals != null) {
+                //setGlobalVariables(oldGlobals);
+            }
+        }
+    }
+
+    private synchronized Node compileScript(Reader reader, ScriptContext ctx) 
+                                 throws ScriptException {        
+        GlobalVariables oldGlobals = runtime.getGlobalVariables();  
+        try {
+            setGlobalVariables(ctx);
+            String filename = (String) ctx.getAttribute(ScriptEngine.FILENAME);
+            if (filename == null) {
+                filename = "<unknown>";
+            }
+            return runtime.parse(reader, filename, null);
+        } catch (Exception exp) {
+            throw new ScriptException(exp);
+        } finally {
+            if (oldGlobals != null) {
+                //setGlobalVariables(oldGlobals);
+            }
+        }
+    }
+
+    private void setGlobalVariables(final ScriptContext ctx) {
+        ctx.setAttribute("context", ctx, ScriptContext.ENGINE_SCOPE);
+        setGlobalVariables(new GlobalVariables(runtime) {
+                GlobalVariables parent = runtime.getGlobalVariables();
+                
+                public void define(String name, IAccessor accessor) {
+                    assert name != null;
+                    assert accessor != null;
+                    assert name.startsWith("$");
+                    synchronized (ctx) {
+                        Bindings engineScope = ctx.getBindings(ScriptContext.ENGINE_SCOPE);                  
+                        engineScope.put(name, new GlobalVariable(accessor)); 
+                    }
+                }
+
+
+                public void defineReadonly(String name, IAccessor accessor) {
+                    assert name != null;
+                    assert accessor != null;
+                    assert name.startsWith("$");
+                    synchronized (ctx) {
+                        Bindings engineScope = ctx.getBindings(ScriptContext.ENGINE_SCOPE);
+                        engineScope.put(name, new GlobalVariable(new 
+                                             ReadonlyAccessor(name, accessor)));
+                    }
+                } 
+
+                public boolean isDefined(String name) {
+                    assert name != null;
+                    assert name.startsWith("$");
+                    synchronized (ctx) {
+                        String modifiedName = name.substring(1);
+                        boolean defined = ctx.getAttributesScope(modifiedName) != -1;
+                        return defined ? true : parent.isDefined(name);
+                    }
+                }
+
+                public void alias(String name, String oldName) {
+                    assert name != null;
+                    assert oldName != null;
+                    assert name.startsWith("$");
+                    assert oldName.startsWith("$");
+
+                    if (runtime.getSafeLevel() >= 4) {
+                        throw runtime.newSecurityError("Insecure: can't alias global variable");
+                    }
+
+                    synchronized (ctx) {
+                        int scope = ctx.getAttributesScope(name);
+                        if (scope == -1) {
+                            scope = ScriptContext.ENGINE_SCOPE;
+                        }
+
+                        IRubyObject value = get(oldName);
+                        ctx.setAttribute(name, rubyToJava(value), scope);
+                    }
+                }
+
+                public IRubyObject get(String name) {
+                    assert name != null;
+                    assert name.startsWith("$");
+
+                    synchronized (ctx) {
+                        // skip '$' and try
+                        String modifiedName = name.substring(1);
+                        int scope = ctx.getAttributesScope(modifiedName);
+                        if (scope == -1) {
+                            return parent.get(name);
+                        }
+
+                        Object obj = ctx.getAttribute(modifiedName, scope);
+                        if (obj instanceof IAccessor) {
+                            return ((IAccessor)obj).getValue();
+                        } else {
+                            return javaToRuby(obj);
+                        }
+                    }                    
+                }
+
+                public IRubyObject set(String name, IRubyObject value) {
+                    assert name != null;
+                    assert name.startsWith("$");
+
+                    if (runtime.getSafeLevel() >= 4) {
+                        throw runtime.newSecurityError("Insecure: can't change global variable value");
+                    }
+
+                    synchronized (ctx) {
+                        // skip '$' and try
+                        String modifiedName = name.substring(1);
+                        int scope = ctx.getAttributesScope(modifiedName);
+                        if (scope == -1) {
+                            scope = ScriptContext.ENGINE_SCOPE;
+                        }
+                        IRubyObject oldValue = get(name);
+                        Object obj = ctx.getAttribute(modifiedName, scope);
+                        if (obj instanceof IAccessor) {
+                            ((IAccessor)obj).setValue(value);
+                        } else {                        
+                            ctx.setAttribute(modifiedName, rubyToJava(value), scope);
+                        }
+                        return oldValue;
+                    }
+                }
+
+                public Iterator getNames() {                    
+                    List list = new ArrayList();
+                    synchronized (ctx) {
+                        Iterator<Integer> iterator = ctx.getScopes().iterator();
+                        int scope;
+                        while (iterator.hasNext()) {
+                            scope = iterator.next().intValue();
+                            Bindings b = ctx.getBindings(scope);
+                            if (b != null) {
+                                Iterator<String> bIterator = b.keySet().iterator();
+                                while (bIterator.hasNext()) {
+                                    list.add(bIterator.next());
+                                }
+                            }
+                        }
+                    }
+                    for (Iterator names = parent.getNames(); names.hasNext();) {
+                        list.add(names.next());
+                    }
+                    return Collections.unmodifiableList(list).iterator();
+                }
+            });
+    }
+
+    private void setGlobalVariables(GlobalVariables globals) {
+        runtime.setGlobalVariables(globals);
+    }
+
+    private synchronized Object evalNode(Node node, ScriptContext ctx) 
+                            throws ScriptException {
+        GlobalVariables oldGlobals = runtime.getGlobalVariables();
+        try {
+            setGlobalVariables(ctx);
+            return rubyToJava(runtime.eval(node));
+        } catch (Exception exp) {
+            throw new ScriptException(exp);
+        } finally {
+            if (oldGlobals != null) {
+                //setGlobalVariables(oldGlobals);
+            }
+        }
+    }
+
+    private void init(String loadPath) {        
+        runtime = Ruby.getDefaultInstance();
+        if (loadPath == null) {
+            loadPath = System.getProperty("java.class.path");
+        }
+        List list = Arrays.asList(loadPath.split(File.pathSeparator));
+        runtime.getLoadService().init(list);                
+        runtime.getLoadService().require("java");
+    }
+
+    private Object invokeImpl(final Object obj, String method, 
+                        Object[] args, Class returnType)
+                        throws ScriptException {
+        if (method == null) {
+            throw new NullPointerException("method name is null");
+        }
+
+        try {
+            IRubyObject rubyRecv = obj != null ? 
+                  JavaUtil.convertJavaToRuby(runtime, obj) : runtime.getTopSelf();
+
+            IRubyObject[] rubyArgs = JavaUtil.convertJavaArrayToRuby(runtime, args);
+
+            // Create Ruby proxies for any input arguments that are not primitives.
+            IRubyObject javaUtilities = runtime.getObject().getConstant("JavaUtilities");
+            for (int i = 0; i < rubyArgs.length; i++) {
+                IRubyObject tmp = rubyArgs[i];
+                if (tmp instanceof JavaObject) {
+                    rubyArgs[i] = javaUtilities.callMethod(runtime.getCurrentContext(), "wrap", tmp);
+                }
+            }
+
+            IRubyObject result = rubyRecv.callMethod(runtime.getCurrentContext(), method, rubyArgs);
+            return rubyToJava(result, returnType);
+        } catch (Exception exp) {
+            throw new ScriptException(exp);
+        }
+    }
+}
\ No newline at end of file

Copied: incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCase.java (from r533960, incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCase.java?view=diff&rev=534808&p1=incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCaseFIXME.java&r1=533960&p2=incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCase.java&r2=534808
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/script/itests/properties/JRubyHelloWorldTestCase.java Thu May  3 05:01:37 2007
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.implementation.script.itests.properties;
 
-public class JRubyHelloWorldTestCaseFIXME extends AbstractHelloWorldTestCase {
+public class JRubyHelloWorldTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
     
     // this doesn't work as the property doesn't seem to get set in the JRuby



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org