Create a WSDL first as a copy of the java-first contribution

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

9 files changed, 400 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/README b/sca-java-2.x/trunk/itest/ws-jaxws/README
index b1748e1b87..a957f53e36 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/README
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/README
@@ -2,9 +2,16 @@
 Scenarios
 =========
 
-General Pattern
----------------
-Jaxws client -> SCA Component -> Jaxws Service
+General Patterns
+----------------
+
+For simple synchronous tests:
+
+Jaxws client -> (b.ws service) SCA Component (b.ws reference) -> Jaxws Service
+
+For callback or asynchronous tests
+
+JUnit client -> SCA Component (b.ws reference) -> (b.ws service) SCA component
 
 Java First
 ----------
@@ -62,4 +69,4 @@ MTOM intent
 callback
 --------
 new OASIS protocol
-WSCallback ws policy
\ No newline at end of file
+WSCallback ws policy
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld.composite
index 0cd2b4419d..25cc834d3c 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld.composite
@@ -25,10 +25,10 @@
     <component name="HelloWorldService">
 		<implementation.java class="org.apache.tuscany.sca.binding.ws.jaxws.impl.HelloWorldImpl"/>
 	    <service name="HelloWorld">
-            <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+            <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
 	    </service>
         <reference name="helloWorldExternal">
-            <binding.ws wsdlElement="http://helloworld/external#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+            <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
         </reference>	
     </component>
     
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml
index 33c5cab25d..8ddea42d4e 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml
@@ -32,6 +32,7 @@
   <modules>
     <module>common-contribution</module>
     <module>java-first-contribution</module>
+    <module>wsdl-first-contribution</module>
     <module>test-launcher</module>
   </modules>
 
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/pom.xml
new file mode 100644
index 0000000000..4f951eb5d9
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/pom.xml
@@ -0,0 +1,116 @@
+<?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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-jaxws-wsdl-first-contribution</artifactId>
+    <name>Apache Tuscany SCA iTest WS JAXWS WSDL First Contribution</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-ws-jaxws-common-contribution</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>        
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsimport2</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.jaxws</packageName>
+                            <wsdlDirectory>${basedir}/../java-first-contribution/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
new file mode 100644
index 0000000000..dd02900175
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.sca.binding.ws.jaxws.impl;
+
+import org.apache.tuscany.sca.binding.ws.jaxws.Foo;
+import org.apache.tuscany.sca.binding.ws.jaxws.HelloWorld;
+import org.oasisopen.sca.annotation.Reference;
+
+public class HelloWorldImpl implements HelloWorld {
+
+    @Reference
+    public org.apache.tuscany.sca.binding.ws.jaxws.external.jaxws.HelloWorld helloWorldExternal;
+    
+    public String getGreetings(String s) {
+        System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
+        String response = helloWorldExternal.getGreetings(s);
+        System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
+        return response;
+    }
+
+    public Foo getGreetingsComplex(Foo foo){
+        Foo response = null;//helloWorldExternal.getGreetingsComplex(foo);
+        System.out.println("At client: " + response.getBars()[0].getS());
+        return response;
+    } 
+}
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8924b74a95
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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.    
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+              xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
+   <deployable composite="itest:HelloWorld"/>
+   <import.java package="org.apache.tuscany.sca.binding.ws.jaxws"/>
+</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-external.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-external.wsdl
new file mode 100644
index 0000000000..78d8077bcd
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-external.wsdl
@@ -0,0 +1,84 @@
+<?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://helloworld/external" 
+                  xmlns:tns="http://helloworld/external" 
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	              name="helloworld">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld/external" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8086/External/HelloWorld"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-sca.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-sca.wsdl
new file mode 100644
index 0000000000..0e6a10cc62
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-sca.wsdl
@@ -0,0 +1,84 @@
+<?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://helloworld" 
+                  xmlns:tns="http://helloworld" 
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	              name="helloworld">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="name" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..0cd2b4419d
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld.composite
@@ -0,0 +1,35 @@
+<?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:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+		   targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
+           name="HelloWorld">
+               
+    <component name="HelloWorldService">
+		<implementation.java class="org.apache.tuscany.sca.binding.ws.jaxws.impl.HelloWorldImpl"/>
+	    <service name="HelloWorld">
+            <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+	    </service>
+        <reference name="helloWorldExternal">
+            <binding.ws wsdlElement="http://helloworld/external#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+        </reference>	
+    </component>
+    
+</composite>