From 5e78e2a84f0cfcf141f48e58404e8c21c061b079 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:23:10 +0000
Subject: Moving 2.x tags

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835154 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/asynchReference/HelloWorld.composite | 36 ----------
 .../asynchReference/META-INF/sca-contribution.xml  | 23 ------
 .../resources/asynchService/HelloWorld.composite   | 38 ----------
 .../asynchService/META-INF/sca-contribution.xml    | 23 ------
 .../callbackReference/HelloWorld.composite         | 36 ----------
 .../META-INF/sca-contribution.xml                  | 24 -------
 .../resources/callbackService/HelloWorld.composite | 43 -----------
 .../callbackService/META-INF/sca-contribution.xml  | 24 -------
 .../promotionReference/HelloWorld.composite        | 33 ---------
 .../HelloWorldComponent.composite                  | 37 ----------
 .../META-INF/sca-contribution.xml                  | 23 ------
 .../promotionService/HelloWorld.composite          | 35 ---------
 .../promotionService/HelloWorldComponent.composite | 37 ----------
 .../promotionService/META-INF/sca-contribution.xml | 23 ------
 .../resources/simpleReference/HelloWorld.composite | 67 -----------------
 .../simpleReference/META-INF/sca-contribution.xml  | 23 ------
 .../resources/simpleService/HelloWorld.composite   | 84 ----------------------
 .../simpleService/META-INF/sca-contribution.xml    | 23 ------
 18 files changed, 632 deletions(-)
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
 delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml

(limited to 'tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources')

diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
deleted file mode 100644
index 385c456ddf..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-   
-    <!-- callback remote wire -->   
-    <component name="AHelloWorldClientCallbackRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
-            <binding.sca/>
-            <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
-            </callback>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
deleted file mode 100644
index 00afc5b7f4..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/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/200903"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
deleted file mode 100644
index bab26454ba..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-            
-     
-    <!-- callback remote wire --> 
-    <component name="BHelloWorldServiceCallbackRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" />
-        <service name="HelloWorldServiceCallbackOnewayRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
-            <callback>
-                <binding.sca/>
-            </callback>            
-        </service>
-    </component>
-    
-
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
deleted file mode 100644
index 00afc5b7f4..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/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/200903"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
deleted file mode 100644
index f02c77a01e..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-   
-    <!-- callback remote wire -->   
-    <component name="AHelloWorldClientCallbackRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
-            <binding.sca/>
-            <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
-            </callback>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
deleted file mode 100644
index d7685c6143..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/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/200903"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
deleted file mode 100644
index e0fae3c988..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-            
-     
-    <!-- callback remote wire --> 
-    <component name="BHelloWorldServiceCallbackRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" />
-        <service name="HelloWorldServiceCallbackRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
-            <callback>
-                <binding.sca/>
-            </callback>            
-        </service>
-    </component>
-    
-    <!-- callback local wire -->   
-    <component name="BHelloWorldClientCallbackLocal">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
deleted file mode 100644
index d7685c6143..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/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/200903"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
deleted file mode 100644
index dece7b0d63..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-
-    
-    <!-- composite hierarchy -->
-    <component name="AHelloWorldClientRemotePromotion">
-		<implementation.composite name="sample:HelloWorldComponent" />
-		<reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/>
-    </component>
-    
-
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
deleted file mode 100644
index 4579442a99..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorldComponent">
-
-    <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent">
-        <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient"/>
-    </service>
-    
-    <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService">
-        <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"/>
-    </reference>
-    
-    <component name="AHelloWorldClientRemoteComponent">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl"/>
-    </component>
-   
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
deleted file mode 100644
index 00afc5b7f4..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/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/200903"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
deleted file mode 100644
index 00ac746111..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
+++ /dev/null
@@ -1,35 +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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-           
-
-    <!-- composite hierarchy -->
-    <component name="BHelloWorldServiceRemotePromotion">
-		<implementation.composite name="sample:HelloWorldComponent" />
-		<service name="BHelloWorldServiceRemoteService">
-		    <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>
-		</service>
-    </component>   
-
-    
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
deleted file mode 100644
index 944dd0b625..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorldComponent">
-
-    <service name="BHelloWorldServiceRemoteService" 
-               promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/>
-    
-    <component name="BHelloWorldServiceRemoteComponent">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"/>
-    </component>
-    
-    <component name="BHelloWorldServiceLocalAndRemoteNested">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-    </component>
-    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
deleted file mode 100644
index 00afc5b7f4..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/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/200903"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
deleted file mode 100644
index 87945b6692..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
+++ /dev/null
@@ -1,67 +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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-
-	
-    <!-- local only wire -->
-    <component name="AHelloWorldClientLocal">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl"/>
-        <reference name="helloWorldService" target="AHelloWorldServiceLocal" />
-    </component>
-    
-    <component name="AHelloWorldServiceLocal">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceLocalImpl" />
-    </component> 
-    
-    <!-- unresolved remote wire -->   
-    <component name="AHelloWorldClientRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceRemote" />
-    </component>
-    
-    <!-- local and remote wires -->    
-    <component name="AHelloWorldClientLocalAndRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/>
-    </component>  
-    
-    <!-- multiple services -->
-    <component name="AHelloWorldClientMultipleServices">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
-    </component>  
-    
-    <component name="AHelloWorldClientMultipleServices2">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemote2Impl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>       
-    </component> 
-    
-    <!-- multiple bindings -->   
-    <component name="AHelloWorldClientMultipleBindings">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding">
-            <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />        
-        </reference>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
deleted file mode 100644
index 00afc5b7f4..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/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/200903"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
deleted file mode 100644
index f94b6d3ba0..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
+++ /dev/null
@@ -1,84 +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/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-           
-
-    <!-- local only wire -->
-     
-     
-    <!-- unresolved remote wire --> 
-    <component name="BHelloWorldServiceRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/>
-        </service>
-    </component>
-    
-    <!-- local and remote wires -->
-    <component name="BHelloWorldServiceLocalAndRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>
-        </service>
-    </component>
-    
-    <component name="BHelloWorldClientLocalAndRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" />
-    </component>
-    
-    <!-- multiple services -->
-    <component name="BHelloWorldServiceMultipleServices">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceMultipleServicesImpl" />
-        <service name="HelloWorldServiceLocal">
-        </service>        
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
-        </service>        
-        <service name="HelloWorldServiceRemote2">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
-        </service>
-    </component>
-    
-    <component name="BHelloWorldClientMultipleServices">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" />
-    </component>
-    
-    <!-- multiple bindings --> 
-    <component name="BHelloWorldMultipleBindings">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />
-            <binding.ws name="wsBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/>
-            <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
-        </service>
-    </component>
-     
-    
-    <!-- Dynamic interfaces -->
-    <!--component name="BHelloWorldServiceScript">
-        <implementation.script script="calculator/AddServiceImpl.js"/>
-    </component--> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml
deleted file mode 100644
index 00afc5b7f4..0000000000
--- a/tags/java/sca/2.0-M4-RC2/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/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/200903"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file
-- 
cgit v1.2.3