Moving 2.x branches

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

7 files changed, 0 insertions, 230 deletions

diff --git a/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml b/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
deleted file mode 100644
index 99845257ff..0000000000
--- a/branches/sca-java-2.0-M4/samples/dosgi-calculator-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/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
deleted file mode 100644
index f6b5f4690e..0000000000
--- a/branches/sca-java-2.0-M4/samples/dosgi-calculator-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/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
deleted file mode 100644
index 322d4daf2f..0000000000
--- a/branches/sca-java-2.0-M4/samples/dosgi-calculator-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/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
deleted file mode 100644
index b9ca777bd8..0000000000
--- a/branches/sca-java-2.0-M4/samples/dosgi-calculator-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/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
deleted file mode 100644
index 72e2c339f1..0000000000
--- a/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/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/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
deleted file mode 100644
index 253f7d0df1..0000000000
--- a/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.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/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
deleted file mode 100644
index 1472f5a976..0000000000
--- a/branches/sca-java-2.0-M4/samples/dosgi-calculator-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>