Author: lresende
Date: Sun Sep 2 21:02:48 2007
New Revision: 572231
URL: http://svn.apache.org/viewvc?rev=572231&view=rev
Log:
[Work in progress] Starting to reactivate the interop-soap iTests
Added:
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/main/resources/default.composite
Removed:
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/main/resources/META-INF/
Modified:
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml
Modified:
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl?rev=572231&r1=572230&r2=572231&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
(original)
+++
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
Sun Sep 2 21:02:48 2007
@@ -34,26 +34,23 @@
<xsd:element name="SingleTag">
<xsd:complexType>
<xsd:sequence>
- <xsd:element minOccurs="0"
maxOccurs="1"
- name="SingleTag"
type="interop:SingleTag" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
<xsd:complexType name="SingleTag" />
<xsd:element name="SingleTagResponse">
<xsd:complexType>
<xsd:sequence>
- <xsd:element minOccurs="0"
maxOccurs="1"
- name="SingleTag"
type="interop:SingleTag" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
+
<xsd:element name="SimpleDocument">
<xsd:complexType>
<xsd:sequence>
- <xsd:element minOccurs="0"
maxOccurs="1"
- name="SimpleDocument"
type="interop:SimpleDocument" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -65,49 +62,43 @@
<xsd:element name="SimpleDocumentResponse">
<xsd:complexType>
<xsd:sequence>
- <xsd:element minOccurs="0"
maxOccurs="1"
- name="SimpleDocument"
type="interop:SimpleDocument" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
+
<xsd:element name="ComplexDocument">
<xsd:complexType>
<xsd:sequence>
- <xsd:element minOccurs="0"
maxOccurs="1"
- name="ComplexDocument"
type="interop:ComplexDocument" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="ComplexDocument">
<xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1"
- name="simpleDoc"
type="interop:ArrayOfSimpleDocument" />
- <xsd:element minOccurs="0" maxOccurs="1"
- name="child"
type="interop:ChildDocument" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="child" type="interop:ChildDocument" />
</xsd:sequence>
<xsd:attribute name="AnAttribute"
type="xsd:string" />
</xsd:complexType>
+ <xsd:element name="ComplexDocumentResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element minOccurs="0"
maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
<xsd:complexType name="ArrayOfSimpleDocument">
<xsd:sequence>
- <xsd:element minOccurs="0"
maxOccurs="unbounded"
- name="SimpleDocument"
nillable="true"
- type="interop:SimpleDocument" />
+ <xsd:element minOccurs="0"
maxOccurs="unbounded" name="SimpleDocument" nillable="true"
type="interop:SimpleDocument" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="ChildDocument">
<xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1"
- name="childSimpleDoc"
type="interop:ArrayOfSimpleDocument" />
+ <xsd:element minOccurs="0"
maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument" />
</xsd:sequence>
</xsd:complexType>
- <xsd:element name="ComplexDocumentResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0"
maxOccurs="1"
- name="ComplexDocument"
type="interop:ComplexDocument" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
</xsd:schema>
@@ -190,8 +181,7 @@
<service name="interopDocSvc">
<port name="interopDocPort" binding="tns:doc_test_binding">
- <soap:address
- location="http://www.whitemesa.net/interopdoc";
/>
+ <soap:address
location="http://www.whitemesa.net/interopdoc"; />
<!-- soap:address
location="http://mssoapinterop.org/asmx/simple.asmx"/ -->
<!-- soap:address
location="http://easysoap.sourceforge.net/cgi-bin/interopserver"/ -->
<!-- soap:address
location="http://www.mssoapinterop.org/remoting/ServiceAllTypes.soap"/ -->
Modified: incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml?rev=572231&r1=572230&r2=572231&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml
(original)
+++ incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml Sun Sep
2 21:02:48 2007
@@ -18,61 +18,111 @@
* under the License.
-->
<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-interop-soap-round2-client</artifactId>
- <packaging>jar</packaging>
- <name>Apache Tuscany Interop Testing - Clients - SOAP Builders Round 2
Interop Test</name>
-
- <properties>
- <ws.type>axis2</ws.type>
- </properties>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>${sca.version}</version>
- <executions>
- <execution>
- <configuration>
-
<schemaFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noInterfaces>true</noInterfaces>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.tuscany.sca.extensions.axis2.plugins</groupId>
- <artifactId>tuscany-plugin-wsdl2java</artifactId>
- <version>${sdo.version}</version>
- <executions>
- <execution>
- <configuration>
-
<wsdlFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</wsdlFile>
-
<javaPackage>org.soapinterop.wsdl.interop.test.doc.lit</javaPackage>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-interop-soap-round2-client</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Tuscany Interop Testing - Clients - SOAP Builders Round 2
+ Interop Test</name>
+ <properties>
+ <ws.type>axis2</ws.type>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sca-api</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+
<artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-wsdl</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-http-jetty</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+
<schemaFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</schemaFile>
+
<noNotification>true</noNotification>
+
<noContainer>true</noContainer>
+
<noInterfaces>true</noInterfaces>
+
<noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-wsdl2java</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+
<wsdlFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</wsdlFile>
+
<javaPackage>org.soapinterop.wsdl.interop.test.doc.lit</javaPackage>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added:
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/main/resources/default.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/main/resources/default.composite?rev=572231&view=auto
==============================================================================
---
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/main/resources/default.composite
(added)
+++
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/main/resources/default.composite
Sun Sep 2 21:02:48 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0";
+ name="InteropClient">
+
+ <dbsdo:import.sdo location="wsdl/interoptestdoclit.wsdl"/>
+ <dbsdo:import.sdo factory="org.soapinterop.xsd.XsdFactory"/>
+
+ <reference name="RemoteInteropDocService">
+<!--
+ <interface.wsdl
interface="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.interface(WSDLInteropTestDocLitPortType)"/>
+ <binding.ws
port="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"/>
+-->
+
+ <interface.java
interface="org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType"/>
+ <binding.ws
endpoint="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"
+ location="wsdl/interoptestdoclit.wsdl" />
+ </reference>
+
+</composite>
\ No newline at end of file
Modified:
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java?rev=572231&r1=572230&r2=572231&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
Sun Sep 2 21:02:48 2007
@@ -41,7 +41,7 @@
* This is part of the WSDL interop test from Microsoft and more details
aobout this test case are found at
* http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm
*/
-public class InteropTestDocLitTestCase extends SCATestCase {
+public class InteropTestDocLitTestCase extends TestCase {
private WSDLInteropTestDocLitPortType doc = null;
Modified: incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml?rev=572231&r1=572230&r2=572231&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml Sun Sep 2
21:02:48 2007
@@ -97,9 +97,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>${sdo.version}</version>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<executions>
<execution>
<configuration>
@@ -116,9 +116,9 @@
</executions>
</plugin>
<plugin>
-
<groupId>org.apache.tuscany.sca.extensions.axis2.plugins</groupId>
- <artifactId>tuscany-plugin-wsdl2java</artifactId>
- <version>${sca.version}</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-wsdl2java</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<executions>
<execution>
<configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
