Create an Upper WSDL service definition, and use it on the upper reference binding. Create an RPC variation of the Upper WSDL portType, not used yet. Also simplified the test case a bit to be sync only, will re-integrate async later.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1057370 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 88 insertions, 734 deletions

diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncReferenceBareImpl.java b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncReferenceBareImpl.java
deleted file mode 100644
index ff1da8f8bf..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncReferenceBareImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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 sample;
-
-import static java.lang.System.out;
-import static sample.Xutil.elem;
-import static sample.Xutil.text;
-import static sample.Xutil.xdom;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.w3c.dom.Element;
-
-import sample.Xutil.NodeBuilder;
-import sample.api.Java;
-import sample.api.WSDL;
-import sample.api.WSDLReference;
-
-/**
- * Sample component implementation that uses Java interfaces.
- * 
- * @version $Rev$ $Date$
- */
-@Java(Upper.class)
-public class UpperSampleAsyncReferenceBareImpl {
-    
-    @WSDL("http://sample/upper-async-bare#UpperBare")
-    WSDLReference upper;
-    
-    Element response;
-    CountDownLatch latch = new CountDownLatch( 1 );
-    
-    public String upper(String s) {
-        out.println("UpperSampleAsyncReferenceImpl.upper(" + s + ")");
-        
-        // I'm passing in the non-wrapped version of the parameter
-        // here to test what happens with different WSDL styles 
-        // at the implementation and binding
-        final Element arg0 = xdom("http://sample/upper-async", "arg0", text("arg0_" + s));
-        final Element arg1 = xdom("http://sample/upper-async", "arg1", text("arg1_" + s));
-
-        // TODO - intended to do an async call here but using the the sync version
-        //        while I look at databinding. 
-        Element response = upper.callBare("upper", arg0, arg1);
-        
-        return response.getTextContent();
-    }
-    
-    /**
-     *  In this implementation the convention is that the 
-     *  async callback arrives at an operation named
-     *  operationName + Callback
-     */
-    public void upperCallback(Element response) {
-        out.println("UpperSampleAsyncReferenceImpl.upperCallback(" + response.getTextContent() + ")");
-        this.response = response;
-        latch.countDown();
-    }
-}
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncReferenceImpl.java b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncReferenceImpl.java
deleted file mode 100644
index 7a86d68043..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncReferenceImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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 sample;
-
-import static java.lang.System.out;
-import static sample.Xutil.elem;
-import static sample.Xutil.text;
-import static sample.Xutil.xdom;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.w3c.dom.Element;
-
-import sample.Xutil.NodeBuilder;
-import sample.api.Java;
-import sample.api.WSDL;
-import sample.api.WSDLReference;
-
-/**
- * Sample component implementation that uses Java interfaces.
- * 
- * @version $Rev$ $Date$
- */
-@Java(Upper.class)
-public class UpperSampleAsyncReferenceImpl {
-    
-    @WSDL("http://sample/upper-async#Upper")
-    WSDLReference upper;
-    
-    Element response;
-    CountDownLatch latch = new CountDownLatch( 1 );
-    
-    public String upper(String s) {
-        out.println("UpperSampleAsyncReferenceImpl.upper(" + s + ")");
-        
-        // TODO - I'm passing in the non-wrapped version of the parameter
-        //        here which doesn't seem right. Need to test that databinding
-        //        wraps it correctly
-        //final Element ureq = xdom("http://sample/upper-async", "s", text(s));
-        NodeBuilder node1 = elem("s", text(s));
-        final Element ureq = xdom("http://sample/upper-async", "upper", node1);
-        upper.callAsync("upper", ureq);
-        
-        try {
-            Thread.sleep(500);
-            latch.await(500, TimeUnit.SECONDS);
-        } catch (Exception ex) {
-            // do nothing
-        }
-        
-        if( response != null ) return response.getTextContent();
-        else return "upper did not get called back";
-    }
-    
-    /**
-     *  In this implementation the convention is that the 
-     *  async callback arrives at an operation named
-     *  operationName + Callback
-     */
-    public void upperCallback(Element response) {
-        out.println("UpperSampleAsyncReferenceImpl.upperCallback(" + response.getTextContent() + ")");
-        this.response = response;
-        latch.countDown();
-    }
-}
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncServiceImpl.java b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncServiceImpl.java
deleted file mode 100644
index 69d6cb9ecf..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 sample;
-
-import static java.lang.System.out;
-import static sample.Xutil.elem;
-import static sample.Xutil.text;
-import static sample.Xutil.xdom;
-
-import org.w3c.dom.Element;
-
-import sample.api.WSDL;
-
-/**
- * Sample component implementation that uses Java interfaces.
- * 
- * @version $Rev$ $Date$
- */
-@WSDL("http://sample/upper-async#Upper")
-public class UpperSampleAsyncServiceImpl {
-
-    public Element call(String op, Element e) {
-        String input = e.getTextContent();
-        out.println("UpperSampleAsyncServiceImpl.upper(" + input + ")");
-        String output = input.toUpperCase();
-        return xdom("http://sample/upper-async", "upperResponse", elem("result", text(output)));
-    }
-}
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncServiceWrappedImpl.java b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncServiceWrappedImpl.java
deleted file mode 100644
index bd7dcd5eae..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperSampleAsyncServiceWrappedImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 sample;
-
-import static java.lang.System.out;
-import static sample.Xutil.elem;
-import static sample.Xutil.text;
-import static sample.Xutil.xdom;
-
-import org.w3c.dom.Element;
-
-import sample.api.WSDL;
-
-/**
- * Sample component implementation that uses Java interfaces.
- * 
- * @version $Rev$ $Date$
- */
-@WSDL("http://sample/upper-async-wrapped#UpperWrapped")
-public class UpperSampleAsyncServiceWrappedImpl {
-
-    public Element call(String op, Element e) {
-        String input = e.getTextContent();
-        out.println("UpperSampleAsyncServiceImpl.upper(" + input + ")");
-        String output = input.toUpperCase();
-        return xdom("http://sample/upper-async", "upperResponse", elem("result", text(output)));
-    }
-}
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeAsyncBareTestCase.java b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeAsyncBareTestCase.java
deleted file mode 100644
index d40fdbf6b3..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeAsyncBareTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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 sample.impl;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import sample.Upper;
-
-/**
- * Test how to run an SCA contribution containing a test composite on a
- * Tuscany runtime node.
- * 
- * @version $Rev$ $Date$
- */
-public class SampleNativeAsyncBareTestCase {
-    static Node node;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        final NodeFactory nf = NodeFactory.newInstance();
-        String here = SampleNativeAsyncBareTestCase.class.getProtectionDomain().getCodeSource().getLocation().toString();
-        // Create the node using the pattern "name of composite file to start" / Contribution to use
-        node = nf.createNode("testnativeasyncbare.composite", new Contribution("test", here));
-        node.start();
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        node.stop();
-    }
-
-    @Test
-    @Ignore
-    public void testReference() {
-        System.out.println("SampleNaiveAsyncBareTestCase.testReference");
-        Upper upper = node.getService(Upper.class, "SampleNativeAsyncReference");
-        final String r = upper.upper("async"); 
-        System.out.println(r);
-        assertEquals("ASYNC", r);
-    }
-}
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeAsyncTestCase.java b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeAsyncTestCase.java
deleted file mode 100644
index f5198e7df0..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeAsyncTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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 sample.impl;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import sample.Upper;
-
-/**
- * Test how to run an SCA contribution containing a test composite on a
- * Tuscany runtime node.
- * 
- * @version $Rev$ $Date$
- */
-public class SampleNativeAsyncTestCase {
-    static Node node;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        final NodeFactory nf = NodeFactory.newInstance();
-        String here = SampleNativeAsyncTestCase.class.getProtectionDomain().getCodeSource().getLocation().toString();
-        // Create the node using the pattern "name of composite file to start" / Contribution to use
-        node = nf.createNode("testnativeasync.composite", new Contribution("test", here));
-        node.start();
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        node.stop();
-    }
-
-    @Test
-    public void testReference() {
-        System.out.println("SampleNaiveAsyncTestCase.testReference");
-        Upper upper = node.getService(Upper.class, "SampleNativeAsyncReference");
-        final String r = upper.upper("async"); 
-        System.out.println(r);
-        assertEquals("ASYNC", r);
-    }
-}
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeJMSAsyncTestCase.java b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeJMSAsyncTestCase.java
deleted file mode 100644
index ea988981ce..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/SampleNativeJMSAsyncTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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 sample.impl;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import sample.Upper;
-
-/**
- * Test how to run an SCA contribution containing a test composite on a
- * Tuscany runtime node.
- * 
- * @version $Rev$ $Date$
- */
-public class SampleNativeJMSAsyncTestCase {
-    static Node node;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        final NodeFactory nf = NodeFactory.newInstance();
-        String here = SampleNativeJMSAsyncTestCase.class.getProtectionDomain().getCodeSource().getLocation().toString();
-        // Create the node using the pattern "name of composite file to start" / Contribution to use
-        node = nf.createNode("testnativejmsasync.composite", new Contribution("test", here));
-        node.start();
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        node.stop();
-    }
-
-    @Test
-    public void testReference() {
-        System.out.println("SampleNaiveAsyncTestCase.testReference");
-        Upper upper = node.getService(Upper.class, "SampleNativeAsyncReference");
-        final String r = upper.upper("async"); 
-        System.out.println(r);
-        assertEquals("ASYNC", r);
-    }
-}
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async-wrapped.wsdl b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async-wrapped.wsdl
deleted file mode 100644
index adce1542e6..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async-wrapped.wsdl
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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.    
--->
-<wsdl:definitions targetNamespace="http://sample/upper-async-wrapped" 
-                  xmlns:tns="http://sample/upper-async-wrapped"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	              name="UpperAsyncWrapped">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-                targetNamespace="http://sample/upper-async-wrapped"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="upper">
-                <complexType>
-                    <sequence>
-                        <element name="arg0" type="xsd:string" />
-                        <element name="arg1" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="upperResponse">
-                <complexType>
-                    <sequence>
-                        <element name="result" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="upperRequest">
-        <wsdl:part element="tns:upper" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:message name="upperResponse">
-        <wsdl:part element="tns:upperResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="UpperWrapped" sca:requires="sca:asyncInvocation">
-        <wsdl:operation name="upper">
-            <wsdl:input message="tns:upperRequest" name="upperRequest" />
-            <wsdl:output message="tns:upperResponse" name="upperResponse" />
-        </wsdl:operation>
-    </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async.wsdl b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async.wsdl
deleted file mode 100644
index a16fb5db3d..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async.wsdl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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.    
--->
-<wsdl:definitions targetNamespace="http://sample/upper-async" 
-                  xmlns:tns="http://sample/upper-async"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	              name="UpperAsync">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-                targetNamespace="http://sample/upper-async"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="upper">
-                <complexType>
-                    <sequence>
-                        <element name="s" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="upperResponse">
-                <complexType>
-                    <sequence>
-                        <element name="result" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="upperRequest">
-        <wsdl:part element="tns:upper" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:message name="upperResponse">
-        <wsdl:part element="tns:upperResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="Upper" sca:requires="sca:asyncInvocation">
-        <wsdl:operation name="upper">
-            <wsdl:input message="tns:upperRequest" name="upperRequest" />
-            <wsdl:output message="tns:upperResponse" name="upperResponse" />
-        </wsdl:operation>
-    </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async-bare.wsdl b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperRPC.wsdl
index 54061067e5..43be27e945 100644
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/Upper-async-bare.wsdl
+++ b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperRPC.wsdl
@@ -17,34 +17,28 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<wsdl:definitions targetNamespace="http://sample/upper-async-bare" 
-                  xmlns:tns="http://sample/upper-async-bare"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	              name="UpperAsyncBare">
+<wsdl:definitions targetNamespace="http://sample/upperrpc" xmlns:tns="http://sample/upperrpc"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="Upper">
 
     <wsdl:types>
