Delete old beta3 branch as its going to be recreated from the current trunk

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

10 files changed, 0 insertions, 606 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
deleted file mode 100644
index 6bc67db5fc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ /dev/null
@@ -1,32 +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.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;

-

-@Remotable

-public interface HelloWorld {

-    

-    String getGreetings(String s);

-    String getGreetingsException(String s) throws ServiceRuntimeException;

-    Foo getGreetingsComplex(Foo foo);

-}

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
deleted file mode 100644
index 9ee8373468..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ /dev/null
@@ -1,54 +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.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;

-

-@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 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/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
deleted file mode 100644
index 6f3b430d6d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
+++ /dev/null
@@ -1,55 +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.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;

-

-@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 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/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
deleted file mode 100644
index 0c11e6a8f4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<!--

- * 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 targetNamespace="http://ws.binding.sca.tuscany.apache.org/rpclit" 

-             name="HelloWorldImplService" 

-             xmlns="http://schemas.xmlsoap.org/wsdl/" 

-             xmlns:tns="http://ws.binding.sca.tuscany.apache.org/rpclit"

-             xmlns:tns2="http://helloworld/external" 

-             xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">

-  <types>

-    <xsd:schema>

-      <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/rpclit" 

-                  schemaLocation="HelloWorldImplService-rpclit1.xsd"/>

-    </xsd:schema>

-  </types>

-  <message name="getGreetings">

-    <part name="s" type="xsd:string"/>

-  </message>

-  <message name="getGreetingsResponse">

-    <part name="s" type="xsd:string"/>

-  </message>

-  <message name="getGreetingsException">

-    <part name="s" type="xsd:string"/>

-  </message>

-  <message name="getGreetingsExceptionResponse">

-    <part name="s" type="xsd:string"/>

-  </message>

-  <message name="Exception">

-    <part name="fault" element="tns:Exception"/>

-  </message>

-  <message name="getGreetingsComplex">

-    <part name="foo" type="tns2:foo"/>

-  </message>

-  <message name="getGreetingsComplexResponse">

-    <part name="foo" type="tns2:foo"/>

-  </message>

-  <portType name="HelloWorldImpl">

-    <operation name="getGreetings">

-      <input message="tns:getGreetings"/>

-      <output message="tns:getGreetingsResponse"/>

-    </operation>

-    <operation name="getGreetingsException">

-      <input message="tns:getGreetingsException"/>

-      <output message="tns:getGreetingsExceptionResponse"/>

-      <fault message="tns:Exception" name="Exception"/>

-    </operation>

-    <operation name="getGreetingsComplex">

-      <input message="tns:getGreetingsComplex"/>

-      <output message="tns:getGreetingsComplexResponse"/>

-    </operation>

-  </portType>

-  <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">

-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>

-    <operation name="getGreetings">

-      <soap:operation soapAction=""/>

-      <input>

-        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsNamespace" />

-      </input>

-      <output>

-        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsResponseNamespace"/>

-      </output>

-    </operation>

-    <operation name="getGreetingsException">

-      <soap:operation soapAction=""/>

-      <input>

-        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionNamespace"/>

-      </input>

-      <output>

-        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionResponseNamespace"/>

-      </output>

-      <fault name="Exception">

-        <soap:fault name="Exception" use="literal"/>

-      </fault>

-    </operation>

-    <operation name="getGreetingsComplex">

-      <soap:operation soapAction=""/>

-      <input>

-        <soap:body use="literal"/>

-      </input>

-      <output>

-        <soap:body use="literal"/>

-      </output>

-    </operation>

-  </binding>

-  <service name="HelloWorldImplService">

-    <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">

-      <soap:address location="http://localhost:8087/HelloWorldService/HelloWorld-rpclit"/>

-    </port>

-  </service>

-</definitions>

-

-

-

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
deleted file mode 100644
index 8841f0dcf2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<!--

- * 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.    

--->

-<xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/rpclit" 

-                         xmlns:tns="http://ws.binding.sca.tuscany.apache.org/rpclit" 

-                         xmlns:tns2="http://helloworld/external"

-                         xmlns:xs="http://www.w3.org/2001/XMLSchema">

-

-  <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService-rpclit2.xsd"/>

-  

-  <xs:element name="Exception" type="tns:Exception"/>

-

-  <xs:element name="getGreetings" type="tns:getGreetings"/>

-

-  <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>

-

-  <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>

-

-  <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>

-

-  <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>

-

-  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>

-

-  <xs:complexType name="getGreetingsException">

-    <xs:sequence>

-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetingsExceptionResponse">

-    <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="Exception">

-    <xs:sequence>

-      <xs:element name="message" type="xs:string" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetings">

-    <xs:sequence>

-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetingsResponse">

-    <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetingsComplex">

-    <xs:sequence>

-      <xs:element name="arg0" type="tns2:foo" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetingsComplexResponse">

-    <xs:sequence>

-      <xs:element name="return" type="tns2:foo" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-</xs:schema>

