From 5e520b1b65c79cd828057cb628b9367acb266880 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:05:59 +0000
Subject: Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835117 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/wiring/Customer.componentType   |  34 -----
 .../main/resources/wiring/Retailer.componentType   |  29 ----
 .../main/resources/wiring/Shipper.componentType    |  29 ----
 .../main/resources/wiring/Warehouse.componentType  |  28 ----
 .../resources/wiring/ds/Customer.componentType     |  34 -----
 .../resources/wiring/ds/Retailer.componentType     |  29 ----
 .../main/resources/wiring/ds/Shipper.componentType |  29 ----
 .../resources/wiring/ds/Warehouse.componentType    |  28 ----
 .../resources/wiring/ds/wiring-ds-test1.composite  | 136 -------------------
 .../resources/wiring/ds/wiring-ds-test2.composite  | 151 ---------------------
 .../main/resources/wiring/wiring-test1.composite   | 127 -----------------
 .../main/resources/wiring/wiring-test2.composite   | 151 ---------------------
 12 files changed, 805 deletions(-)
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
 delete mode 100644 branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite

(limited to 'branches/sca-android/itest/osgi-implementation/src/main/resources/wiring')

diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="Customer">
-        <interface.java interface="supplychain.customer.Customer"/>
-    </service>
-    <reference name="retailer1">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-    <reference name="retailer2">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-    <reference name="retailer3">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-      
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="Retailer">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-    <property name="retailerName" type="xsd:string" >default</property> 
-      
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="Shipper">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-    <property name="shipperName" type="xsd:string" >default</property> 
-      
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="Warehouse">
-        <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    
-    <reference name="shipper">
-            <interface.java interface="supplychain.shipper.Shipper"/>
-    </reference>
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="Customer">
-        <interface.java interface="supplychain.customer.Customer"/>
-    </service>
-    <reference name="retailer1">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-    <reference name="retailer2">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-    <reference name="retailer3">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-      
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="Retailer">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-    <property name="retailerName" type="xsd:string" >default</property> 
-      
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="Shipper">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-    <property name="shipperName" type="xsd:string" >default</property> 
-      
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="Warehouse">
-        <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    
-    <reference name="shipper">
-            <interface.java interface="supplychain.shipper.Shipper"/>
-    </reference>
-</componentType>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
deleted file mode 100644
index 617200d8dd..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ /dev/null
@@ -1,136 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://supplychain"
-    xmlns:sp="http://supplychain"
-    name="supplychain">
-
-    <component name="CustomerComponent">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >
-            
-            <properties reference="retailer1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties reference="retailer2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties reference="retailer3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-        </implementation.osgi>
-            
-        <reference name="retailer1" target="RetailerComponent1/Retailer" />
-        
-        <reference name="retailer2" target="RetailerComponent2/Retailer" />
-        
-        <reference name="retailer3" target="RetailerComponent3" />
-    </component>
-
-    <component name="RetailerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
-            <properties service="Retailer">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        <service name="Retailer"/>
-        
-        <reference name="warehouse" target="WarehouseComponent1"/>        
-        <property name="retailerName" type="xsd:string" >amazon.com</property> 
-    </component>
-    
-    <component name="RetailerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
-            <properties service="Retailer">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="warehouse" target="WarehouseComponent1"/>
-        <property name="retailerName" type="xsd:string" >play.com</property> 
-    </component>
-    
-    
-    <component name="RetailerComponent3">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
-            <properties service="Retailer">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent2</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="warehouse" target="WarehouseComponent2"/>
-        <property name="retailerName" type="xsd:string" >play.com</property> 
-    </component>
-
-
-    <component name="WarehouseComponent1">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent2"  />
-    </component>
-    
-    <component name="WarehouseComponent2">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent1"  />
-    </component>
-
-    <component name="ShipperComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper" >
-            
-            <properties service="Shipper">
-                <property name="component.name">ShipperComponent1</property>
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
-    </component>
-    
-     <component name="ShipperComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper"  >
-            
-            <properties service="Shipper">
-                <property name="component.name">ShipperComponent2</property>
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
-        
-    </component>
-    
-    
-</composite>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
deleted file mode 100644
index 213cde2c1d..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ /dev/null
@@ -1,151 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://supplychain"
-    xmlns:sp="http://supplychain"
-    name="supplychain">
-
-    <component name="CustomerComponent">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >
-            
-            <properties reference="retailer1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties reference="retailer2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties reference="retailer3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-        </implementation.osgi>
-            
-        <reference name="retailer1" target="RetailerComponent1/Retailer" />
-        
-        <reference name="retailer2" target="RetailerComponent2/Retailer" />
-        
-        <reference name="retailer3" target="RetailerComponent3/Retailer" />
-    </component>
-
-    <component name="RetailerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
-            <properties service="Retailer">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        <service name="Retailer"/>
-        
-        <reference name="warehouse" target="WarehouseComponent1"/>        
-        <property name="retailerName" type="xsd:string" >amazon.com</property> 
-    </component>
-    
-    <component name="RetailerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
-            
-            <properties service="Retailer">
-                <property name="retailerName">play.com</property>
-            </properties>
-            
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="warehouse" target="WarehouseComponent1"/>
-        <property name="retailerName" type="xsd:string" >play.com</property> 
-    </component>
-    
-    <component name="RetailerComponent3">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >
-            
-            <properties service="Retailer">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="warehouse" target="WarehouseComponent1"/>
-        <property name="retailerName" type="xsd:string" >ebay.com</property> 
-    </component>
-    
-    <component name="WarehouseComponent1">
-        
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >
-                
-            <properties reference="shipper">
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="shipper" target="ShipperComponent2"  />
-    </component>
-
-
-    <component name="WarehouseComponent2">
-        
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >
-                
-            <properties reference="shipper">
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="shipper" target="ShipperComponent1"  />
-    </component>
-    
-   
-    <component name="ShipperComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">
-            
-            <properties service="Shipper">
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
-    </component>
-    
-     <component name="ShipperComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">
-            
-            <properties service="Shipper">
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
-        
-    </component>
-    
-    
-</composite>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
deleted file mode 100644
index 0dca0da75e..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ /dev/null
@@ -1,127 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://supplychain"
-    xmlns:sp="http://supplychain"
-    name="supplychain">
-
-    <component name="CustomerComponent">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.customer.Customer"
-                classes="supplychain.customer.OSGiCustomerImpl" >
-            
-            <properties reference="retailer1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties reference="retailer2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties reference="retailer3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-        </implementation.osgi>
-            
-        <reference name="retailer1" target="RetailerComponent1/Retailer" />
-        
-        <reference name="retailer2" target="RetailerComponent2/Retailer" />
-        
-        <reference name="retailer3" target="RetailerComponent3/Retailer" />
-    </component>
-
-    <component name="RetailerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
-            <properties service="Retailer">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="warehouse" target="WarehouseComponent1"/>        
-        <property name="retailerName" type="xsd:string" >amazon.com</property> 
-    </component>
-    
-    <component name="RetailerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
-            
-            <properties service="Retailer">
-                <property name="retailerName">play.com</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="warehouse" target="WarehouseComponent1"/>
-        <property name="retailerName" type="xsd:string" >play.com</property> 
-    </component>
-    
-    <component name="RetailerComponent3">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
-            
-            <properties service="Retailer">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="warehouse" target="WarehouseComponent2"/>
-        <property name="retailerName" type="xsd:string" >ebay.com</property> 
-    </component>
-
-
-    <component name="WarehouseComponent1">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent2"  />
-    </component>
-    
-    <component name="WarehouseComponent2">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent1"  />
-    </component>
-    
-   
-    <component name="ShipperComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
-            
-            <properties service="Shipper">
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
-    </component>
-    
-     <component name="ShipperComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
-            
-            <properties service="Shipper">
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
-        
-    </component>
-    
-    
-</composite>
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
deleted file mode 100644
index 953045fefa..0000000000
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ /dev/null
@@ -1,151 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://supplychain"
-    xmlns:sp="http://supplychain"
-    name="supplychain">
-
-    <component name="CustomerComponent">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.customer.Customer" >
-            
-            <properties reference="retailer1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties reference="retailer2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties reference="retailer3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-        </implementation.osgi>
-            
-        <reference name="retailer1" target="RetailerComponent1/Retailer" />
-        
-        <reference name="retailer2" target="RetailerComponent2/Retailer" />
-        
-        <reference name="retailer3" target="RetailerComponent3/Retailer" />
-    </component>
-
-    <component name="RetailerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
-            <properties service="Retailer">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        <service name="Retailer"/>
-        
-        <reference name="warehouse" target="WarehouseComponent1"/>        
-        <property name="retailerName" type="xsd:string" >amazon.com</property> 
-    </component>
-    
-    <component name="RetailerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
-            
-            <properties service="Retailer">
-                <property name="retailerName">play.com</property>
-            </properties>
-            
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="warehouse" target="WarehouseComponent1"/>
-        <property name="retailerName" type="xsd:string" >play.com</property> 
-    </component>
-    
-    <component name="RetailerComponent3">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >
-            
-            <properties service="Retailer">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.name">WarehouseComponent1</property>
-            </properties>
-        </implementation.osgi>
-        <reference name="warehouse" target="WarehouseComponent1"/>
-        <property name="retailerName" type="xsd:string" >ebay.com</property> 
-    </component>
-    
-    <component name="WarehouseComponent1">
-        
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >
-                
-            <properties reference="shipper">
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="shipper" target="ShipperComponent2"  />
-    </component>
-
-
-    <component name="WarehouseComponent2">
-        
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >
-                
-            <properties reference="shipper">
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="shipper" target="ShipperComponent1"  />
-    </component>
-    
-   
-    <component name="ShipperComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
-            
-            <properties service="Shipper">
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 
-    </component>
-    
-     <component name="ShipperComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">
-            
-            <properties service="Shipper">
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="customer" target="CustomerComponent" />
-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 
-        
-    </component>
-    
-    
-</composite>
-- 
cgit v1.2.3