-        <schema elementFormDefault="qualified" 
-                targetNamespace="http://sample/upper-async-bare"
-                xmlns="http://www.w3.org/2001/XMLSchema">
+        <schema elementFormDefault="qualified" targetNamespace="http://sample/upperrpc"
+            xmlns="http://www.w3.org/2001/XMLSchema">
             <element name="arg0" type="xsd:string" />
-            <element name="arg1" type="xsd:string" />
-
             <element name="result" type="xsd:string" />
         </schema>
     </wsdl:types>
 
     <wsdl:message name="upperRequest">
         <wsdl:part element="tns:arg0" name="arg0" />
-        <wsdl:part element="tns:arg1" name="arg1" />
     </wsdl:message>
 
     <wsdl:message name="upperResponse">
         <wsdl:part element="tns:result" name="result" />
     </wsdl:message>
 
-    <wsdl:portType name="UpperBare" sca:requires="sca:asyncInvocation">
+    <wsdl:portType name="Upper">
         <wsdl:operation name="upper">
             <wsdl:input message="tns:upperRequest" name="upperRequest" />
             <wsdl:output message="tns:upperResponse" name="upperResponse" />
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl
new file mode 100644
index 0000000000..81dd82bf12
--- /dev/null
+++ b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl
@@ -0,0 +1,80 @@
+<?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.    
+-->
+<wsdl:definitions name="UpperService"
+    targetNamespace="http://sample/"
+    xmlns="http://sample/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
+  <wsdl:types>
+      <xs:schema attributeFormDefault="qualified"
+          elementFormDefault="unqualified"
+          targetNamespace="http://sample/"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema">
+          <xs:element name="upper">
+              <xs:complexType>
+                  <xs:sequence>
+                      <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+          </xs:element>
+          <xs:element name="upperResponse">
+              <xs:complexType>
+                  <xs:sequence>
+                      <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                  </xs:sequence>
+              </xs:complexType>
+          </xs:element>
+      </xs:schema>
+  </wsdl:types>
+  <wsdl:message name="upper">
+    <wsdl:part name="upper" element="upper">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="upperResponse">
+    <wsdl:part name="upperResponse" element="upperResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="Upper">
+    <wsdl:operation name="upper">
+      <wsdl:input message="upper">
+    </wsdl:input>
+      <wsdl:output message="upperResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="UpperBinding" type="Upper">
+    <SOAP:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="upper">
+      <SOAP:operation/>
+      <wsdl:input>
+        <SOAP:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <SOAP:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Upper">
+    <wsdl:port name="UpperSOAP11Port" binding="UpperBinding">
+      <SOAP:address location="http://localhost:8086/wsupper"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/jndi.properties b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/jndi.properties
deleted file mode 100644
index a38e1778c6..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/jndi.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-#java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-#connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-#queue.HelloWorldService = HelloWorldService
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/test.composite b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/test.composite
index 43a75f50a7..306618aafa 100644
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/test.composite
+++ b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/test.composite
@@ -48,7 +48,7 @@
             <binding.ws uri="http://localhost:8085/wsello"/>
         </service>
         <reference name="upper">