-

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
deleted file mode 100644
index d955cc2af4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<!--

- * 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.    

--->

-<xs:schema version="1.0" targetNamespace="http://helloworld/external" 

-                         xmlns:tns="http://helloworld/external" 

-                         xmlns:xs="http://www.w3.org/2001/XMLSchema">

-

-  <xs:complexType name="foo">

-    <xs:sequence>

-      <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="bar">

-    <xs:sequence>

-      <xs:element name="b" type="xs:boolean" minOccurs="0"/>

-      <xs:element name="s" type="xs:string" minOccurs="0"/>

-      <xs:element name="x" type="xs:int"/>

-      <xs:element name="y" type="xs:int" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-</xs:schema>

-

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
deleted file mode 100644
index acdfcaaaa5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<!--

- * 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.    

--->

-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-

-  <xs:element name="getGreetings" type="tns:getGreetings"/>

-

-  <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>

-

-  <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>

-

-  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>

-

-  <xs:complexType name="getGreetings">

-    <xs:sequence>

-      <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetingsResponse">

-    <xs:sequence>

-      <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetingsComplex">

-    <xs:sequence>

-      <xs:element name="arg0" type="tns:foo" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="foo">

-    <xs:sequence>

-      <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="bar">

-    <xs:sequence>

-      <xs:element name="b" type="xs:boolean" minOccurs="0"/>

-      <xs:element name="s" type="xs:string" minOccurs="0"/>

-      <xs:element name="x" type="xs:int"/>

-      <xs:element name="y" type="xs:int" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-

-  <xs:complexType name="getGreetingsComplexResponse">

-    <xs:sequence>

-      <xs:element name="return" type="tns:foo" minOccurs="0"/>

-    </xs:sequence>

-  </xs:complexType>

-</xs:schema>

-

-

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 350ad6be96..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-              xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">

-   <deployable composite="itest:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
deleted file mode 100644
index 837bcb059e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<!--

- * 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.    

--->

-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->

-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">

-  <types>

-    <xsd:schema>

-      <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>

-    </xsd:schema>

-  </types>

-  <message name="getGreetings">

-    <part name="parameters" element="tns:getGreetings"/>

-  </message>

-  <message name="getGreetingsResponse">

-    <part name="parameters" element="tns:getGreetingsResponse"/>

-  </message>

-  <message name="getGreetingsComplex">

-    <part name="parameters" element="tns:getGreetingsComplex"/>

-  </message>

-  <message name="getGreetingsComplexResponse">

-    <part name="parameters" element="tns:getGreetingsComplexResponse"/>

-  </message>

-  <portType name="HelloWorldService">

-    <operation name="getGreetings">

-      <input message="tns:getGreetings"/>

-      <output message="tns:getGreetingsResponse"/>

-    </operation>

-    <operation name="getGreetingsComplex">

-      <input message="tns:getGreetingsComplex"/>

-      <output message="tns:getGreetingsComplexResponse"/>

-    </operation>

-  </portType>

-  <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">

-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

-    <operation name="getGreetings">

-      <soap:operation soapAction=""/>

-      <input>

-        <soap:body use="literal"/>

-      </input>

-      <output>

-        <soap:body use="literal"/>

-      </output>

-    </operation>

-    <operation name="getGreetingsComplex">

-      <soap:operation soapAction=""/>

-      <input>

-        <soap:body use="literal"/>

-      </input>

-      <output>

-        <soap:body use="literal"/>

-      </output>

-    </operation>

-  </binding>

-  <service name="HelloWorldServiceService">

-    <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">

-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>

-    </port>

-  </service>

-</definitions>

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
deleted file mode 100644
index 28dedef44c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,64 +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://docs.oasis-open.org/ns/opencsa/sca/200912"

-		   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-		   targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"

-           name="HelloWorld">

-               

-    <component name="HelloWorldService1">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld1Impl"/>

-	    <service name="HelloWorld">

-            <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>

-	    </service>

-        <reference name="helloWorld2">

-            <interface.wsdl interface="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.porttype(HelloWorldImpl)"/>

-            <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit-porttype"

-                        wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>

-            <!-- 

-                note that it's not necessary to have interface.wsdl here but I left it in after

-                I added the wsdlElement on the binding in order to configure the binding with the

-                wrapper element namespace that appears in the binding configuration

-             -->             

-        </reference>	

-    </component>

-    

-    <component name="HelloWorldService1a">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld1Impl"/>

-        <service name="HelloWorld">

-            <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit-porttype" 

-                        wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>

-        </service>

-        <reference name="helloWorld2">

-            <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit" 

-                        wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>            

-        </reference>    

-    </component>    

-    

-    <component name="HelloWorldService2">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld2Impl"/>

-        <service name="HelloWorld">

-            <binding.ws wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.port(HelloWorldImplService/HelloWorldImplPort)"/>

-        </service>

-        <reference name="helloWorldExternal">

-            <binding.ws uri="http://localhost:8086/External/HelloWorld"/>

-        </reference>    

-    </component>

-    

-</composite>