Moving 1.x branches

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

23 files changed, 0 insertions, 829 deletions

diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 814c38777a..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-    
-    public int outstandingOrderCount();
-
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4daf0ec02..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.customer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private static int outstandingOrderCount;
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        outstandingOrderCount++;
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrderCount--;
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public int outstandingOrderCount() {
-        return outstandingOrderCount;
-    }
-
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4b3bc7048..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.illegal;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-import supplychain.retailer.JavaRetailerComponentImpl;
-import supplychain.retailer.Retailer;
-import supplychain.warehouse.JavaWarehouseComponentImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private static int outstandingOrderCount;
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        
-        Retailer retailerImpl = new JavaRetailerComponentImpl();
-        System.out.println("Created a retailer from Customer " + retailerImpl);
-        
-        Warehouse warehouseImpl = new JavaWarehouseComponentImpl();
-        System.out.println("Created a warehouse from Customer " + warehouseImpl);
-
-        outstandingOrderCount++;
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrderCount--;
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public int outstandingOrderCount() {
-        return outstandingOrderCount;
-    }
-
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 698aa2aa5d..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public JavaRetailerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-     
-    public Warehouse getWarehouse() {
-        return warehouse;
-    }
-
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 9e01f00a79..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    public JavaShipperComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index cdd12d589d..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.warehouse;
-
-import org.osoa.sca.annotations.Scope;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public JavaWarehouseComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.    
- */
-package supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
deleted file mode 100644
index 714d1826e1..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.java package="supplychain.customer"/>
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.java package="supplychain.customer"/>
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 8a2bec308f..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
deleted file mode 100644
index c77c4c1c7e..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.java package="supplychain.customer"/>
-   <export.java package="supplychain.illegal"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-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.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
deleted file mode 100644
index d118cceef9..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,31 +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"/>
-   
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.illegal"/>
-   <import.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-   
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d37b6659da..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 77b28d9023..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 8ec290a831..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-              
-   <deployable composite="supplychain:supplychain"/>
-   
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index 1398416978..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
deleted file mode 100644
index db1f0d34e7..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ /dev/null
@@ -1,48 +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="CustomerComponent">

-        <implementation.java class="supplychain.illegal.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ /dev/null
@@ -1,48 +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="CustomerComponent">

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
deleted file mode 100644
index a76fae8090..0000000000
--- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.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="JavaWarehouseComponentImpl">
-        <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    
-    <reference name="shipper">
-            <interface.java interface="supplychain.shipper.Shipper"/>
-    </reference>
-</componentType>