-            <binding.ws uri="http://localhost:8086/wsupper"/>
+            <binding.ws wsdlElement="http://sample/#wsdl.port(Upper/UpperSOAP11Port)" />
         </reference>
     </component>
 
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativeasync.composite b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativeasync.composite
deleted file mode 100644
index 6610b66815..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativeasync.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://test"
-  name="testnativeasync">
-      
-    <component name="SampleNativeAsyncReference">
-        <t:implementation.sample class="sample.UpperSampleAsyncReferenceImpl"/>
-        <reference name="upper" target="SampleNativeAsyncService"/>
-    </component>  
-    
-    <component name="SampleNativeAsyncService">
-        <t:implementation.sample class="sample.UpperSampleAsyncServiceImpl"/>
-    </component>
- 
-</composite>
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativeasyncbare.composite b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativeasyncbare.composite
deleted file mode 100644
index 004ef13559..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativeasyncbare.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://test"
-  name="testnativeasyncbare">
-      
-    <component name="SampleNativeAsyncReference">
-        <t:implementation.sample class="sample.UpperSampleAsyncReferenceBareImpl"/>
-        <reference name="upper" target="SampleNativeAsyncService">
-            <interface.wsdl interface="http://sample/upper-async-wrapped#wsdl.interface(UpperWrapped)"/>
-        </reference>
-    </component>  
-    
-    <component name="SampleNativeAsyncService">
-        <t:implementation.sample class="sample.UpperSampleAsyncServiceWrappedImpl"/>
-    </component>
- 
-</composite>
diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativejmsasync.composite b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativejmsasync.composite
deleted file mode 100644
index 6012cb25af..0000000000
--- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/testnativejmsasync.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://test"
-  name="testnativejmsasync">
-      
-    <component name="SampleNativeAsyncReference">
-        <t:implementation.sample class="sample.UpperSampleAsyncReferenceImpl"/>
-        <reference name="upper" target="SampleNativeAsyncService"/>
-    </component>  
-    
-    <component name="SampleNativeAsyncService">
-        <t:implementation.sample class="sample.UpperSampleAsyncServiceImpl"/>
-        <service name="Upper">
-        	<binding.jms/>
-        </service>
-    </component>
- 
-</composite>