tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r511473 - in /incubator/tuscany/branches/sca-java-integration/sca: extensions/script/ extensions/script/container.bsf/ extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ extensions/script/databinding.e4x/src/...
Date Sun, 25 Feb 2007 09:37:13 GMT
Author: antelder
Date: Sun Feb 25 01:37:12 2007
New Revision: 511473

URL: http://svn.apache.org/viewvc?view=rev&rev=511473
Log:
Update script components so references using wsdl interfaces work with xml messages, and a
javascript itest testing

Added:
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType
  (with props)
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.js
  (with props)
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml   (with
props)
    incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireObjectFactory.java
      - copied, changed from r511259, incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/WireObjectFactory.java
Removed:
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/WireObjectFactory.java
Modified:
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/E4XDataBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/OMElement2E4X.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/Object2E4X.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/META-INF/sca/xml.composite
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworld.js
    incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/test/java/helloworld/XMLTestCase.java

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/pom.xml?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/pom.xml
Sun Feb 25 01:37:12 2007
@@ -54,6 +54,13 @@
         </dependency>
 
         <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>2.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-test</artifactId>
             <version>0.1-integration-incubating-SNAPSHOT</version>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
Sun Feb 25 01:37:12 2007
@@ -18,6 +18,11 @@
  */
 package org.apache.tuscany.container.script;
 
+import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
+import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.V1_5;
+
 import java.util.Arrays;
 
 import org.apache.tuscany.spi.ObjectCreationException;
@@ -28,18 +33,21 @@
 import org.apache.tuscany.spi.extension.ExecutionMonitor;
 import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.model.ServiceContract;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.WireObjectFactory;
 import org.apache.tuscany.spi.wire.WireService;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Type;
 
 /**
  * A component implementation for script languages.
- *
- * @version $Rev$ $Date$
  */
 public class ScriptComponent extends AtomicComponentExtension {
+
     private ScriptInstanceFactory factory;
 
     public ScriptComponent(String name,
@@ -54,13 +62,11 @@
         super(name, parent, wireService, workContext, workScheduler, monitor, initLevel);
         this.factory = factory;
         this.scope = scope;
-        setAllowsPassByReference(true);
         setPassByReferenceMethods(Arrays.asList(new String[]{}));
     }
 
-    @SuppressWarnings("unchecked")
     public Object createInstance() throws ObjectCreationException {
-        return factory.getInstance(); //(serviceBindings, context);
+        return factory.getInstance(); 
     }
 
     public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire
callbackWire) {
@@ -70,6 +76,9 @@
     @SuppressWarnings({"unchecked"})
     protected void onReferenceWire(OutboundWire wire) {
         Class<?> clazz = wire.getServiceContract().getInterfaceClass();
+        if (clazz == null) {
+            clazz = createInterfaceClass(wire.getServiceContract());
+        }
         factory.addContextObjectFactory(wire.getReferenceName(), clazz, new WireObjectFactory(clazz,
wire, wireService));
     }
 
@@ -77,4 +86,50 @@
         return scopeContainer.getInstance(this);
     }
 
+    /**
+     * Create an Java interface class for the WSDL ServiceContract
+     * TODO: this should probably be moved to wsdl idl module
+     */
+    private Class createInterfaceClass(ServiceContract serviceContract) {
+        ClassWriter cw = new ClassWriter(false);
+
+        // Generate the interface
+        String interfaceName = serviceContract.getInterfaceName();
+        cw.visit(V1_5,
+                 ACC_PUBLIC + ACC_ABSTRACT + ACC_INTERFACE,
+                 interfaceName,
+                 null,
+                 "java/lang/Object",
+                 new String[0]);
+
+        // Generate methods from the WSDL operations
+        for (Object o : serviceContract.getOperations().values()) {
+            Operation operation = (Operation)o;
+            String inputType = Type.getDescriptor(Object.class);
+            String outputType = Type.getDescriptor(Object.class);
+            cw.visitMethod(ACC_PUBLIC + ACC_ABSTRACT,
+                           operation.getName(),
+                           "(" + inputType + ")" + outputType,
+                           null,
+                           null).visitEnd();
+        }
+
+        // Generate the bytecodes
+        cw.visitEnd();
+        byte[] bytes = cw.toByteArray();
+
+        Class interfaceClass = new GeneratedClassLoader().defineClass(bytes);
+
+        return interfaceClass;
+    }
+
+    private class GeneratedClassLoader extends ClassLoader {
+        public Class defineClass(byte[] byteArray) {
+            try {
+                return defineClass(null, byteArray, 0, byteArray.length);
+            } catch (Throwable e) {
+                return null;
+            }
+        }
+    }
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java
Sun Feb 25 01:37:12 2007
@@ -20,8 +20,6 @@
 
 import org.apache.tuscany.spi.model.AtomicImplementation;
 
