Re-org to more clearly separate out the different parts of the test and to identify the launcher with a dependency on the binding.ws ri implementation

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

9 files changed, 88 insertions, 119 deletions

diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/pom.xml
index 4d9a0341a8..afdfac7a95 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/pom.xml
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/pom.xml
@@ -26,114 +26,22 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>itest-ws-jaxws-test-launcher</artifactId>
-    <name>Apache Tuscany SCA iTest WS JAXWS Test Launcher</name>
+    <artifactId>itest-ws-jaxws-contribution-java-first</artifactId>
+    <name>Apache Tuscany SCA iTest WS JAXWS Contribution Java First </name>
 
     <dependencies>
-<!-- ws feature dependencies copied below so that we can use the 
-     binding-ws-runtime-jaxws implementation while it's under development
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
-        </dependency>
--->
-
-        <!-- Core distribution -->
+        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>addressing</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-adb-codegen</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>opensaml</groupId>
-                    <artifactId>opensaml</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        -->
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <!-- Common test resources -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-ws-jaxws-common-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+        </dependency>      
                 
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
-        
+       <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -175,32 +83,32 @@
                 </dependencies>
                 <executions>
                     <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.jaxws.HelloWorldImpl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
                         <id>wsimport1</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.sca</packageName>
-                            <wsdlDirectory>${basedir}/../java-first-contribution/target/classes</wsdlDirectory>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.jaxws</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
                             <wsdlFiles>
-                                <wsdlFile>helloworld-sca.wsdl</wsdlFile>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
                             </wsdlFiles>
                             <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
                         </configuration>
-                    </execution>  
-                    <execution>
-                        <id>wsgen1</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>wsgen</goal>
-                        </goals>
-                        <configuration>
-                            <sei>org.apache.tuscany.sca.binding.ws.jaxws.external.HelloWorldService</sei>
-                            <genWsdl>true</genWsdl>
-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
-                        </configuration>
-                    </execution>                                    
+                    </execution>                                      
                 </executions>
                 <configuration>
                     <target>2.1</target>
@@ -212,5 +120,4 @@
             </plugin>                     
         </plugins>
     </build>
-    
 </project>
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
index e712ec8b53..e712ec8b53 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
index d09b2af230..d09b2af230 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
index 32f86ee30f..7be411b0a4 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
@@ -19,6 +19,8 @@
 
 package org.apache.tuscany.sca.binding.ws.jaxws;
 
+import javax.jws.WebService;
+
 import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
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/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
index dd02900175..34914b6579 100644
--- 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/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
@@ -17,16 +17,17 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.ws.jaxws.impl;
+package org.apache.tuscany.sca.binding.ws.jaxws;
+
+import javax.jws.WebService;
 
-import org.apache.tuscany.sca.binding.ws.jaxws.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.HelloWorld;
 import org.oasisopen.sca.annotation.Reference;
 
+@WebService
 public class HelloWorldImpl implements HelloWorld {
 
     @Reference
-    public org.apache.tuscany.sca.binding.ws.jaxws.external.jaxws.HelloWorld helloWorldExternal;
+    public HelloWorld helloWorldExternal;
     
     public String getGreetings(String s) {
         System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
new file mode 100644
index 0000000000..f20fec4c38
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="getGreetings" type="tns:getGreetings"/>
+
+  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
+
+  <xs:complexType name="getGreetings">
+    <xs:sequence>
+      <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsResponse">
+    <xs:sequence>
+      <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
index 8924b74a95..8924b74a95 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
new file mode 100644
index 0000000000..900d6c0c93
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
+<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <types>
+    <xsd:schema>
+      <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
+    </xsd:schema>
+  </types>
+  <message name="getGreetings">
+    <part name="parameters" element="tns:getGreetings"/>
+  </message>
+  <message name="getGreetingsResponse">
+    <part name="parameters" element="tns:getGreetingsResponse"/>
+  </message>
+  <portType name="HelloWorldService">
+    <operation name="getGreetings">
+      <input message="tns:getGreetings"/>
+      <output message="tns:getGreetingsResponse"/>
+    </operation>
+  </portType>
+  <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getGreetings">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="HelloWorldServiceService">
+    <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
+      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+    </port>
+  </service>
+</definitions>
+
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/contribution-java-first/src/main/resources/helloworld.composite
index 25cc834d3c..0188dc0d41 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/contribution-java-first/src/main/resources/helloworld.composite
@@ -23,7 +23,7 @@
            name="HelloWorld">
                
     <component name="HelloWorldService">
-		<implementation.java class="org.apache.tuscany.sca.binding.ws.jaxws.impl.HelloWorldImpl"/>
+		<implementation.java class="org.apache.tuscany.sca.binding.ws.jaxws.HelloWorldImpl"/>
 	    <service name="HelloWorld">
             <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
 	    </service>