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

9 files changed, 88 insertions, 290 deletions

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>