-//import org.apache.tuscany.container.script.helper.ScriptFactory;
-
 /**
  * Model object for a script implementation.
  */
@@ -33,8 +31,6 @@
     private String scriptName;
     private ClassLoader classLoader;
 
-//    private ScriptFactory scriptFactory;
-
     public String getResourceName() {
         return resourceName;
     }
@@ -59,14 +55,6 @@
         this.scriptSource = scriptSource;
     }
 
-//    public ScriptFactory getScriptFactory() {
-//        return scriptFactory;
-//    }
-//
-//    public void setScriptFactory(ScriptFactory scriptFactory) {
-//        this.scriptFactory = scriptFactory;
-//    }
-
     public String getScriptName() {
         return scriptName;
     }
@@ -82,11 +70,5 @@
     public void setClassLoader(ClassLoader classLoader) {
         this.classLoader = classLoader;
     }
-//    public ScriptFactory getScriptInstanceFactory() {
-//        return scriptFactory;
-//    }
-//
-//    public void setScriptInstanceFactory(ScriptFactory scriptFactory) {
-//        this.scriptFactory = scriptFactory;
-//    }
+
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
Sun Feb 25 01:37:12 2007
@@ -21,6 +21,7 @@
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.bsf.BSFEngine;
+import org.apache.bsf.BSFException;
 
 /**
  * An invokable instance of a script
@@ -40,7 +41,9 @@
     public Object invokeTarget(String operationName, Object[] args) throws InvocationTargetException
{
         try {
             return bsfEngine.call(clazz, operationName, args);
-        } catch (Exception e) {
+        } catch (BSFException e) {
+            throw new InvocationTargetException(e.getTargetException() != null ? e.getTargetException()
: e);
+         } catch (Exception e) {
             throw new InvocationTargetException(e);
         }
     }

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/E4XDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/E4XDataBinding.java?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/E4XDataBinding.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/E4XDataBinding.java
Sun Feb 25 01:37:12 2007
@@ -27,6 +27,8 @@
 
 /**
  * DataBinding for E4X
+ * 
+ * This requires Rhino using the WSO2 Axiom based E4X impl
  */
 @Service(DataBinding.class)
 public class E4XDataBinding extends DataBindingExtension {
@@ -44,5 +46,12 @@
     @Override
     public WrapperHandler getWrapperHandler() {
         return new E4XWrapperHandler();
+    }
+
+    /**
+     * Treat E4X as pass-by-ref
+     */
+    public Object copy(Object source) {
+        return source;
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/OMElement2E4X.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/OMElement2E4X.java?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/OMElement2E4X.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/OMElement2E4X.java
Sun Feb 25 01:37:12 2007
@@ -60,8 +60,7 @@
         Context cx = Context.enter();
         try {
 
-            Object[] jsArgs = new Object[] {cx.newObject(scope, "XML", new Object[] {source})};
-            return (XML)jsArgs[0];
+            return (XML)cx.newObject(scope, "XML", new Object[] {source});
 
         } finally {
             Context.exit();

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/Object2E4X.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/Object2E4X.java?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/Object2E4X.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/databinding.e4x/src/main/java/org/apache/tuscany/extensions/script/databinding/e4x/Object2E4X.java
Sun Feb 25 01:37:12 2007
@@ -40,7 +40,6 @@
     private OMElement2E4X om2e4x;
 
     public Object2E4X() {
-        super();
         factory = OMAbstractFactory.getOMFactory();
         om2e4x = new OMElement2E4X();
     }

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/META-INF/sca/xml.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/META-INF/sca/xml.composite?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/META-INF/sca/xml.composite
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/META-INF/sca/xml.composite
Sun Feb 25 01:37:12 2007
@@ -30,4 +30,15 @@
         <implementation.script script="xml/helloworldXML.js"/>
     </component>
 
+    <component name="HelloWorldJSViaProxyComponent">
+        <implementation.script script="xml/helloworld.js"/>
+        <reference name="ref">HelloWorldXMLProxyJSComponent</reference>
+    </component>
+
+    <component name="HelloWorldXMLProxyJSComponent">
+        <implementation.script script="xml/helloworldXMLProxy.js"/>
+        <reference name="ref">HelloWorldXMLJSComponent</reference>
+    </component>
+
+
 </composite>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworld.js
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworld.js?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworld.js
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworld.js
Sun Feb 25 01:37:12 2007
@@ -18,6 +18,6 @@
  */
  
 function getGreetings(s) {
-   java.lang.System.out.println("in helloworld.js calling ");
+   java.lang.System.out.println("in helloworld.js s:" + s);
    return ref.getGreetings(s);
 }

Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType?view=auto&rev=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType
(added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType
Sun Feb 25 01:37:12 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ASCII"?>
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
+
+  <service name="HelloWorldService">
+     <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" wsdli:wsdlLocation="http://helloworld
wsdl/helloworld.wsdl" />
+  </service>
+
+  <reference name="ref">
+     <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" wsdli:wsdlLocation="http://helloworld
wsdl/helloworld.wsdl" />
+  </reference>  
+  
+</componentType>              
+       
\ No newline at end of file

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.componentType
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.js
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.js?view=auto&rev=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.js
(added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.js
Sun Feb 25 01:37:12 2007
@@ -0,0 +1,27 @@
+/*
+ * 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.    
+ */
+ 
+function getGreetings(xmlIn) {
+   java.lang.System.out.println("via proxy type of in: " + typeof xmlIn);
+
+   var xmlOut = ref.getGreetings(xmlIn);
+
+   java.lang.System.out.println("via proxy type of out: " + typeof xmlOut);
+   return xmlOut;
+}
\ No newline at end of file

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/main/resources/xml/helloworldXMLProxy.js
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/test/java/helloworld/XMLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/test/java/helloworld/XMLTestCase.java?view=diff&rev=511473&r1=511472&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/test/java/helloworld/XMLTestCase.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/itests/src/test/java/helloworld/XMLTestCase.java
Sun Feb 25 01:37:12 2007
@@ -39,6 +39,13 @@
         Assert.assertEquals("e4xHi Petra", msg);
     }
 
+    public void testHelloWorldJavaScript2() throws Exception {
+        HelloWorldService helloWorldService =
+            compositeContext.locateService(HelloWorldService.class, "HelloWorldJSViaProxyComponent");
+        String msg = helloWorldService.getGreetings("Petra");
+        Assert.assertEquals("e4xHi Petra", msg);
+    }
+
     @Override
     protected void setUp() throws Exception {
         setApplicationSCDL(getClass().getResource("/META-INF/sca/xml.composite"));

Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml?view=auto&rev=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml Sun Feb
25 01:37:12 2007
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<project>
+
+    <parent>
+        <groupId>org.apache.tuscany.sca.extensions</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.1-integration-incubating-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
+    <artifactId>parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Extensions for Scripting</name>
+
+    <modules>
+       <module>container.bsf</module>
+       <module>databinding.e4x</module>
+       <module>itests</module>
+    </modules>
+
+</project>

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireObjectFactory.java
(from r511259, incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/WireObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireObjectFactory.java?view=diff&rev=511473&p1=incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/WireObjectFactory.java&r1=511259&p2=incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireObjectFactory.java&r2=511473
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/WireObjectFactory.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireObjectFactory.java
Sun Feb 25 01:37:12 2007
@@ -16,12 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.container.script;
+package org.apache.tuscany.spi.wire;
 
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.WireService;
 
 /**
  * @version $Rev$ $Date$



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


Mime
View raw message