diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-16 12:06:43 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-16 12:06:43 +0000 |
| commit | 64aebe02e21437a2a57d02b8267873264a25f7da (patch) | |
| tree | e3e9f961ab229746066a18a17da2121f90dea60c /sca-java-2.x | |
| parent | df85b4ebd77c4c6449739e99e44e989ffaf19e0a (diff) | |
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
Diffstat (limited to 'sca-java-2.x')
30 files changed, 504 insertions, 419 deletions
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/pom.xml deleted file mode 100644 index 95df15c66f..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/pom.xml +++ /dev/null @@ -1,46 +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. ---> -<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-common-contribution</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS Common Contribution</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-core</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 558485580f..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/common-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"> - <export.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/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> 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/contribution-wsdl-first/pom.xml index 4f951eb5d9..0bab07d102 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/pom.xml +++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/pom.xml @@ -26,8 +26,8 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>itest-ws-jaxws-wsdl-first-contribution</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS WSDL First Contribution</name> + <artifactId>itest-ws-jaxws-contribution-wsdl-first</artifactId> + <name>Apache Tuscany SCA iTest WS JAXWS Contribution WSDL First</name> <dependencies> @@ -36,13 +36,7 @@ <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> + </dependency> </dependencies> @@ -89,20 +83,35 @@ </dependencies> <executions> <execution> + <id>wsimport1</id> + <phase>process-resources</phase> + <goals> + <goal>wsimport</goal> + </goals> + <configuration> + <packageName>org.apache.tuscany.sca.binding.ws.jaxws</packageName> + <wsdlDirectory>${basedir}/target/classes</wsdlDirectory> + <wsdlFiles> + <wsdlFile>helloworld-sca.wsdl</wsdlFile> + </wsdlFiles> + <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile> + </configuration> + </execution> + <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> + <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service</packageName> + <wsdlDirectory>${basedir}/target/classes</wsdlDirectory> <wsdlFiles> <wsdlFile>helloworld-external.wsdl</wsdlFile> </wsdlFiles> <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile> </configuration> - </execution> + </execution> </executions> <configuration> <target>2.1</target> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/java-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-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java index dd02900175..7c63fd5ba9 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/java-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-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java @@ -19,14 +19,13 @@ 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 org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorld helloWorldExternal; public String getGreetings(String s) { System.out.println("Entering SCA HelloWorld.getGreetings: " + s); @@ -34,10 +33,11 @@ public class HelloWorldImpl implements HelloWorld { 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/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml index 8924b74a95..8924b74a95 100644 --- 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/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld-external.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl index 78d8077bcd..78d8077bcd 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld-external.wsdl +++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld-sca.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl index 0e6a10cc62..0e6a10cc62 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/src/main/resources/helloworld-sca.wsdl +++ b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl 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/contribution-wsdl-first/src/main/resources/helloworld.composite index 0cd2b4419d..0cd2b4419d 100644 --- 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/contribution-wsdl-first/src/main/resources/helloworld.composite diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/pom.xml index b903aa7661..b613a4ad3b 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/pom.xml +++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/pom.xml @@ -26,28 +26,32 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>itest-ws-jaxws-java-first-contribution</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS Java First Contribution</name> + <artifactId>itest-ws-jaxws-external-client</artifactId> + <name>Apache Tuscany SCA iTest WS JAXWS External Client</name> <dependencies> - + + <!-- Core distribution --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-feature-core</artifactId> <type>pom</type> <version>2.0-SNAPSHOT</version> </dependency> - - <dependency> + + <!-- Bindings --> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-ws-jaxws-common-contribution</artifactId> + <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> + </dependency> + </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${artifactId}</finalName> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -89,28 +93,30 @@ </dependencies> <executions> <execution> - <id>wsimport2</id> + <id>wsimport1</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> + <packageName>org.apache.tuscany.sca.binding.ws.jaxws.sca</packageName> + <wsdlDirectory>${basedir}/target/classes</wsdlDirectory> <wsdlFiles> - <wsdlFile>helloworld-external.wsdl</wsdlFile> + <wsdlFile>HelloWorldImplService.wsdl</wsdlFile> </wsdlFiles> - <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile> + <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile> </configuration> - </execution> + </execution> </executions> <configuration> <target>2.1</target> <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> + <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir> <verbose>true</verbose> <xnocompile>true</xnocompile> </configuration> </plugin> </plugins> </build> + </project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldClientLauncher.java b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java index 5c76c0f876..e8574d67e9 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldClientLauncher.java +++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.binding.ws.jaxws.external; +package org.apache.tuscany.sca.binding.ws.jaxws.external.client; import java.io.File; import java.net.URL; @@ -25,20 +25,23 @@ import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.HelloWorld; +import org.apache.tuscany.sca.binding.ws.jaxws.sca.HelloWorldImpl; public class HelloWorldClientLauncher { public static void main(String[] args) throws Exception { - System.out.println("Entering external JAXWS client "); + System.out.println(">>> Starting external JAXWS client "); // default JVM JAXWS support - QName serviceName = new QName("http://helloworld", "HelloWorldService"); - QName portName = new QName("http://helloworld", "HelloWorldSoapPort"); - URL wsdlLocation = new File("../java-first-contribution/target/classes/helloworld-sca.wsdl").toURL(); - javax.xml.ws.Service webService = Service.create( wsdlLocation, serviceName ); - HelloWorld wsProxy = (HelloWorld) webService.getPort(portName, HelloWorld.class); + QName serviceName = new QName("http://jaxws.ws.binding.sca.tuscany.apache.org/", "HelloWorldImplService"); + QName portName = new QName("http://jaxws.ws.binding.sca.tuscany.apache.org/", "HelloWorldImplPort"); + //URL wsdlLocation = new File("../external-client/target/classes/helloworld-sca.wsdl").toURL(); + URL wsdlLocation = new File("../external-client/target/classes/HelloWorldImplService.wsdl").toURL(); + javax.xml.ws.Service webService = Service.create(wsdlLocation, serviceName); + HelloWorldImpl wsProxy = (HelloWorldImpl) webService.getPort(portName, HelloWorldImpl.class); - System.out.println("Leaving external JAXWS client: " + wsProxy.getGreetings("Fred")); + String response = wsProxy.getGreetings("Fred"); + + System.out.println("Leaving external JAXWS client: " + response); } } diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl new file mode 100644 index 0000000000..8ae67d4270 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl @@ -0,0 +1,58 @@ +<?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://jaxws.ws.binding.sca.tuscany.apache.org/" name="HelloWorldImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types> + <xsd:schema> + <xsd:import namespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" schemaLocation="HelloWorldImplService_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> + <message name="getGreetingsComplex"> + <part name="parameters" element="tns:getGreetingsComplex"/> + </message> + <message name="getGreetingsComplexResponse"> + <part name="parameters" element="tns:getGreetingsComplexResponse"/> + </message> + <portType name="HelloWorldImpl"> + <operation name="getGreetings"> + <input message="tns:getGreetings"/> + <output message="tns:getGreetingsResponse"/> + </operation> + <operation name="getGreetingsComplex"> + <input message="tns:getGreetingsComplex"/> + <output message="tns:getGreetingsComplexResponse"/> + </operation> + </portType> + <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl"> + <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> + <operation name="getGreetingsComplex"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="HelloWorldImplService"> + <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding"> + <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/> + </port> + </service> +</definitions> + diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd new file mode 100644 index 0000000000..00d526db82 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<xs:schema version="1.0" targetNamespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:tns="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:element name="getGreetings" type="tns:getGreetings"/> + + <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/> + + <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/> + + <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/> + + <xs:complexType name="getGreetings"> + <xs:sequence> + <xs:element name="arg0" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="getGreetingsResponse"> + <xs:sequence> + <xs:element name="return" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="getGreetingsComplex"> + <xs:sequence> + <xs:element name="arg0" type="tns:foo" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="foo"> + <xs:sequence> + <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="bar"> + <xs:sequence> + <xs:element name="b" type="xs:boolean" minOccurs="0"/> + <xs:element name="s" type="xs:string" minOccurs="0"/> + <xs:element name="x" type="xs:int"/> + <xs:element name="y" type="xs:int" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="getGreetingsComplexResponse"> + <xs:sequence> + <xs:element name="return" type="tns:foo" minOccurs="0"/> + </xs:sequence> + </xs:complexType> +</xs:schema> + diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/pom.xml new file mode 100644 index 0000000000..e64f40273f --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/pom.xml @@ -0,0 +1,104 @@ +<?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-external-service</artifactId> + <name>Apache Tuscany SCA iTest WS JAXWS External Service</name> + + <dependencies> + + + </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>wsgen1</id> + <phase>process-classes</phase> + <goals> + <goal>wsgen</goal> + </goals> + <configuration> + <sei>org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldService</sei> + <genWsdl>true</genWsdl> + <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile> + </configuration> + </execution> + </executions> + <configuration> + <target>2.1</target> + <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> + <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir> + <verbose>true</verbose> + <xnocompile>true</xnocompile> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java index 95f3b3779e..3dd039ff3c 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldService.java +++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.tuscany.sca.binding.ws.jaxws.external; +package org.apache.tuscany.sca.binding.ws.jaxws.external.service; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebResult; import javax.jws.WebService; -import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -32,8 +31,8 @@ public class HelloWorldService { @WebMethod @WebResult(name = "getGreetingsReturn", targetNamespace = "http://helloworld/external") - @RequestWrapper(localName = "getGreetings", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.jaxws.GetGreetings") - @ResponseWrapper(localName = "getGreetingsResponse", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.jaxws.GetGreetingsResponse") + @RequestWrapper(localName = "getGreetings", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.service.GetGreetings") + @ResponseWrapper(localName = "getGreetingsResponse", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.service.GetGreetingsResponse") public String getGreetings( @WebParam(name = "name", targetNamespace = "http://helloworld/external") String name) { System.out.println("Entering External HelloWorld.getGreetings: " + name); diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldServiceLauncher.java b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java index 680e9230bf..c96a5876b5 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldServiceLauncher.java +++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java @@ -17,13 +17,14 @@ * under the License. */ -package org.apache.tuscany.sca.binding.ws.jaxws.external; +package org.apache.tuscany.sca.binding.ws.jaxws.external.service; import javax.xml.ws.Endpoint; public class HelloWorldServiceLauncher { public static void main(String[] args) throws Exception { + System.out.println(">>> Starting external JAXWS service"); // default JVM JAXWS support. Endpoint.publish("http://localhost:8086/External/HelloWorld", diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/pom.xml new file mode 100644 index 0000000000..b78095f01a --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/pom.xml @@ -0,0 +1,114 @@ +<?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-launcher-ri</artifactId> + <name>Apache Tuscany SCA iTest WS JAXWS Launcher RI</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-runtime-jaxws-ri</artifactId> + <version>2.0-SNAPSHOT</version> + </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> + + <!-- Test resources --> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-ws-jaxws-external-client</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-ws-jaxws-external-service</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + + </build> + +</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java index d20ecc3899..d7d022ae41 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java +++ b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.binding.ws.jaxws.launcher; import junit.framework.TestCase; -import org.apache.tuscany.sca.binding.ws.jaxws.external.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.HelloWorldServiceLauncher; +import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; @@ -41,10 +41,21 @@ public class JavaFirstTestCase extends TestCase { new Contribution("java-first", "../java-first-contribution/target/classes")); node.start(); } + +/* + public void testWait() throws Exception { + System.out.println("Press a key"); + System.in.read(); + } +*/ public void testCalculator() throws Exception { - - HelloWorldClientLauncher.main(null); + try { + HelloWorldClientLauncher.main(null); + } catch (Exception ex) { + ex.printStackTrace(); + throw ex; + } /* Foo f = new Foo(); @@ -73,13 +84,6 @@ public class JavaFirstTestCase extends TestCase { */ } -/* - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } - -*/ @Override protected void tearDown() throws Exception { node.stop(); diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCase.java b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java index dd14dbbd74..a69fe483bf 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCase.java +++ b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java @@ -21,13 +21,13 @@ package org.apache.tuscany.sca.binding.ws.jaxws.launcher; import junit.framework.TestCase; -import org.apache.tuscany.sca.binding.ws.jaxws.external.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.HelloWorldServiceLauncher; +import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -public class WSDLFirstTestCase extends TestCase { +public class WSDLFirstTestCaseOFF extends TestCase { private Node node; @@ -46,11 +46,12 @@ public class WSDLFirstTestCase extends TestCase { HelloWorldClientLauncher.main(null); } +/* public void testWait1() throws Exception { System.out.println("Press a key"); System.in.read(); - } - + } + public void testCalculator1() throws Exception { HelloWorldClientLauncher.main(null); } @@ -130,7 +131,7 @@ public class WSDLFirstTestCase extends TestCase { public void testCalculator20() throws Exception { HelloWorldClientLauncher.main(null); } - +*/ @Override 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 8ddea42d4e..f8c19205e9 100644 --- a/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml +++ b/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml @@ -30,10 +30,12 @@ <name>Apache Tuscany SCA iTest WS JAXWS</name> <modules> - <module>common-contribution</module> - <module>java-first-contribution</module> - <module>wsdl-first-contribution</module> - <module>test-launcher</module> + <module>contribution-java-first</module> + <module>contribution-wsdl-first</module> + <module>external-client</module> + <module>external-service</module> + <module>launcher-ri</module> + <!--module>launcher-axis2</module--> </modules> </project> 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 deleted file mode 100644 index 78d8077bcd..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-external.wsdl +++ /dev/null @@ -1,84 +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://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 deleted file mode 100644 index 0e6a10cc62..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/wsdl-first-contribution/src/main/resources/helloworld-sca.wsdl +++ /dev/null @@ -1,84 +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://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> |