From 2729709882692f467eb7efd67da251627e18cdc9 Mon Sep 17 00:00:00 2001 From: slaws Date: Mon, 9 Jan 2012 10:35:27 +0000 Subject: TUSCANY-3910, TUSCANY-3804 - Set ranking so that JAXWSInterfaceProcessor runs before WrapperJavaInterfaceProcess and apply 3804 style changes to ensure the output wrapper databinding is set separately from the output wrapper. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1229088 13f79535-47bb-0310-9956-ffa450edef68 --- .../ws/contribution-doc-lit-wrapped-dom/pom.xml | 129 +++++++++++++++++++++ .../apache/tuscany/sca/binding/ws/HelloWorld.java | 35 ++++++ .../tuscany/sca/binding/ws/HelloWorld1Impl.java | 67 +++++++++++ .../tuscany/sca/binding/ws/HelloWorld2Impl.java | 67 +++++++++++ .../resources/HelloWorldImplService-doclit.wsdl | 109 +++++++++++++++++ .../resources/HelloWorldImplService-doclit1.xsd | 83 +++++++++++++ .../resources/HelloWorldImplService-doclit2.xsd | 40 +++++++ .../src/main/resources/HelloWorldImplService.wsdl | 64 ++++++++++ .../resources/HelloWorldImplService_schema1.xsd | 111 ++++++++++++++++++ .../resources/HelloWorldServiceService_schema1.xsd | 70 +++++++++++ .../main/resources/META-INF/sca-contribution.xml | 23 ++++ .../resources/helloworld-external-service.wsdl | 75 ++++++++++++ .../src/main/resources/helloworld.composite | 45 +++++++ 13 files changed, 918 insertions(+) create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit.wsdl create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit1.xsd create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit2.xsd create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService.wsdl create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService_schema1.xsd create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldServiceService_schema1.xsd create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld-external-service.wsdl create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld.composite (limited to 'sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom') diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml new file mode 100644 index 0000000000..9b463cae2a --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml @@ -0,0 +1,129 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-ws + 2.0-SNAPSHOT + ../pom.xml + + + itest-ws-contribution-doc-lit-wrapped-dom + Apache Tuscany SCA iTest WS Contribution Doc Lit Wrapped DOM + + + + + org.apache.tuscany.sca + tuscany-base-runtime-pom + pom + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-binding-ws-runtime-axis2 + 2.0-SNAPSHOT + + + + org.mortbay.jetty + jetty + 6.1.19 + + + + + + ${project.artifactId} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.0 + + + add-source + generate-sources + + add-test-source + + + + target/jaxws-source + + + + + + + org.jvnet.jax-ws-commons + jaxws-maven-plugin + 2.1 + + + com.sun.xml.ws + jaxws-tools + 2.2.6-promoted-b10 + + + + + + wsimport1 + process-resources + + wsimport + + + org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface + ${basedir}/target/classes + + helloworld-external-service.wsdl + + ${project.build.directory}/jaxws/stale/.wsimport1StaleFlag + + + + + 2.1 + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source + true + true + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java new file mode 100644 index 0000000000..f96dbff352 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java @@ -0,0 +1,35 @@ +/* + * 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; + +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Remotable; +import org.w3c.dom.Node; + +@Remotable +public interface HelloWorld { + + // TUSCANY-3910 + Node getGreetings(Node s); + String getGreetingsException(String s) throws ServiceRuntimeException; + Foo getGreetingsComplex(Foo foo); + +} diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java new file mode 100644 index 0000000000..aeeecb1cfe --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java @@ -0,0 +1,67 @@ +/* + * 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; + +import javax.jws.WebService; + +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Reference; +import org.w3c.dom.Node; + +@WebService +public class HelloWorld1Impl implements HelloWorld { + + @Reference + public HelloWorld helloWorld2; + +/* + public String getGreetings(String s) { + + System.out.println("Entering SCA HelloWorld1.getGreetings: " + s); + String response = helloWorld2.getGreetings(s); + System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response); + return response; + } +*/ + + public Node getGreetings(Node node){ + System.out.println("Entering SCA HelloWorld1.getGreetings: " + node.getTextContent()); + Node response = helloWorld2.getGreetings(node); + System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response.getTextContent()); + return response; + } + + public String getGreetingsException(String s) throws ServiceRuntimeException { + System.out.println("Entering SCA HelloWorld1.getGreetingsException: " + s); + String response = helloWorld2.getGreetingsException(s); + System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response); + throw new ServiceRuntimeException(response); + } + + public Foo getGreetingsComplex(Foo foo){ + System.out.println("Entering SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS()); + Foo response = helloWorld2.getGreetingsComplex(foo); + System.out.println("Leaving SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS()); + return response; + } + + +} diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java new file mode 100644 index 0000000000..3cc53bf2ff --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java @@ -0,0 +1,67 @@ +/* + * 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; + +import javax.jws.WebService; + +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo; +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Reference; +import org.w3c.dom.Node; + +@WebService +public class HelloWorld2Impl implements HelloWorld { + + @Reference + public HelloWorldService helloWorldExternal; + +/* + public String getGreetings(String s) { + System.out.println("Entering SCA HelloWorld2.getGreetings: " + s); + String response = helloWorldExternal.getGreetings(s); + System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response); + return response; + } +*/ + + public Node getGreetings(Node node){ + System.out.println("Entering SCA HelloWorld2.getGreetings: " + node.getTextContent()); + node.setTextContent("Hello " + node.getTextContent()); + System.out.println("Leaving SCA HelloWorld2.getGreetings: " + node.getTextContent()); + return node; + } + + public String getGreetingsException(String s) throws ServiceRuntimeException { + System.out.println("Entering SCA HelloWorld2.getGreetingsException: " + s); + String response = helloWorldExternal.getGreetings(s); + System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response); + throw new ServiceRuntimeException(response); + } + + public Foo getGreetingsComplex(Foo foo){ + System.out.println("Entering SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS()); + Foo response = helloWorldExternal.getGreetingsComplex(foo); + System.out.println("Leaving SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS()); + return response; + } + + +} diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit.wsdl new file mode 100644 index 0000000000..f5a25b39f8 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit.wsdl @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit1.xsd new file mode 100644 index 0000000000..545820a07d --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit1.xsd @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit2.xsd new file mode 100644 index 0000000000..d955cc2af4 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService-doclit2.xsd @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService.wsdl new file mode 100644 index 0000000000..e52d778747 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService.wsdl @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService_schema1.xsd new file mode 100644 index 0000000000..c9c0acb038 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldImplService_schema1.xsd @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldServiceService_schema1.xsd new file mode 100644 index 0000000000..acdfcaaaa5 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/HelloWorldServiceService_schema1.xsd @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..350ad6be96 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld-external-service.wsdl new file mode 100644 index 0000000000..837bcb059e --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld-external-service.wsdl @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..98dad93e09 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/src/main/resources/helloworld.composite @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3