Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 0 insertions, 494 deletions

diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/pom.xml b/branches/sca-java-1.5/itest/interop-soap-round2-client/pom.xml
deleted file mode 100644
index dd1185b43c..0000000000
--- a/branches/sca-java-1.5/itest/interop-soap-round2-client/pom.xml
+++ /dev/null
@@ -1,124 +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>1.5-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-interop-soap-round2-client</artifactId>
-	<name>Apache Tuscany SCA WS SOAP Round2 Interop Client Integration Tests</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.5-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.5-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.5-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.5-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.5-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.5-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.5-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>
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
deleted file mode 100644
index ca3031c646..0000000000
--- a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.tuscany.test.interop.client;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-
-/*
- * 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.
- */
-
-
-/**
- *
- *
- */
-public class InteropTestDocLit {
-    private WSDLInteropTestDocLitPortType interopTestDocLitPortType =null;
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-
-
-    }
-    WSDLInteropTestDocLitPortType getInteropTestDocLitPortType() {
-        return interopTestDocLitPortType;
-    }
-    void setInteropTestDocLitPortType(WSDLInteropTestDocLitPortType interopTestDocLitPortType) {
-        this.interopTestDocLitPortType = interopTestDocLitPortType;
-    }
-
-}
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/default.composite b/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/default.composite
deleted file mode 100644
index 9bde77ef37..0000000000
--- a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/default.composite
+++ /dev/null
@@ -1,38 +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.    

--->

