18 files changed, 0 insertions, 854 deletions
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Customer1.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="CustomerService">
-        <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/java/sca/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Customer2.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="CustomerService">
-        <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/java/sca/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="RetailerService1">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService2">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService3">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="RetailerService1">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService2">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService3">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ /dev/null
@@ -1,30 +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="ShipperService1">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <service name="ShipperService2">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ /dev/null
@@ -1,30 +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="ShipperService1">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <service name="ShipperService2">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Warehouse1.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/java/sca/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/Warehouse2.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/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Customer1.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="CustomerService">
-        <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/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Customer2.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="CustomerService">
-        <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/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="RetailerService1">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService2">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService3">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="RetailerService1">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService2">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <service name="RetailerService3">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ /dev/null
@@ -1,30 +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="ShipperService1">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <service name="ShipperService2">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ /dev/null
@@ -1,30 +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="ShipperService1">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <service name="ShipperService2">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-</componentType>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.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/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.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/java/sca/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/java/sca/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
deleted file mode 100644
index 877d0de1c9..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ /dev/null
@@ -1,184 +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="CustomerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.version.supplychain.customer.Customer"
-                bundleVersion="1.0.0" >
-                
-            <properties service="CustomerService">
-                <property name="component.name">CustomerComponent1</property>
-            </properties>
-            
-            <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/RetailerService1"/>
-        
-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />
-        
-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />
-    </component>
-    
-    
-    
-    <component name="CustomerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.version.supplychain.customer.Customer"
-                bundleVersion="2.0.0" >
-                
-            <properties service="CustomerService">
-                <property name="component.name">CustomerComponent2</property>
-            </properties>
-            
-            <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="RetailerComponent2/RetailerService1"/>
-        
-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />
-        
-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />
-    </component>
-
-    <component name="RetailerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"
-                bundleVersion="1.0.0" >
-            <properties service="RetailerService1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties service="RetailerService2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties service="RetailerService3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.service.name">WarehouseComponent1/Warehouse</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="warehouse" target="WarehouseComponent1"/>    
-    </component>
-    
-    <component name="RetailerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"
-                bundleVersion="2.0.0" >
-            <properties service="RetailerService1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties service="RetailerService2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties service="RetailerService3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-             <properties reference="warehouse">
-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="warehouse" target="WarehouseComponent2"/>
-    </component>
-
-   
-    <component name="WarehouseComponent1">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />
-    </component>
-    
-    <component name="WarehouseComponent2">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />
-    </component>
-
-    <component name="ShipperComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"
-                bundleVersion="1.0.0">
-            
-            <properties service="ShipperService1">
-                <property name="shipperName">RoyalMail</property>
-                <property name="component.name">ShipperComponent1.ShipperService1</property>
-            </properties>
-            <properties service="ShipperService2">
-                <property name="shipperName">ParcelForce</property>
-                <property name="component.name">ShipperComponent1.ShipperService2</property>
-            </properties>
-            <properties reference="customer">
-                <property name="component.name">CustomerComponent1</property>
-            </properties>
-         </implementation.osgi>
-         
-        <reference name="customer" target="CustomerComponent1" />
-    </component>
-    
-     <component name="ShipperComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"
-                bundleVersion="2.0.0">
-            
-            <properties service="ShipperService1">
-                <property name="shipperName">RoyalMail</property>
-                <property name="component.name">ShipperComponent2.ShipperService1</property>
-            </properties>
-            <properties service="ShipperService2">
-                <property name="shipperName">ParcelForce</property>
-                <property name="component.name">ShipperComponent2.ShipperService2</property>
-            </properties>
-            <properties reference="customer">
-                <property name="component.name">CustomerComponent2</property>
-            </properties>
-         </implementation.osgi>
-         
-        <reference name="customer" target="CustomerComponent2" />
-        
-    </component>
-    
-    
-    
-</composite>
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/version/version-test.composite b/java/sca/itest/osgi-implementation/src/main/resources/version/version-test.composite
deleted file mode 100644
index bbb397ee70..0000000000
--- a/java/sca/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ /dev/null
@@ -1,170 +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="CustomerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="version.supplychain.customer.Customer"
-                bundleVersion="1.0.0" >
-                
-            <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/RetailerService1"/>
-        
-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />
-        
-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />
-    </component>
-    
-    
-    
-    <component name="CustomerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="version.supplychain.customer.Customer"
-                bundleVersion="2.0.0" >
-                
-            <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="RetailerComponent2/RetailerService1"/>
-        
-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />
-        
-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />
-    </component>
-
-    <component name="RetailerComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="version.supplychain.retailer.Retailer"
-                bundleVersion="1.0.0" >
-            <properties service="RetailerService1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties service="RetailerService2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties service="RetailerService3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-            
-        </implementation.osgi>
-        
-        <reference name="warehouse" target="WarehouseComponent1"/>    
-    </component>
-    
-    <component name="RetailerComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="version.supplychain.retailer.Retailer"
-                bundleVersion="2.0.0"  >
-            <properties service="RetailerService1">
-                <property name="retailerName">amazon.com</property>
-            </properties>
-            <properties service="RetailerService2">
-                <property name="retailerName">play.com</property>
-            </properties>
-            <properties service="RetailerService3">
-                <property name="retailerName">ebay.com</property>
-            </properties>
-            <properties reference="warehouse">
-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>
-            </properties>
-        </implementation.osgi>
-        
-        <reference name="warehouse" target="WarehouseComponent2"/>
-    </component>
-
-   
-    <component name="WarehouseComponent1">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />
-    </component>
-    
-    <component name="WarehouseComponent2">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        
-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />
-    </component>
-
-    <component name="ShipperComponent1">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="version.supplychain.shipper.Shipper"
-                bundleVersion="1.0.0" >
-            
-            <properties service="ShipperService1">
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-            <properties service="ShipperService2">
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-            <properties reference="customer">
-                <property name="component.name">CustomerComponent1</property>
-            </properties>
-         </implementation.osgi>
-         
-        <reference name="customer" target="CustomerComponent1" />
-    </component>
-    
-     <component name="ShipperComponent2">
-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-                bundleSymbolicName="version.supplychain.shipper.Shipper"
-                bundleVersion="2.0.0">
-            
-            <properties service="ShipperService1">
-                <property name="shipperName">RoyalMail</property>
-            </properties>
-            <properties service="ShipperService2">
-                <property name="shipperName">ParcelForce</property>
-            </properties>
-            <properties reference="customer">
-                <property name="component.name">CustomerComponent2</property>
-            </properties>
-         </implementation.osgi>
-         
-        <reference name="customer" target="CustomerComponent2" />
-        
-    </component>
-    
-    
-    
-</composite>