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

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835151 13f79535-47bb-0310-9956-ffa450edef68
---
 .../calculator/dosgi/META-INF/MANIFEST.MF          | 20 -------
 .../calculator/dosgi/META-INF/sca-contribution.xml | 24 --------
 .../dosgi/OSGI-INF/blueprint/calculator-module.xml | 43 -------------
 .../dosgi/OSGI-INF/calculator-component.xml        | 36 -----------
 .../calculator-service-descriptions.xml            | 67 ---------------------
 .../calculator/dosgi/bundle.componentType          | 54 -----------------
 .../calculator/dosgi/calculator.composite          | 53 ----------------
 .../dosgi/operations/META-INF/MANIFEST.MF          | 22 -------
 .../dosgi/operations/META-INF/sca-contribution.xml | 23 -------
 .../dosgi/operations/OSGI-INF/add-component.xml    | 25 --------
 .../OSGI-INF/blueprint/operations-module.xml       | 40 -------------
 .../dosgi/operations/OSGI-INF/divide-component.xml | 25 --------
 .../operations/OSGI-INF/multiply-component.xml     | 25 --------
 .../operations/OSGI-INF/subtract-component.xml     | 25 --------
 .../dosgi/operations/bundle.componentType          | 47 ---------------
 .../dosgi/operations/operations.composite          | 43 -------------
 .../calculator/dosgi/sca/META-INF/MANIFEST.MF      | 10 ----
 .../dosgi/sca/META-INF/sca-contribution.xml        | 24 --------
 .../dosgi/sca/OSGI-INF/sca/calculator.composite    | 70 ----------------------
 19 files changed, 676 deletions(-)
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
 delete mode 100644 tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite

(limited to 'tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator')

diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
deleted file mode 100644
index 4b7b7ec71b..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: calculator.dosgi;version="1.0.0",
- calculator.dosgi.operations;version="1.0.0"
-Bundle-Version: 1.0.0
-Bundle-Name: calculator.dosgi
-Bundle-Activator: calculator.dosgi.impl.CalculatorActivator
-Bundle-ManifestVersion: 2
-Import-Package: org.oasisopen.sca.annotation;version="2.0.0",
- org.osgi.framework,
- org.osgi.service.component;resolution:=optional,
- org.osgi.service.packageadmin,
- org.osgi.util.tracker
-Bundle-SymbolicName: calculator.dosgi
-Bundle-Vendor: The Apache Software Foundation
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Service-Component: OSGI-INF/calculator-component.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
deleted file mode 100644
index b14b3516f6..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/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" 
-              xmlns:c="http://calculator.dosgi">
-    <deployable composite="c:CalculatorComposite" />
-</contribution>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
deleted file mode 100644
index fd834e12ef..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
+++ /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.
--->
-<!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) -->
-<components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <component id="CalculatorComponent" class="calculator.dosgi.impl.CalculatorServiceImpl">
-        <property name="addService" ref="AddService" />
-        <property name="subtractService" ref="SubtractService" />
-        <property name="multiplyService" ref="MultiplyService" />
-        <property name="divideService" ref="DivideService" />
-    </component>
-
-    <!-- We can derive the SCA services for the implementation.osgi -->
-    <service id="CalculatorService" ref="CalculatorComponent" interface="calculator.dosgi.CalculatorService">
-    </service>
-
-    <!-- We can derive the SCA references for the implementation.osgi -->
-    <reference id="AddService" interface="calculator.dosgi.operations.AddService">
-    </reference>
-    <reference id="SubtractService" interface="calculator.dosgi.operations.SubtractService">
-    </reference>
-    <reference id="MultiplyService" interface="calculator.dosgi.operations.MultiplyService">
-    </reference>
-    <reference id="DivideService" interface="calculator.dosgi.operations.DivideService">
-    </reference>
-
-</components>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
deleted file mode 100644
index 5daaa59aae..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
+++ /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.    
--->
-<scr:component name="CalculatorComponent" 
-               xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.impl.CalculatorServiceDSImpl" />
-    <service>
-        <provide interface="calculator.dosgi.CalculatorService" />
-    </service>
-
-    <reference name="addService" interface="calculator.dosgi.operations.AddService" bind="setAddService" unbind="unsetAddService"
-        policy="dynamic" />
-    <reference name="subtractService" interface="calculator.dosgi.operations.SubtractService" bind="setSubtractService"
-        unbind="unsetSubtractService" policy="dynamic" />
-    <reference name="multiplyService" interface="calculator.dosgi.operations.MultiplyService" bind="setMultiplyService"
-        unbind="unsetMultiplyService" policy="dynamic" />
-    <reference name="divideService" interface="calculator.dosgi.operations.DivideService" bind="setDivideService"
-        unbind="unsetDivideService" policy="dynamic" />
-
-</scr:component>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
deleted file mode 100644
index da76d00024..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ /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.
--->
-<!-- A consumer-side service description file for RFC 119 -->
-<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-    <!-- Describe a remote OSGi service  -->
-    <service-description>
-        <provide interface="calculator.dosgi.operations.AddService" />
-        <property name="service.intents">sca:SOAP sca:HTTP</property>
-        <property name="osgi.remote.configuration.type">sca</property>
-        <property name="osgi.remote.configuration.sca.componentType">
-            OSGI-INF/sca/bundle.componentType
-             </property>
-        <property name="osgi.remote.configuration.sca.reference">
-            addService
-             </property>
-    </service-description>
-    <service-description>
-        <provide interface="calculator.dosgi.operations.SubtractService" />
-        <property name="service.intents">sca:SOAP sca:HTTP</property>
-        <property name="osgi.remote.configuration.type">sca</property>
-        <property name="osgi.remote.configuration.sca.componentType">
-            OSGI-INF/sca/bundle.componentType
-             </property>
-        <property name="osgi.remote.configuration.sca.reference">
-            subtractService
-             </property>
-    </service-description>
-    <service-description>
-        <provide interface="calculator.dosgi.operations.MultiplyService" />
-        <property name="service.intents">sca:SOAP sca:HTTP</property>
-        <property name="osgi.remote.configuration.type">sca</property>
-        <property name="osgi.remote.configuration.sca.componentType">
-            OSGI-INF/sca/bundle.componentType
-             </property>
-        <property name="osgi.remote.configuration.sca.reference">
-            multiplyService
-             </property>
-    </service-description>
-    <service-description>
-        <provide interface="calculator.dosgi.operations.DivideService" />
-        <property name="service.intents">sca:SOAP sca:HTTP</property>
-        <property name="osgi.remote.configuration.type">sca</property>
-        <property name="osgi.remote.configuration.sca.componentType">
-            OSGI-INF/sca/bundle.componentType
-             </property>
-        <property name="osgi.remote.configuration.sca.reference">
-            divideService
-             </property>
-    </service-description>
-</service-descriptions>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
deleted file mode 100644
index 7860094626..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
+++ /dev/null
@@ -1,54 +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.    
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
-    <!-- The service elment defines an SCA view of the OSGi service -->
-    <service name="Calculator">
-        <!-- The interface will be mapped into the OSGi service class -->
-        <interface.java interface="calculator.dosgi.CalculatorService"/>
-        <!-- The list of OSGi properties -->
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </service>
-    
-    <!-- The reference elment defines an SCA proxy to a remote OSGi service -->
-    <reference name="addService">
-        <interface.java interface="calculator.dosgi.operations.AddService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </reference>
-    <reference name="subtractService">
-        <interface.java interface="calculator.dosgi.operations.SubtractService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </reference>
-    <reference name="multiplyService">
-        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </reference>
-    <reference name="divideService">
-        <interface.java interface="calculator.dosgi.operations.DivideService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </reference>
-    
-</componentType>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
deleted file mode 100644
index 3c77086c45..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
+++ /dev/null
@@ -1,53 +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" 
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://calculator.dosgi" 
-    name="CalculatorComposite">
-
-    <component name="CalculatorComponent">
-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />
-        <reference name="addService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
-        </reference>
-        <reference name="subtractService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
-        </reference>
-        <reference name="multiplyService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
-        </reference>
-        <reference name="divideService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
-        </reference>
-        
-        <!-- 
-        <reference name="addService" target="OperationsComponent/AddService">
-        </reference>
-        <reference name="subtractService" target="OperationsComponent/SubtractService">
-        </reference>
-        <reference name="multiplyService" target="OperationsComponent/MultiplyService">
-        </reference>
-        <reference name="divideService" target="OperationsComponent/DivideService">
-        </reference>
-         -->
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
deleted file mode 100644
index 2345c785a7..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: calculator.dosgi.operations;version="1.0.0"
-Bundle-Version: 1.0.0
-Bundle-Name: calculator.dosgi.operations
-Bundle-Activator: calculator.dosgi.operations.impl.OperationsActivator
-Bundle-ManifestVersion: 2
-Import-Package: calculator.dosgi.operations;version="1.0.0",
- org.oasisopen.sca.annotation;version="2.0.0",
- org.osgi.framework,
- org.osgi.service.component;resolution:=optional,
- org.osgi.service.packageadmin
-Bundle-SymbolicName: calculator.dosgi.operations
-Bundle-Vendor: The Apache Software Foundation
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Service-Component: OSGI-INF/add-component.xml,
- OSGI-INF/subtract-component.xml,
- OSGI-INF/multiply-component.xml,
- OSGI-INF/divide-component.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
deleted file mode 100644
index 16a33f4f65..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/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:c="http://calculator.dosgi">
-    <deployable composite="c:OperationsComposite" />
-</contribution>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
deleted file mode 100644
index 99845257ff..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
+++ /dev/null
@@ -1,25 +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.    
--->
-<scr:component name="AddComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.impl.AddServiceImpl" />
-    <service>
-        <provide interface="calculator.dosgi.operations.AddService" />
-    </service>
-</scr:component>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
deleted file mode 100644
index f6b5f4690e..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
+++ /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.
--->
-<!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) -->
-<components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <component id="AddComponent" class="calculator.dosgi.operations.impl.AddServiceImpl">
-    </component>
-    <component id="SubtractComponent" class="calculator.dosgi.operations.impl.SubtractServiceImpl">
-    </component>
-    <component id="MultiplyComponent" class="calculator.dosgi.operations.impl.MultiplyServiceImpl">
-    </component>
-    <component id="DivideComponent" class="calculator.dosgi.operations.impl.DivideServiceImpl">
-    </component>
-
-    <!-- We can derive the SCA services for the implementation.osgi -->
-    <service id="AddService" ref="AddComponent" interface="calculator.dosgi.operations.AddService">
-    </service>
-    <service id="SubtractService" ref="SubtractComponent" interface="calculator.dosgi.operations.SubtractService">
-    </service>
-    <service id="MultiplyService" ref="MultiplyComponent" interface="calculator.dosgi.operations.MultiplyService">
-    </service>
-    <service id="DivideService" ref="DivideComponent" interface="calculator.dosgi.operations.DivideService">
-    </service>
-</components>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
deleted file mode 100644
index 322d4daf2f..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
+++ /dev/null
@@ -1,25 +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.    
--->
-<scr:component name="DivideComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.impl.DivideServiceImpl" />
-    <service>
-        <provide interface="calculator.dosgi.operations.DivideService" />
-    </service>
-</scr:component>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
deleted file mode 100644
index b9ca777bd8..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
+++ /dev/null
@@ -1,25 +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.    
--->
-<scr:component name="MultiplyComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.impl.MultiplyServiceImpl" />
-    <service>
-        <provide interface="calculator.dosgi.operations.MultiplyService" />
-    </service>
-</scr:component>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
deleted file mode 100644
index 1472f5a976..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
+++ /dev/null
@@ -1,25 +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.    
--->
-<scr:component name="SubtractComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.impl.SubtractServiceImpl" />
-    <service>
-        <provide interface="calculator.dosgi.operations.SubtractService" />
-    </service>
-</scr:component>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
deleted file mode 100644
index 6f6f4bdce6..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
+++ /dev/null
@@ -1,47 +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.    
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
-
-    
-    <!-- The service elment defines an SCA proxy to a remote OSGi service -->
-    <service name="AddService">
-        <interface.java interface="calculator.dosgi.operations.AddService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </service>
-    <service name="SubtractService">
-        <interface.java interface="calculator.dosgi.operations.SubtractService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </service>
-    <service name="MultiplyService">
-        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </service>
-    <service name="DivideService">
-        <interface.java interface="calculator.dosgi.operations.DivideService"/>
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
-    </service>
-    
-</componentType>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
deleted file mode 100644
index c9fb3818b8..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.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" 
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://calculator.dosgi" 
-    name="OperationsComposite">
-
-    <component name="OperationsComponent">
-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />
-        <service name="AddService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
-        </service>
-        <service name="SubtractService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
-        </service>
-        <service name="MultiplyService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
-        </service>
-        <service name="DivideService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
-        </service>
-        
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
deleted file mode 100644
index 0153fc6997..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Version: 1.0.0
-Bundle-Name: calculator.dosgi.sca
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: calculator.dosgi.sca
-Bundle-Vendor: The Apache Software Foundation
-Eclipse-LazyStart: false
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
deleted file mode 100644
index 8ba4b85247..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/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" 
-              xmlns:c="http://calculator.dosgi">
-    <deployable composite="c:CalculatorComposite" />
-</contribution>
diff --git a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite b/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
deleted file mode 100644
index ac7f0f470c..0000000000
--- a/tags/java/sca/2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
+++ /dev/null
@@ -1,70 +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" 
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://calculator.dosgi" 
-    name="CalculatorComposite">
-
-    <component name="CalculatorComponent">
-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />
-        <reference name="addService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
-        </reference>
-        <reference name="subtractService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
-        </reference>
-        <reference name="multiplyService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
-        </reference>
-        <reference name="divideService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
-        </reference>
-        
-        <!-- 
-        <reference name="addService" target="OperationsComponent/AddService">
-        </reference>
-        <reference name="subtractService" target="OperationsComponent/SubtractService">
-        </reference>
-        <reference name="multiplyService" target="OperationsComponent/MultiplyService">
-        </reference>
-        <reference name="divideService" target="OperationsComponent/DivideService">
-        </reference>
-         -->
-         
-    <component name="OperationsComponent">
-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />
-        <service name="AddService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
-        </service>
-        <service name="SubtractService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
-        </service>
-        <service name="MultiplyService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
-        </service>
-        <service name="DivideService">
-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
-        </service>
-        
-    </component>         
-    </component>
-
-</composite>
-- 
cgit v1.2.3