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/trunk/itest/ws-jaxws/wsdl-first-contribution | |
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 '')
6 files changed, 26 insertions, 184 deletions
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/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/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/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/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> |