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

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835126 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/Customer2V2.componentType   | 28 ---------
 .../src/main/resources/CustomerV2.componentType    | 28 ---------
 .../META-INF/customer-sca-contribution.xml         | 32 -----------
 .../META-INF/retailer-sca-contribution.xml         | 29 ----------
 .../META-INF/shipper-sca-contribution.xml          | 27 ---------
 .../META-INF/supplychain-sca-contribution.xml      | 24 --------
 .../META-INF/warehouse-sca-contribution.xml        | 28 ---------
 .../src/main/resources/RetailerV2.componentType    | 28 ---------
 .../src/main/resources/ShipperV2.componentType     | 28 ---------
 .../src/main/resources/WarehouseV2.componentType   | 28 ---------
 .../src/main/resources/osgi/Customer.mf            | 13 -----
 .../src/main/resources/osgi/Customer2.mf           | 13 -----
 .../src/main/resources/osgi/Retailer.mf            | 10 ----
 .../src/main/resources/osgi/RetailerJar.mf         |  1 -
 .../src/main/resources/osgi/Shipper.mf             | 10 ----
 .../src/main/resources/osgi/SupplyChain.mf         | 13 -----
 .../src/main/resources/osgi/Warehouse.mf           | 10 ----
 .../src/main/resources/supplychain.composite       | 67 ----------------------
 18 files changed, 417 deletions(-)
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
 delete mode 100644 branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite

(limited to 'branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources')

diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.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="supplychain.customer.Customer">
-        <interface.java interface="supplychain.customer.Customer"/>
-    </service>
-    <reference name="retailer">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-    
-</componentType>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.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="supplychain.customer.Customer">
-        <interface.java interface="supplychain.customer.Customer"/>
-    </service>
-    <reference name="retailer">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-    
-</componentType>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 4779eff514..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-   
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   
-   <import namespace="RetailerV2" location="RetailerV2" />
-   <import namespace="ShipperV2" location="ShipperV2" />
-   <import namespace="WarehouseV2" location="WarehouseV2" />
-   <export namespace="CustomerV2" />
-</contribution>
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d505834f15..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="RetailerV2" />
-   
-   
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   
-</contribution>
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 6bcf6cef0a..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="ShipperV2" />
-   
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-</contribution>
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index e23e1a2ecd..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="WarehouseV2" />
-   
-   
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.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="supplychain.retailer.Retailer">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.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="supplychain.shipper.Shipper">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.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="supplychain.warehouse.Warehouse">
-        <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    
-    <reference name="shipper">
-            <interface.java interface="supplychain.shipper.Shipper"/>
-    </reference>
-</componentType>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 9db2ab8f57..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: supplychain.customer.Customer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
-                supplychain.retailer;version="[2.0.0,3.0.0)",
-                supplychain.shipper;version="[2.0.0,3.0.0)",
-                supplychain.warehouse;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.customer;version="2.0.0"
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index 9c2e15ad86..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: supplychain.customer.Customer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,               
-                supplychain.retailer,
-                supplychain.shipper,
-                supplychain.warehouse
-Export-Package: supplychain.customer;version="2.0.0"
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index a01fcbe97f..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: supplychain.retailer.Retailer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.retailer;version="2.0.0"
-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 9d885be534..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index be5ddfd06f..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: supplychain.shipper.Shipper
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
-                supplychain.customer;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.shipper;version="2.0.0"
-Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index 3467c95cdb..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SupplyChain
-Bundle-SymbolicName: supplychain.SupplyChain
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework
-Export-Package: supplychain.customer;version="2.0.0",
-    supplychain.retailer;version="2.0.0",
-    supplychain.warehouse;version="2.0.0",
-    supplychain.shipper;version="2.0.0"
-Bundle-ClassPath: .,CustomerV2.jar,RetailerV2.jar,WarehouseV2.jar,ShipperV2.jar
-
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 8fb7566bcc..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: supplychain.warehouse.Warehouse
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
-                supplychain.shipper;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.warehouse;version="2.0.0"
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
deleted file mode 100644
index bb8fb2b07c..0000000000
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://supplychain"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:sp="http://supplychain"
-	name="supplychain">
-	
-    <component name="CustomerComponentV2">
-        <tuscany:implementation.osgi 
-            bundle="Customer" 
-            bundleSymbolicName="supplychain.customer.Customer"
-            bundleVersion="2.0.0"
-        />
-            
-        <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" /-->
-        <reference name="retailer" target="RetailerComponentV2" />
-    </component>
-
-    <component name="RetailerComponentV2">
-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
-        <!--implementation.osgi
-            bundle="Retailer" 
-            bundleLocation="file:target/Retailer.jar" 
-        /-->
-        <reference name="warehouse" target="WarehouseComponentV2"/>
-    </component>
-
-    <component name="WarehouseComponentV2">
-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-        <!--implementation.osgi
-            bundle="Warehouse" 
-            bundleLocation="file:target/Warehouse.jar" 
-        /-->
-        <reference name="shipper" target="ShipperComponentV2" />
-    </component>
-
-    <component name="ShipperComponentV2">
-        <tuscany:implementation.osgi
-            bundle="Shipper"
-            bundleSymbolicName="supplychain.shipper.Shipper"
-            bundleVersion="2.0.0"
-        />
-        <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
-        <reference name="customer" target="CustomerComponentV2" />
-    </component>
-    
-    
-</composite>
-- 
cgit v1.2.3