Official Tuscany 2.0.1 Release

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

11 files changed, 0 insertions, 519 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
deleted file mode 100644
index 6bc67db5fc..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/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/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
deleted file mode 100644
index ba117c8cfd..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ /dev/null
@@ -1,31 +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.annotation.Remotable;

-

-@Remotable

-public interface HelloWorldCallback {

-    

-    String getGreetingsCallback(String s);

-    Foo getGreetingsComplexCallback(Foo foo);

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
deleted file mode 100644
index 3521fa5624..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ /dev/null
@@ -1,34 +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.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-@Callback(HelloWorldCallback.class)

-public interface HelloWorldCallbackService {

-    

-    String getGreetings(String s);

-    String getGreetingsException(String s) throws ServiceRuntimeException;

-    Foo getGreetingsComplex(Foo foo);

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
deleted file mode 100644
index 057b884bc9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ /dev/null
@@ -1,53 +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.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(HelloWorldCallbackService.class)

-public class HelloWorldCallbackServiceImpl implements HelloWorldCallbackService {

-

-    @Callback

-    protected HelloWorldCallback helloWorldCallback;

-    

-    public String getGreetings(String s) {

-        System.out.println("Entering SCA HelloWorldCallbackService.getGreetings: " + s);

-        String response = helloWorldCallback.getGreetingsCallback(s);

-        System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);

-        return response;

-    }

-

-    public String getGreetingsException(String s) throws ServiceRuntimeException {

-        System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsException: " + s);

-        String response = helloWorldCallback.getGreetingsCallback(s);

-        System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);

-        throw new ServiceRuntimeException(response);

-    }       

-

-    public Foo getGreetingsComplex(Foo foo){

-        System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());

-        Foo response = helloWorldCallback.getGreetingsComplexCallback(foo);

-        System.out.println("Leaving SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());

-        return response;

-    } 

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
deleted file mode 100644
index 1ff58a29b0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ /dev/null
@@ -1,84 +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 HelloWorldImpl implements HelloWorld, HelloWorldCallback {

-

-    @Reference

-    public HelloWorldService helloWorldExternal;

-    

-    @Reference

-    public HelloWorldCallbackService helloWorldCallbackService;

-    

-    // HelloWorld operations

-    

-    public String getGreetings(String s) {

-        System.out.println("Entering SCA HelloWorld.getGreetings: " + s);

-        String response = helloWorldCallbackService.getGreetings(s);

-        System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);

-        return response;

-    }

-    

-    public String getGreetingsException(String s) throws ServiceRuntimeException {

-        System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);

-        String response = helloWorldCallbackService.getGreetings(s);

-        System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);

-        throw new ServiceRuntimeException(response);

-    }    

-

-    public Foo getGreetingsComplex(Foo foo){

-        System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());

-        Foo response = helloWorldCallbackService.getGreetingsComplex(foo);

-        System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());

-        return response;

-    } 

-    

-    // HelloWorldCallback operations

-    

-    public String getGreetingsCallback(String s) {

-        System.out.println("Entering SCA HelloWorld.getGreetingsCallback: " + s);

-        String response = helloWorldExternal.getGreetings(s);

-        System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);

-        return response;

-    }

-    

-    public String getGreetingsExceptionCallback(String s) throws ServiceRuntimeException {

-        System.out.println("Entering SCA HelloWorld.getGreetingsExceptionCallback: " + s);

-        String response = helloWorldExternal.getGreetings(s);

-        System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);

-        throw new ServiceRuntimeException(response);

-    }    

-

-    public Foo getGreetingsComplexCallback(Foo foo){

-        System.out.println("Entering SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());

-        Foo response = helloWorldExternal.getGreetingsComplex(foo);

-        System.out.println("Leaving SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());

-        return response;

-    } 

-    

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd
deleted file mode 100644
index acdfcaaaa5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/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/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 350ad6be96..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/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/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl
deleted file mode 100644
index 837bcb059e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/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/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
deleted file mode 100644
index 0d66bb105f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,43 +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"

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

-           name="HelloWorld">

-               

-    <component name="HelloWorldService">

-		<implementation.composite name="tns:HelloWorldService"/>

-	    <service name="HelloWorld">

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

-	    </service>	    

-        <reference name="HelloWorldCallbackService">

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

-        </reference>

-    </component>

-    

-    <component name="HelloWorldCallbackService">

-        <implementation.composite name="tns:HelloWorldCallbackService"/>

-        <service name="HelloWorldCallbackService">

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

-        </service>   

-    </component>    

-    

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
deleted file mode 100644
index e522c6c151..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
+++ /dev/null
@@ -1,34 +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="HelloWorldCallbackService">

-

-    <service name="HelloWorldCallbackService" promote="HelloWorldCallbackService/HelloWorldCallbackService"/>

-    

-    <component name="HelloWorldCallbackService">

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

-        <service name="HelloWorldCallbackService">

-            <!-- configured at the top level -->

-        </service>   

-    </component>    

-    

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
deleted file mode 100644
index aea84ad56e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
+++ /dev/null
@@ -1,40 +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="HelloWorldService">

-               

-    <service name="HelloWorld" promote="HelloWorldService/HelloWorld"/>

-    <reference name="HelloWorldCallbackService" multiplicity="1..1" promote="HelloWorldService/helloWorldCallbackService"/>

-                   

-    <component name="HelloWorldService">

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

-	    <service name="HelloWorld">

-	        <!-- configured at the top level -->

-	    </service>

-        <reference name="helloWorldExternal">

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

-        </reference>  	    

-        <reference name="helloWorldCallbackService">

-            <!-- configured at the top level -->        

-        </reference>

-    </component>   

-</composite>