Official Tuscany 2.0.1 Release

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

19 files changed, 0 insertions, 917 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/pom.xml
deleted file mode 100644
index ac41e7dffa..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/pom.xml
+++ /dev/null
@@ -1,83 +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>2.0.1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-two-nodes</artifactId>
-    <name>Apache Tuscany SCA iTest Callback Two Nodes</name>
-
-    <dependencies>
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-base-runtime-pom</artifactId>
-            <type>pom</type>
-            <version>2.0.1</version>
-        </dependency>
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0.1</version>
-        </dependency>    
-
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0.1</version>
-        </dependency>    
-
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.19</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0.1</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.9</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                   <groupId>stax</groupId>
-                   <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>          
-        
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
-    </properties>    
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
deleted file mode 100644
index 291a72b9d6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ /dev/null
@@ -1,33 +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.test;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackBasicCallBack {
-
-    void callBackMessage(String aString);
-
-    void callBackIncrement(String aString);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
deleted file mode 100644
index 19f366c423..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ /dev/null
@@ -1,28 +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.test;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CallBackBasicClient {
-
-    void run();
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
deleted file mode 100644
index 198635dede..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ /dev/null
@@ -1,131 +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.test;
-
-import org.junit.Assert;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CallBackBasicClient.class)
-public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack {
-
-    @Reference
-    protected CallBackBasicService aCallBackService;
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-    private static Object monitor = new Object();
-
-    public void run() {
-
-        // This tests basic callback patterns.
-
-        callBackCount = 0; // reset static incase theres multiple runs
-        
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-    }
-
-    private void test1a() {
-        aCallBackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test1b() {
-        aCallBackService.noCallBack("No Reply Desired");
-        Assert.assertEquals("CallBackBasicITest - test1b", 1, 1);
-    }
-
-    private void test1c() {
-        aCallBackService.multiCallBack("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallBackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount());
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallBackCount() {
-        return callBackCount;
-    }
-
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public void callBackMessage(String aString) {
-        System.out.println("Entering callback callBackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallBackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
deleted file mode 100644
index 5396879e83..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ /dev/null
@@ -1,37 +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.test;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(CallBackBasicCallBack.class)
-/**
- * 
- */
-public interface CallBackBasicService {
-
-    void knockKnock(String aString);
-
-    void noCallBack(String aString);
-
-    void multiCallBack(String aString);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
deleted file mode 100644
index 07010f61e1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ /dev/null
@@ -1,56 +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.test;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CallBackBasicService.class)
-public class CallBackBasicServiceImpl implements CallBackBasicService {
-
-    @Callback
-    protected CallBackBasicCallBack callback;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackBasicServiceImpl response sent");
-
-    }
-
-    public void multiCallBack(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        callback.callBackIncrement("Who's There 1");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        callback.callBackIncrement("Who's There 2");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        callback.callBackIncrement("Who's There 3");
-        System.out.println("CallBackBasicServiceImpl response sent");
-
-    }
-
-    public void noCallBack(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        // System.out.println("CallBackBasicServiceImpl No response desired");
-
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite
deleted file mode 100644
index 113c650a2f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite
+++ /dev/null
@@ -1,29 +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"

-	targetNamespace="http://callback"

-	name="BSCACallBackReferenceTest">

- 	      

-    <component name="CallBackBasicClient">

-		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>

-		<reference name="aCallBackService" target="CallBackBasicService" />

-    </component> 

-  

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite
deleted file mode 100644
index 02ea7ce0ef..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite
+++ /dev/null
@@ -1,28 +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"

-	targetNamespace="http://callback"

-	name="BSCACallBackServiceTest">

- 	          

-    <component name="CallBackBasicService">

-      <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>

-    </component>  

-  

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite
deleted file mode 100644
index 1d377e1026..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite
+++ /dev/null
@@ -1,33 +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"

-	targetNamespace="http://callback"

-	name="BWSCallBackReferenceTest">

- 	      

-    <component name="CallBackBasicClient">

-		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>

-		<reference name="aCallBackService" target="CallBackBasicService">

-		  <callback>

-		     <binding.ws />

-		  </callback>

-		</reference>

-    </component> 

-  

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite
deleted file mode 100644
index d7a5941305..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite
+++ /dev/null
@@ -1,31 +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"

-	targetNamespace="http://callback"

-	name="BWSCallBackServiceTest">

- 	          

-    <component name="CallBackBasicService">

-      <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>

-      <service name="CallBackBasicService">

-         <binding.ws />

-      </service>

-    </component>  

-  

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite
deleted file mode 100644
index d6e4c3d7bf..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite
+++ /dev/null
@@ -1,33 +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"

-	targetNamespace="http://callback"

-	name="BWSURICallBackReferenceTest">

- 	      

-    <component name="CallBackBasicClient">

-		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>

-		<reference name="aCallBackService" target="CallBackBasicService">

-		  <callback>

-		     <binding.ws uri="http://localhost:8087/foo"/>

-		  </callback>

-		</reference>

-    </component> 

-  

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/CallBackReference.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
deleted file mode 100644
index 477ef7391f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
+++ /dev/null
@@ -1,33 +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"
-	targetNamespace="http://callback"
-	name="CallBackReferenceTest">
- 	      
-    <component name="CallBackBasicClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
-		<reference name="aCallBackService" target="CallBackBasicService">
-		  <callback>
-		     <binding.ws uri="http://localhost:8084/aCallBackService"/>
-		  </callback>
-		</reference>
-    </component> 
-  
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/CallBackService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/CallBackService.composite
deleted file mode 100644
index c3f0f5bc81..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/CallBackService.composite
+++ /dev/null
@@ -1,31 +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"
-	targetNamespace="http://callback"
-	name="CallBackServiceTest">
- 	          
-    <component name="CallBackBasicService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
-      <service name="CallBackBasicService">
-         <binding.ws uri="http://localhost:8085/CallBackBasicService"/>
-      </service>
-    </component>  
-  
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index efef032b8f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:t="http://callback">
-    <deployable composite="t:CallBackTwoNodesReferenceTest" />
-    <deployable composite="t:CallBackTwoNodesServiceTest" />              
-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java
deleted file mode 100644
index 3be076758d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java
+++ /dev/null
@@ -1,60 +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.test;

-

-import java.net.URI;

-

-import org.apache.tuscany.sca.TuscanyRuntime;

-import org.apache.tuscany.sca.http.jetty.JettyServer;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.oasisopen.sca.NoSuchServiceException;

-

-public class CallBackTwoNodesHzBSCAWSTestCase {

-

-    private org.apache.tuscany.sca.Node serviceNode;

-    private org.apache.tuscany.sca.Node clientNode;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", "http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.ws");

-

-        JettyServer.portDefault = 8089;

-        serviceNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "BSCACallBackService.composite", "target/classes");

-        

-        JettyServer.portDefault = 8088;

-        clientNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "BSCACallBackReference.composite", "target/classes");

-    }

-    

-    @Test

-    public void testCallBackTwoNodes() throws NoSuchServiceException {

-        CallBackBasicClient aCallBackClient = clientNode.getService(CallBackBasicClient.class, "CallBackBasicClient");

-        aCallBackClient.run();

-    }    

-

-    @After

-    public void tearDown() throws Exception {

-        if (clientNode != null) clientNode.stop();

-        if (serviceNode != null) serviceNode.stop();

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java
deleted file mode 100644
index 3b2435279c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java
+++ /dev/null
@@ -1,58 +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.test;

-

-import java.net.URI;

-

-import org.apache.tuscany.sca.TuscanyRuntime;

-import org.apache.tuscany.sca.http.jetty.JettyServer;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.oasisopen.sca.NoSuchServiceException;

-

-public class CallBackTwoNodesHzBWSTestCase {

-

-    private org.apache.tuscany.sca.Node serviceNode;

-    private org.apache.tuscany.sca.Node clientNode;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        JettyServer.portDefault = 8089;

-        serviceNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "BWSCallBackService.composite", "target/classes");

-        

-        JettyServer.portDefault = 8088;

-        clientNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "BWSCallBackReference.composite", "target/classes");

-    }

-    

-    @Test

-    public void testCallBackTwoNodes() throws NoSuchServiceException {

-        CallBackBasicClient aCallBackClient = clientNode.getService(CallBackBasicClient.class, "CallBackBasicClient");

-        aCallBackClient.run();

-    }    

-

-    @After

-    public void tearDown() throws Exception {

-        if (clientNode != null) clientNode.stop();

-        if (serviceNode != null) serviceNode.stop();

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.java
deleted file mode 100644
index 9ab50c197a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.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.test;

-

-import java.net.URI;

-

-import org.apache.tuscany.sca.TuscanyRuntime;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.oasisopen.sca.NoSuchServiceException;

-

-public class CallBackTwoNodesHzBWSURITestCase {

-

-    private org.apache.tuscany.sca.Node serviceNode;

-    private org.apache.tuscany.sca.Node clientNode;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        serviceNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "BWSCallBackService.composite", "target/classes");

-        clientNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "BWSURICallBackReference.composite", "target/classes");

-    }

-    

-    @Test

-    public void testCallBackTwoNodes() throws NoSuchServiceException {

-        CallBackBasicClient aCallBackClient = clientNode.getService(CallBackBasicClient.class, "CallBackBasicClient");

-        aCallBackClient.run();

-    }    

-

-    @After

-    public void tearDown() throws Exception {

-        if (clientNode != null) clientNode.stop();

-        if (serviceNode != null) serviceNode.stop();

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzTestCase.java
deleted file mode 100644
index c611bdd401..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzTestCase.java
+++ /dev/null
@@ -1,58 +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.test;

-

-import java.net.URI;

-

-import org.apache.tuscany.sca.TuscanyRuntime;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.oasisopen.sca.NoSuchServiceException;

-

-@Ignore

-public class CallBackTwoNodesHzTestCase {

-

-    private org.apache.tuscany.sca.Node serviceNode;

-    private org.apache.tuscany.sca.Node clientNode;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", "http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.ws");

-

-        serviceNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "CallBackService.composite", "target/classes");

-        clientNode = TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"), "CallBackReference.composite", "target/classes");

-    }

-    

-    @Test

-    public void testCallBackTwoNodes() throws NoSuchServiceException {

-        CallBackBasicClient aCallBackClient = clientNode.getService(CallBackBasicClient.class, "CallBackBasicClient");

-        aCallBackClient.run();

-    }    

-

-    @After

-    public void tearDown() throws Exception {

-        if (clientNode != null) clientNode.stop();

-        if (serviceNode != null) serviceNode.stop();

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
deleted file mode 100644
index 196ae6d4f9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
+++ /dev/null
@@ -1,77 +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.test;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class CallBackTwoNodesTestCase {
-
-    private static Node node1;
-    private static Node node2;
-    private CallBackBasicClient aCallBackClient;
-
-    @Before
-    public void setUp() throws Exception {
-        try {         
-            NodeFactory factory = NodeFactory.getInstance();
-            
-            NodeConfiguration configuration = factory.createNodeConfiguration();
-            configuration.setDomainURI("tuscany:default");
-            configuration.setURI("node1");
-            configuration.addContribution("c1", "./target/classes");
-            configuration.addDeploymentComposite("c1","CallBackService.composite");
-
-            //node1 = factory.createNode("CallBackService.composite", new Contribution("c1", "./target/classes"));
-            node1 = factory.createNode(configuration);
-            node1.start();
-            
-            configuration = factory.createNodeConfiguration();
-            configuration.setDomainURI("tuscany:default");
-            configuration.setURI("node2");
-            configuration.addContribution("c1", "./target/classes");
-            configuration.addDeploymentComposite("c1","CallBackReference.composite");
-            
-            //node2 = factory.newInstance().createNode("CallBackReference.composite", new Contribution("c1", "./target/classes"));
-            node2 = factory.createNode(configuration);
-            node2.start();
-    
-            aCallBackClient = node2.getService(CallBackBasicClient.class, "CallBackBasicClient");
-        } catch (Exception ex){
-            ex.printStackTrace();
-        }
-    }
-    
-    @Test
-    public void testCallBackTwoNodes() {
-        aCallBackClient.run();
-    }    
-
-    @After
-    public void tearDown() throws Exception {
-        node2.stop();
-        node1.stop();
-    }
-
-}