-<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
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
deleted file mode 100644
index e08039cedb..0000000000
--- a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ /dev/null
@@ -1,155 +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.    
- -->
-<definitions name="WSDLInteropTestDocLitService" 
-    targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <types>
-        <schema targetNamespace="http://soapinterop.org/xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-            elementFormDefault="qualified">
-            <complexType name="ArrayOfstring_literal">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="string" type="xsd:string"/>
-                </sequence>
-            </complexType>
-	    <complexType name="SOAPStruct">
-                <all>
-                    <element name="varFloat" type="xsd:float"/>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varString" type="xsd:string"/>
-                </all>
-            </complexType>
-  
-            <element name="echoStringParam" type="xsd:string"/>
-         
-            <element name="echoStringReturn" type="xsd:string"/>
-            <element name="echoStringArrayParam" type="xsd1:ArrayOfstring_literal"/>
-                
-            <element name="echoStringArrayReturn" type="xsd1:ArrayOfstring_literal"/>
-               
-            <element name="echoStructParam" type="xsd1:SOAPStruct"/>
-                   
-            <element name="echoStructReturn" type="xsd1:SOAPStruct"/>
-        </schema>
-    </types>
-    <message name="echoString">
-        <part element="xsd1:echoStringParam" name="a"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="xsd1:echoStringReturn" name="result"/>
-    </message>
-    <message name="echoStringArray">
-        <part element="xsd1:echoStringArrayParam" name="a"/>
-    </message>
-    <message name="echoStringArrayResponse">
-        <part element="xsd1:echoStringArrayReturn" name="result"/>
-    </message>
-    <message name="echoStruct">
-        <part element="xsd1:echoStructParam" name="a"/>
-    </message>
-    <message name="echoStructResponse">
-        <part element="xsd1:echoStructReturn" name="result"/>
-    </message>
-    <message name="echoVoid"/>
-    <message name="echoVoidResponse"/>
-
-    <portType name="WSDLInteropTestDocLitPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-        <operation name="echoStringArray">
-            <input message="tns:echoStringArray" name="echoStringArray"/>
-            <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
-        </operation>
-        <operation name="echoStruct">
-            <input message="tns:echoStruct" name="echoStruct"/>
-            <output message="tns:echoStructResponse" name="echoStructResponse"/>
-        </operation>
-        <operation name="echoVoid">
-            <input message="tns:echoVoid" name="echoVoid"/>
-            <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
-        </operation>
-    </portType>
-    <binding name="WSDLInteropTestDocLitPortBinding" 
-        type="tns:WSDLInteropTestDocLitPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoString">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStringArray">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStringArray">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringArrayResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStruct">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStruct">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStructResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoVoid">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoVoid">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoVoidResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="WSDLInteropTestDocLitService">
-        <port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort">
-            <soap:address 
-                location="http://mssoapinterop.org/stkv3/wsdl/interopTestDocLit.wsdl"/>
-            <http-conf:client xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
-                AllowChunking="false"/>
-        </port>
-    </service>
-</definitions>
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/branches/sca-java-1.5/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
deleted file mode 100644
index bb379c89cd..0000000000
--- a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ /dev/null
@@ -1,133 +0,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.    
- */
-package org.apache.tuscany.test.interop.client;
-
-import java.rmi.RemoteException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-import org.soapinterop.xsd.ArrayOfstring_literal;
-import org.soapinterop.xsd.SOAPStruct;
-import org.soapinterop.xsd.XsdPackage;
-
-import commonj.sdo.helper.DataFactory;
-
-/**
- * This test case is part of the tuscany interop tests. This is a reduced version of the SOAPBuilders InteropTest test, document/literal mode. This
- * version has operations such as echoString, echoArrayOfString and echoStruct.
- * 
- * <p>
- * The WSDL for the external service used in this test case can be downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl.
- * 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 TestCase {
-
-    private WSDLInteropTestDocLitPortType doc = null;
-
-    private DataFactory dataFactory;
-
-    
-    protected void setUp() throws Exception {
-        setApplicationSCDL(InteropTestDocLit.class, "META-INF/sca/default.scdl");
-        addExtension("test.extensions", InteropTestDocLit.class.getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl"));
-
-         super.setUp();
-
-        // Get the SDO DataFactory
-        dataFactory = DataFactory.INSTANCE;
-
-        // Locate the service to test
-        doc = locateInteropDocService();
-    }
-
-    /**
-     * Locate the interop service to test
-     * 
-     * @return
-     */
-    protected WSDLInteropTestDocLitPortType locateInteropDocService() {
-
-        CompositeContext compositeContext = CurrentCompositeContext.getContext();
-        return compositeContext.locateService(WSDLInteropTestDocLitPortType.class, "RemoteInteropDocService");
-
-    }
-
-    /**
-     * test echo void
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoVoid() throws RemoteException {
-        doc.echoVoid();
-        assertTrue(true);
-    }
-
-    /**
-     * test echo string
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoString() throws RemoteException {
-        String input = "a test string";
-        String output = doc.echoString(input);
-        assertEquals(input, output);
-    }
-
-    /**
-     * test echo string
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoStringArray() throws RemoteException {
-
-        ArrayOfstring_literal input = (ArrayOfstring_literal) dataFactory.create(ArrayOfstring_literal.class);
-        List inStrings = Arrays.asList(new String[] { "petra", "sue" });
-        input.set(XsdPackage.ARRAY_OFSTRING_LITERAL__STRING, inStrings);
-
-        ArrayOfstring_literal output = doc.echoStringArray(input);
-
-        List outStrings = output.getString();
-        assertNotNull(outStrings);
-        assertEquals(2, outStrings.size());
-        assertEquals("petra", outStrings.get(0));
-        assertEquals("sue", outStrings.get(1));
-    }
-
-    /**
-     * test echo struct
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoStruct() throws RemoteException {
-        SOAPStruct input = (SOAPStruct) dataFactory.create(SOAPStruct.class);
-        input.setVarInt(200);
-        input.setVarFloat(.002f);
-        input.setVarString("Hello");
-        SOAPStruct output = doc.echoStruct(input);
-        assertEquals(input.getVarInt(), output.getVarInt());
-        assertEquals(input.getVarFloat(), output.getVarFloat());
-        assertEquals(input.getVarString(), output.getVarString());
-    }
-
-}