Author: lresende
Date: Fri Aug 31 17:27:18 2007
New Revision: 571658
URL: http://svn.apache.org/viewvc?rev=571658&view=rev
Log:
[Work in progress] Starting to reactivate the interop-soap iTests
Added:
incubator/tuscany/java/sca/itest/interop-soap-client/
- copied from r571233,
incubator/tuscany/java/sca/itest/old/interop-soap-client/
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/default.composite
incubator/tuscany/java/sca/itest/interop-soap-round2-client/
- copied from r571233,
incubator/tuscany/java/sca/itest/old/interop-soap-round2-client/
incubator/tuscany/java/sca/itest/interop-soap-service/
- copied from r571233,
incubator/tuscany/java/sca/itest/old/interop-soap-service/
Removed:
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/META-INF/README.txt
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/META-INF/sca/
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/META-INF/tuscany/
incubator/tuscany/java/sca/itest/old/interop-soap-client/
incubator/tuscany/java/sca/itest/old/interop-soap-round2-client/
incubator/tuscany/java/sca/itest/old/interop-soap-service/
Modified:
incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml
incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml
incubator/tuscany/java/sca/itest/pom.xml
Modified: incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml?rev=571658&r1=571233&r2=571658&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml Fri Aug 31
17:27:18 2007
@@ -18,60 +18,111 @@
* under the License.
-->
<project>
- <parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>tuscany-interop-clients</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>interop-client-webserviceInteropDoc</artifactId>
- <packaging>jar</packaging>
- <name>Tuscany Interop Testing - Clients - InteropDoc</name>
-
- <properties>
- <ws.type>axis2</ws.type>
- </properties>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>${sdo.version}</version>
- <executions>
- <execution>
- <configuration>
-
<schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.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>${sca.version}</version>
- <executions>
- <execution>
- <configuration>
-
<wsdlFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
- <javaPackage>org.soapinterop</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-client</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Tuscany Interop Testing - Clients - InteropDoc</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/interopdoc.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/interopdoc.wsdl</wsdlFile>
+
<javaPackage>org.soapinterop</javaPackage>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java?rev=571658&r1=571233&r2=571658&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
(original)
+++
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
Fri Aug 31 17:27:18 2007
@@ -20,7 +20,6 @@
import java.rmi.RemoteException;
-import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
import org.soapinterop.ComplexDocument;
import org.soapinterop.DocTestPortType;
@@ -31,8 +30,6 @@
* This class implements the DocTest service component.
*/
@Service(DocTestPortType.class)
-//FIXME workaround for JIRA TUSCANY-41
[EMAIL PROTECTED]("COMPOSITE")
public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType
{
public ComplexDocument ComplexDocument(ComplexDocument param0) throws
RemoteException {
Added:
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/default.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/default.composite?rev=571658&view=auto
==============================================================================
---
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/default.composite
(added)
+++
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/default.composite
Fri Aug 31 17:27:18 2007
@@ -0,0 +1,43 @@
+<?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";
+ name="interop.client">
+
+ <component name="LoopbackInteropDocService">
+ <implementation.java
class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>
+ </component>
+
+ <reference name="RemoteInteropDocService">
+ <!-- interface.wsdl
interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
+ <interface.java interface="org.soapinterop.DocTestPortType"/>
+
+ <binding.ws
endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
location="wsdl/interopdoc.wsdl"/>
+ </reference>
+
+ <reference name="LocalHostInteropDocService">
+ <!-- interface.wsdl
interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
+ <interface.java interface="org.soapinterop.DocTestPortType"/>
+
+
+ <binding.ws
endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
+ location="wsdl/interopdoc.wsdl"/>
+ </reference>
+
+</composite>
\ No newline at end of file
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=571658&r1=571233&r2=571658&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
Fri Aug 31 17:27:18 2007
@@ -1,23 +1,24 @@
<?xml version="1.0"?>
<!--
- * 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.
- -->
-<definitions name="InteropTestDoc" targetNamespace="http://soapinterop.org/";
+ * 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.
+-->
+<definitions name="InteropTestDoc"
+ targetNamespace="http://soapinterop.org/";
xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
@@ -26,71 +27,84 @@
<types>
- <xsd:schema elementFormDefault="qualified"
targetNamespace="http://soapinterop.org/";
xmlns:interop="http://soapinterop.org/";>
+ <xsd:schema elementFormDefault="qualified"
+ targetNamespace="http://soapinterop.org/";
+ xmlns:interop="http://soapinterop.org/";>
<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: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>
<xsd:complexType name="SimpleDocument">
<xsd:simpleContent>
- <xsd:extension base="xsd:string"/>
+ <xsd:extension base="xsd:string" />
</xsd:simpleContent>
</xsd:complexType>
<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:attribute name="AnAttribute"
type="xsd:string" />
</xsd:complexType>
<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:element minOccurs="0"
maxOccurs="1"
+ name="ComplexDocument"
type="interop:ComplexDocument" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -100,85 +114,91 @@
</types>
<message name="SingleTagSoapIn">
- <part name="parameters" element="tns:SingleTag"/>
+ <part name="parameters" element="tns:SingleTag" />
</message>
<message name="SingleTagSoapOut">
- <part name="outputDoc" element="tns:SingleTagResponse"/>
+ <part name="outputDoc" element="tns:SingleTagResponse" />
</message>
<message name="SimpleDocumentSoapIn">
- <part name="parameters" element="tns:SimpleDocument"/>
+ <part name="parameters" element="tns:SimpleDocument" />
</message>
<message name="SimpleDocumentSoapOut">
- <part name="outputDoc" element="tns:SimpleDocumentResponse"/>
+ <part name="outputDoc" element="tns:SimpleDocumentResponse" />
</message>
<message name="ComplexDocumentSoapIn">
- <part name="parameters" element="tns:ComplexDocument"/>
+ <part name="parameters" element="tns:ComplexDocument" />
</message>
<message name="ComplexDocumentSoapOut">
- <part name="outputDoc" element="tns:ComplexDocumentResponse"/>
+ <part name="outputDoc" element="tns:ComplexDocumentResponse" />
</message>
<portType name="DocTestPortType">
<operation name="SingleTag">
- <input message="tns:SingleTagSoapIn"/>
- <output message="tns:SingleTagSoapOut"/>
+ <input message="tns:SingleTagSoapIn" />
+ <output message="tns:SingleTagSoapOut" />
</operation>
<operation name="SimpleDocument">
- <input message="tns:SimpleDocumentSoapIn"/>
- <output message="tns:SimpleDocumentSoapOut"/>
+ <input message="tns:SimpleDocumentSoapIn" />
+ <output message="tns:SimpleDocumentSoapOut" />
</operation>
<operation name="ComplexDocument">
- <input message="tns:ComplexDocumentSoapIn"/>
- <output message="tns:ComplexDocumentSoapOut"/>
+ <input message="tns:ComplexDocumentSoapIn" />
+ <output message="tns:ComplexDocumentSoapOut" />
</operation>
</portType>
<binding name="doc_test_binding" type="tns:DocTestPortType">
- <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http"; />
<operation name="SingleTag">
- <soap:operation
soapAction="http://soapinterop.org/SingleTag"/>
+ <soap:operation
+ soapAction="http://soapinterop.org/SingleTag"; />
<input>
- <soap:body use="literal"/>
+ <soap:body use="literal" />
</input>
<output>
- <soap:body use="literal"/>
+ <soap:body use="literal" />
</output>
- </operation>
+ </operation>
<operation name="SimpleDocument">
- <soap:operation
soapAction="http://soapinterop.org/SimpleDocument"/>
+ <soap:operation
+
soapAction="http://soapinterop.org/SimpleDocument"; />
<input>
- <soap:body use="literal"/>
+ <soap:body use="literal" />
</input>
<output>
- <soap:body use="literal"/>
+ <soap:body use="literal" />
</output>
- </operation>
+ </operation>
<operation name="ComplexDocument">
- <soap:operation
soapAction="http://soapinterop.org/ComplexDocument"/>
+ <soap:operation
+
soapAction="http://soapinterop.org/ComplexDocument"; />
<input>
- <soap:body use="literal"/>
+ <soap:body use="literal" />
</input>
<output>
- <soap:body use="literal"/>
+ <soap:body use="literal" />
</output>
- </operation>
+ </operation>
</binding>
<service name="interopDocSvc">
- <port name="interopDocPort" binding="tns:doc_test_binding">
- <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"/ -->
- <http-conf:client
xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration";
- AllowChunking="false"/>
- </port>
+ <port name="interopDocPort" binding="tns:doc_test_binding">
+ <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"/ -->
+ <http-conf:client
+
xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration";
+ AllowChunking="false" />
+ </port>
</service>
Modified:
incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java?rev=571658&r1=571233&r2=571658&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
Fri Aug 31 17:27:18 2007
@@ -18,11 +18,12 @@
*/
package org.apache.tuscany.test.interop.client;
+import java.awt.CompositeContext;
import java.rmi.RemoteException;
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.soapinterop.ArrayOfSimpleDocument;
import org.soapinterop.ChildDocument;
import org.soapinterop.ComplexDocument;
@@ -31,16 +32,31 @@
import org.soapinterop.SimpleDocument1;
import org.soapinterop.SingleTag;
-import commonj.sdo.helper.DataFactory;
+import calculator.CalculatorService;
-public class InteropDocClientTestCase extends SCATestCase {
+import commonj.sdo.helper.DataFactory;
+public class InteropDocClientTestCase extends TestCase {
+ private SCADomain scaDomain;
+
private DataFactory dataFactory;
private DocTestPortType interopDoc;
public InteropDocClientTestCase(){};
+
+ @Override
+ protected void setUp() throws Exception {
+
+ scaDomain = SCADomain.newInstance("default.composite");
+ interopDoc =
scaDomain.getService(LoopbackInteropDocServiceComponentImpl.class,
"CalculatorServiceComponent");
+
+ //Get the SDO DataFactory
+ dataFactory = DataFactory.INSTANCE;
+ }
+
+
public void testSingleTag() throws RemoteException {
// Create the input
@@ -100,34 +116,6 @@
}
- protected void setUp() throws Exception {
-
- setApplicationSCDL(LoopbackInteropDocServiceComponentImpl.class,
"META-INF/sca/default.scdl");
-
- addExtension("test.extensions",
getClass().getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl"));
- /*
- addExtension("org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry",
getClass().getClassLoader().getResource(
-
- "META-INF/tuscany/interface.wsdl.scdl"));
-
- addExtension("org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospector",
getClass().getClassLoader().getResource(
- "META-INF/tuscany/interface.wsdl.scdl"));
-
-
-
- addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding",
getClass().getClassLoader().getResource(
- "META-INF/tuscany/binding.axis2.scdl"));
- addExtension("org.apache.tuscany.databinding.sdo",
getClass().getClassLoader().getResource("META-INF/tuscany/databinding.sdo.scdl"));
- */
- super.setUp();
-
- // Get the SDO DataFactory
- dataFactory = DataFactory.INSTANCE;
-
- // Locate the service to test
- interopDoc = locateInteropDocService();
-
- }
/**
* Locate the interop service to test
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=571658&r1=571233&r2=571658&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 Fri Aug
31 17:27:18 2007
@@ -18,16 +18,17 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>tuscany-interop-clients</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>interop-client-webserviceSOAPRound2</artifactId>
+ <artifactId>itest-interop-soap-round2-client</artifactId>
<packaging>jar</packaging>
- <name>Tuscany Interop Testing - Clients - SOAP Builders Round 2 Interop
Test</name>
+ <name>Apache Tuscany Interop Testing - Clients - SOAP Builders Round 2
Interop Test</name>
<properties>
<ws.type>axis2</ws.type>
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=571658&r1=571233&r2=571658&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/interop-soap-service/pom.xml Fri Aug 31
17:27:18 2007
@@ -18,50 +18,78 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>tuscany-interop-services</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>interop-service-webserviceInteropDoc</artifactId>
+ <artifactId>itest-interop-soap-service</artifactId>
<packaging>war</packaging>
- <name>Tuscany Interop Testing - Services - InteropDoc</name>
+ <name>Apache Tuscany Interop Testing - Services - InteropDoc</name>
<dependencies>
+ <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.runtime</groupId>
- <artifactId>webapp</artifactId>
- <version>${sca.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
+ <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.runtime</groupId>
- <artifactId>webapp-host</artifactId>
- <version>${sca.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-http-tomcat</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+
+<dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>1.2.4</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>tuscany-wsdl</artifactId>
- <version>${sca.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
- <scope>compile</scope>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>1.2.4</version>
+ <scope>runtime</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
- <scope>runtime</scope>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.1</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=571658&r1=571657&r2=571658&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Fri Aug 31 17:27:18 2007
@@ -36,6 +36,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>callablereferences</module>
<module>callback-api</module>
<module>callback-basic</module>
<module>callback-complex-type</module>
@@ -51,17 +52,21 @@
<module>exceptions-cross-binding</module>
<module>exceptions-cross-binding-ws</module>
<module>extended-api</module>
+ <!--
+ <module>interop-soap-client</module>
+ <module>interop-soap-round2-client</module>
+ <module>interop-soap-service</module>
+ -->
+ <module>large-sdo-ws</module>
<module>operation-overloading</module>
<module>osgi-implementation</module>
<module>properties</module>
<module>recursive</module>
<module>references</module>
<module>services</module>
- <module>callablereferences</module>
<module>scopes</module>
<module>wsdl</module>
<module>wsdlless</module>
- <module>large-sdo-ws</module>
<module>wsdl2java</module>
</modules>
</profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
