Branch before trunk cleanup

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

82 files changed, 3947 insertions, 0 deletions

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
new file mode 100644
index 0000000000..82d536cbfe
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+<project name="OSGiBundleCreator">
+
+    <target name="create-bundles">
+
+        <mkdir dir="${jar.dir}"/>
+
+        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
+
+
+        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
+            <fileset dir="${files.dir}" includes="${files.list}">
+                <!-- include name="${files.list}"/-->
+            </fileset>
+        </jar>
+
+        <delete file="target/classes/META-INF/sca-contribution.xml"/>
+    </target>
+
+
+</project>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/pom.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/pom.xml
new file mode 100644
index 0000000000..edbb66ab09
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/pom.xml
@@ -0,0 +1,211 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-contribution-classes</artifactId>
+    <name>Apache Tuscany OSGi Contribution Version 1 classes</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <finalName>itest-osgi-contribution-classes-v2</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>create-bundles</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="CustomerV2.jar" />
+                                    <property name="manifest.file.name" value="osgi/Customer.mf" />
+                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/customer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               supplychain.composite \
+                                               CustomerV2.componentType \
+                                               RetailerV2.componentType \
+                                               WarehouseV2.componentType \
+                                               ShipperV2.componentType \
+                                               META-INF/sca-contribution.xml" />
+
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="Customer2V2.jar" />
+                                    <property name="manifest.file.name" value="osgi/Customer2.mf" />
+                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/customer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               supplychain.composite \
+                                               Customer2V2.componentType \
+                                               RetailerV2.componentType \
+                                               WarehouseV2.componentType \
+                                               ShipperV2.componentType \
+                                               META-INF/sca-contribution.xml" />
+
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="RetailerV2.jar" />
+                                    <property name="manifest.file.name" value="osgi/Retailer.mf" />
+                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/retailer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="RetailerJarV2.jar" />
+                                    <property name="manifest.file.name" value="osgi/RetailerJar.mf" />
+                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/retailer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="ShipperV2.jar" />
+                                    <property name="manifest.file.name" value="osgi/Shipper.mf" />
+                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/shipper/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="WarehouseV2.jar" />
+                                    <property name="manifest.file.name" value="osgi/Warehouse.mf" />
+                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/warehouse/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="SupplyChainV2.jar" />
+                                    <property name="manifest.file.name" value="osgi/SupplyChain.mf" />
+                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/** \
+                                               supplychain.composite \
+                                               CustomerV2.componentType \
+                                               RetailerV2.componentType \
+                                               WarehouseV2.componentType \
+                                               ShipperV2.componentType \
+                                               CustomerV2.jar \
+                                               RetailerV2.jar \
+                                               WarehouseV2.jar \
+                                               ShipperV2.jar \
+                                               META-INF/sca-contribution.xml" />
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
new file mode 100644
index 0000000000..fba9a109b3
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
@@ -0,0 +1,121 @@
+/*
+ * 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;
+
+
+import java.lang.reflect.Field;
+import java.util.Hashtable;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+
+
+/**
+ * Common code for all OSGi bundles which don't use declarative services.
+ * Registers services and sets references.
+ */
+public class OSGiBundleImpl implements ServiceListener, BundleActivator {
+    
+
+    String name;
+    String serviceName;
+    String[] references;
+    Class<?>[] referenceClasses;
+    Field[] referenceFields;
+    
+    Class myClass;
+    
+	private BundleContext bundleContext;
+    
+    public OSGiBundleImpl(String serviceName, String... references) {
+        
+        myClass = this.getClass();
+        this.name = this.getClass().getSimpleName();
+        this.serviceName = serviceName;
+        this.references = references;
+        
+        try {
+            referenceClasses = new Class[references.length];
+            referenceFields = new Field[references.length];
+            for (int i = 0; i < references.length; i++) {
+                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
+                referenceFields[i].setAccessible(true);
+                referenceClasses[i] = referenceFields[i].getType();
+            }
+            
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        
+    }
+    
+    public void start(BundleContext bc) {
+    	
+    	System.out.println("Started OSGi bundle with activator " + name);
+    	
+    	this.bundleContext = bc;
+    	
+        bundleContext.registerService(serviceName, this, new Hashtable());
+        
+        for (int i = 0; i < references.length; i++) {
+
+            try {
+                
+    	        ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
+	            if (ref != null) {
+                    Object obj = bundleContext.getService(ref);
+                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
+                } else {
+				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
+				    this.bundleContext.addServiceListener(this, filter);				
+	            }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    public void stop(BundleContext bc)  {
+        System.out.println("Stop OSGi bundle with activator " + name);
+
+    }
+    
+
+	public void serviceChanged(ServiceEvent event) {
+		try {
+			if (event.getType() == ServiceEvent.REGISTERED) {
+                
+                ServiceReference ref = event.getServiceReference();
+                Object obj = bundleContext.getService(ref);
+                for (int i = 0; i < references.length; i++) {
+                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
+                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
+                    }
+                }
+			}
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
+	}
+    
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
new file mode 100644
index 0000000000..225dce0236
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
@@ -0,0 +1,33 @@
+/*
+ * 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);
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..2b8c973e2c
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -0,0 +1,55 @@
+/*
+ * 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 Retailer retailer;
+    
+    public JavaCustomerComponentImpl() {
+        System.out.println("Created " + this.getClass().getCanonicalName() + 
+                "(v2) using classloader " + this.getClass().getClassLoader());
+    }
+    
+    @Reference
+    public void setRetailer(Retailer retailer) {
+        this.retailer = retailer;
+    }
+    
+    public void purchaseGoods() {
+        retailer.submitOrder("Order");
+    }
+    
+    public void notifyShipment(String order) {
+        System.out.print("Work thread " + Thread.currentThread() + " - ");
+        System.out.println(order);
+    }
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
new file mode 100644
index 0000000000..a1c7fce60a
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * 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 supplychain.retailer.Retailer;
+
+/**
+ * This class implements the Customer service component (OSGi declarative services implementation).
+ */
+public class OSGiCustomerComponentImpl implements Customer {
+    
+
+    private Retailer retailer;
+    
+   
+    protected void setRetailer(Retailer retailer) {
+    	this.retailer = retailer;
+    }
+    
+    protected void unsetRetailer(Retailer retailer) {
+    	this.retailer = null;
+    }
+   
+    public void purchaseGoods() {
+        retailer.submitOrder("Order");
+    }
+    
+    public void notifyShipment(String order) {
+        System.out.print("Work thread " + Thread.currentThread() + " - ");
+        System.out.println(order);
+    }
+    
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
new file mode 100644
index 0000000000..4647a716c7
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
@@ -0,0 +1,47 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.retailer.Retailer;
+
+/**
+ * This class implements the Customer service component (OSGi procedural services implementation).
+ */
+public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
+    
+    private Retailer retailer;
+    
+    public OSGiCustomerImpl() {
+        super("supplychain.customer.Customer", "retailer");
+                
+    }
+   
+    public void purchaseGoods() {
+        retailer.submitOrder("Order");
+    }
+    
+    public void notifyShipment(String order) {
+        System.out.print("Work thread " + Thread.currentThread() + " - ");
+        System.out.println(order);
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
new file mode 100644
index 0000000000..cc5d44d279
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -0,0 +1,57 @@
+/*
+ * 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().getCanonicalName() + 
+                "(v2) using classloader " + this.getClass().getClassLoader());
+    }
+    
+    @Reference
+    public void setWarehouse(Warehouse warehouse) {
+        this.warehouse = warehouse;
+    }
+    
+       
+    public void submitOrder(String order) {
+    	
+        warehouse.fulfillOrder(order + ", submitted");
+        
+    }
+
+    
+    
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
new file mode 100644
index 0000000000..1b7fb15bf1
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
@@ -0,0 +1,46 @@
+/*
+ * 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 supplychain.warehouse.Warehouse;
+
+/**
+ * This class implements the Retailer service component (OSGi declarative services implementation).
+ */
+public class OSGiRetailerComponentImpl implements Retailer {
+    
+    private Warehouse warehouse;
+    
+    
+    protected void setWarehouse(Warehouse warehouse) {
+    	this.warehouse = warehouse;
+    }
+    
+    protected void unsetWarehouse(Warehouse warehouse) {
+    	this.warehouse = null;
+    }
+    
+    public void submitOrder(String order) {
+    	
+        warehouse.fulfillOrder(order + ", submitted");
+       
+    }
+
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
new file mode 100644
index 0000000000..e97331c06c
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.warehouse.Warehouse;
+
+/**
+ * This class implements the Retailer service component (OSGi procedural services implementation).
+ */
+public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
+    
+    private Warehouse warehouse;
+    
+    public OSGiRetailerImpl() {
+
+        super("supplychain.retailer.Retailer", "warehouse");
+    }
+    
+    public void submitOrder(String order) {
+        warehouse.fulfillOrder(order + ", submitted");        
+        
+    }
+
+    
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
new file mode 100644
index 0000000000..1e87d59af1
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
@@ -0,0 +1,28 @@
+/*
+ * 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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
new file mode 100644
index 0000000000..2d1bb68e5b
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -0,0 +1,52 @@
+/*
+ * 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() + 
+                "(v2) using classloader " + 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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
new file mode 100644
index 0000000000..0f88cca213
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
@@ -0,0 +1,45 @@
+/*
+ * 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 supplychain.customer.Customer;
+
+/**
+ * This class implements the Shipper service component (OSGi declarative services implementation).
+ */
+public class OSGiShipperComponentImpl implements Shipper {
+
+    private Customer customer;
+    
+    
+    protected void setCustomer(Customer customer) {
+    	this.customer = customer;
+    }
+    
+    protected void unsetCustomer(Customer customer) {
+    	this.customer = null;
+    }
+    
+    public void processShipment(String order) {
+        customer.notifyShipment(order + ", shipped");
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
new file mode 100644
index 0000000000..f55a068ede
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
@@ -0,0 +1,42 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.customer.Customer;
+
+/**
+ * This class implements the Shipper service component (OSGi procedural services implementation).
+ */
+public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
+
+    private Customer customer;
+    
+    public OSGiShipperImpl() {
+    	super("supplychain.shipper.Shipper", "customer");
+    }
+    
+    
+    public void processShipment(String order) {
+        customer.notifyShipment(order + ", shipped");
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
new file mode 100644
index 0000000000..2514928c10
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
@@ -0,0 +1,28 @@
+/*
+ * 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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
new file mode 100644
index 0000000000..c39a34cb96
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * 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.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+import supplychain.shipper.Shipper;
+
+/**
+ * This class implements the Warehouse service component (POJO implementation).
+ */
+@Service(Warehouse.class)
+@Scope("STATELESS")
+public class JavaWarehouseComponentImpl implements Warehouse {
+    
+    private Shipper shipper;
+    
+    public JavaWarehouseComponentImpl() {
+        System.out.println("Created " + this.getClass().getCanonicalName() + 
+                "(v2) using classloader " + this.getClass().getClassLoader());
+    }
+    
+    @Reference
+    public void setShipper(Shipper shipper) {
+        this.shipper = shipper;
+    }
+    
+    public void fulfillOrder(String order) {
+        shipper.processShipment(order + ", fulfilled");
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
new file mode 100644
index 0000000000..600f3f0c74
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
@@ -0,0 +1,47 @@
+/*
+ * 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 supplychain.shipper.Shipper;
+
+/**
+ * This class implements the Warehouse service component (OSGi declarative services implementation).
+ */
+
+public class OSGiWarehouseComponentImpl implements Warehouse {
+    
+    private Shipper shipper;
+    
+   
+    protected void setShipper(Shipper shipper) {
+    	this.shipper = shipper;
+    }
+    
+    protected void unsetShipper(Shipper shipper) {
+    	this.shipper = null;
+    }
+    
+    public void fulfillOrder(String order) {
+        shipper.processShipment(order + ", fulfilled");
+    	
+    }
+    
+   
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
new file mode 100644
index 0000000000..0ba54b363a
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.shipper.Shipper;
+
+/**
+ * This class implements the Warehouse service component (OSGi procedural services implementation).
+ */
+
+public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
+    
+    private Shipper shipper;
+    
+    public OSGiWarehouseImpl() {
+    	super("supplychain.warehouse.Warehouse", "shipper");
+    }
+    
+    
+    public void fulfillOrder(String order) {
+        shipper.processShipment(order + ", fulfilled");
+    	
+    }
+    
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
new file mode 100644
index 0000000000..6f1f6b8730
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
@@ -0,0 +1,28 @@
+/*
+ * 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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
new file mode 100644
index 0000000000..4779eff514
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
@@ -0,0 +1,32 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
new file mode 100644
index 0000000000..d505834f15
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
@@ -0,0 +1,29 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
new file mode 100644
index 0000000000..6bcf6cef0a
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
@@ -0,0 +1,27 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..210a68011f
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
new file mode 100644
index 0000000000..e23e1a2ecd
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
new file mode 100644
index 0000000000..9832da880e
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
new file mode 100644
index 0000000000..5586179421
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
new file mode 100644
index 0000000000..ccc4f84ee4
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
new file mode 100644
index 0000000000..644b207e70
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
@@ -0,0 +1,13 @@
+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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
new file mode 100644
index 0000000000..e649870356
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
@@ -0,0 +1,13 @@
+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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
new file mode 100644
index 0000000000..8e8e33ecd1
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
@@ -0,0 +1,10 @@
+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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
new file mode 100644
index 0000000000..2f4b56835b
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
@@ -0,0 +1 @@
+Manifest-Version: 1.0

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
new file mode 100644
index 0000000000..5f4a8b94ec
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
@@ -0,0 +1,10 @@
+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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
new file mode 100644
index 0000000000..57d2ac9e4d
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
@@ -0,0 +1,13 @@
+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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
new file mode 100644
index 0000000000..2e1399bb3b
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
@@ -0,0 +1,10 @@
+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/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
new file mode 100644
index 0000000000..bb8fb2b07c
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
@@ -0,0 +1,67 @@
+<?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>

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/build-bundles.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/build-bundles.xml
new file mode 100644
index 0000000000..82d536cbfe
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/build-bundles.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+<project name="OSGiBundleCreator">
+
+    <target name="create-bundles">
+
+        <mkdir dir="${jar.dir}"/>
+
+        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
+
+
+        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
+            <fileset dir="${files.dir}" includes="${files.list}">
+                <!-- include name="${files.list}"/-->
+            </fileset>
+        </jar>
+
+        <delete file="target/classes/META-INF/sca-contribution.xml"/>
+    </target>
+
+
+</project>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/pom.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/pom.xml
new file mode 100644
index 0000000000..0a95927b7f
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/pom.xml
@@ -0,0 +1,212 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-contribution-classes-v2</artifactId>
+    <name>Apache Tuscany OSGi Contribution Version 2 classes</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>itest-osgi-contribution-classes</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>create-bundles</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="CustomerV1.jar" />
+                                    <property name="manifest.file.name" value="osgi/Customer.mf" />
+                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/customer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               supplychain.composite \
+                                               CustomerV1.componentType \
+                                               RetailerV1.componentType \
+                                               WarehouseV1.componentType \
+                                               ShipperV1.componentType \
+                                               META-INF/sca-contribution.xml" />
+
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="Customer2V1.jar" />
+                                    <property name="manifest.file.name" value="osgi/Customer2.mf" />
+                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/customer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               supplychain.composite \
+                                               Customer2V1.componentType \
+                                               RetailerV1.componentType \
+                                               WarehouseV1.componentType \
+                                               ShipperV1.componentType \
+                                               META-INF/sca-contribution.xml" />
+
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="RetailerV1.jar" />
+                                    <property name="manifest.file.name" value="osgi/Retailer.mf" />
+                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/retailer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="RetailerJarV1.jar" />
+                                    <property name="manifest.file.name" value="osgi/RetailerJar.mf" />
+                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/retailer/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="ShipperV1.jar" />
+                                    <property name="manifest.file.name" value="osgi/Shipper.mf" />
+                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/shipper/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="WarehouseV1.jar" />
+                                    <property name="manifest.file.name" value="osgi/Warehouse.mf" />
+                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/warehouse/* \
+                                               supplychain/OSGiBundleImpl.class \
+                                               META-INF/sca-contribution.xml" />
+
+                                </ant>
+                                <ant antfile="./build-bundles.xml" target="create-bundles">
+                                    <property name="jar.dir" value="target/classes" />
+                                    <property name="files.dir" value="target/classes" />
+                                    <property name="jar.file.name" value="SupplyChainV1.jar" />
+                                    <property name="manifest.file.name" value="osgi/SupplyChain.mf" />
+                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
+                                    <property name="files.list"
+                                        value="supplychain/** \
+                                               supplychain.composite \
+                                               CustomerV1.componentType \
+                                               RetailerV1.componentType \
+                                               WarehouseV1.componentType \
+                                               ShipperV1.componentType \
+                                               CustomerV1.jar \
+                                               RetailerV1.jar \
+                                               WarehouseV1.jar \
+                                               ShipperV1.jar \
+                                               META-INF/sca-contribution.xml" />
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
new file mode 100644
index 0000000000..fba9a109b3
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
@@ -0,0 +1,121 @@
+/*
+ * 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;
+
+
+import java.lang.reflect.Field;
+import java.util.Hashtable;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+
+
+/**
+ * Common code for all OSGi bundles which don't use declarative services.
+ * Registers services and sets references.
+ */
+public class OSGiBundleImpl implements ServiceListener, BundleActivator {
+    
+
+    String name;
+    String serviceName;
+    String[] references;
+    Class<?>[] referenceClasses;
+    Field[] referenceFields;
+    
+    Class myClass;
+    
+	private BundleContext bundleContext;
+    
+    public OSGiBundleImpl(String serviceName, String... references) {
+        
+        myClass = this.getClass();
+        this.name = this.getClass().getSimpleName();
+        this.serviceName = serviceName;
+        this.references = references;
+        
+        try {
+            referenceClasses = new Class[references.length];
+            referenceFields = new Field[references.length];
+            for (int i = 0; i < references.length; i++) {
+                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
+                referenceFields[i].setAccessible(true);
+                referenceClasses[i] = referenceFields[i].getType();
+            }
+            
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        
+    }
+    
+    public void start(BundleContext bc) {
+    	
+    	System.out.println("Started OSGi bundle with activator " + name);
+    	
+    	this.bundleContext = bc;
+    	
+        bundleContext.registerService(serviceName, this, new Hashtable());
+        
+        for (int i = 0; i < references.length; i++) {
+
+            try {
+                
+    	        ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
+	            if (ref != null) {
+                    Object obj = bundleContext.getService(ref);
+                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
+                } else {
+				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
+				    this.bundleContext.addServiceListener(this, filter);				
+	            }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    public void stop(BundleContext bc)  {
+        System.out.println("Stop OSGi bundle with activator " + name);
+
+    }
+    
+
+	public void serviceChanged(ServiceEvent event) {
+		try {
+			if (event.getType() == ServiceEvent.REGISTERED) {
+                
+                ServiceReference ref = event.getServiceReference();
+                Object obj = bundleContext.getService(ref);
+                for (int i = 0; i < references.length; i++) {
+                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
+                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
+                    }
+                }
+			}
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
+	}
+    
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
new file mode 100644
index 0000000000..225dce0236
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
@@ -0,0 +1,33 @@
+/*
+ * 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);
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..d0b0a13e6d
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -0,0 +1,55 @@
+/*
+ * 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 Retailer retailer;
+    
+    public JavaCustomerComponentImpl() {
+        System.out.println("Created " + this.getClass().getCanonicalName() + 
+                " using classloader " + this.getClass().getClassLoader());
+    }
+    
+    @Reference
+    public void setRetailer(Retailer retailer) {
+        this.retailer = retailer;
+    }
+    
+    public void purchaseGoods() {
+        retailer.submitOrder("Order");
+    }
+    
+    public void notifyShipment(String order) {
+        System.out.print("Work thread " + Thread.currentThread() + " - ");
+        System.out.println(order);
+    }
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
new file mode 100644
index 0000000000..a1c7fce60a
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * 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 supplychain.retailer.Retailer;
+
+/**
+ * This class implements the Customer service component (OSGi declarative services implementation).
+ */
+public class OSGiCustomerComponentImpl implements Customer {
+    
+
+    private Retailer retailer;
+    
+   
+    protected void setRetailer(Retailer retailer) {
+    	this.retailer = retailer;
+    }
+    
+    protected void unsetRetailer(Retailer retailer) {
+    	this.retailer = null;
+    }
+   
+    public void purchaseGoods() {
+        retailer.submitOrder("Order");
+    }
+    
+    public void notifyShipment(String order) {
+        System.out.print("Work thread " + Thread.currentThread() + " - ");
+        System.out.println(order);
+    }
+    
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
new file mode 100644
index 0000000000..4647a716c7
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
@@ -0,0 +1,47 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.retailer.Retailer;
+
+/**
+ * This class implements the Customer service component (OSGi procedural services implementation).
+ */
+public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
+    
+    private Retailer retailer;
+    
+    public OSGiCustomerImpl() {
+        super("supplychain.customer.Customer", "retailer");
+                
+    }
+   
+    public void purchaseGoods() {
+        retailer.submitOrder("Order");
+    }
+    
+    public void notifyShipment(String order) {
+        System.out.print("Work thread " + Thread.currentThread() + " - ");
+        System.out.println(order);
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
new file mode 100644
index 0000000000..d2bf71ed28
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -0,0 +1,57 @@
+/*
+ * 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().getCanonicalName() + 
+                " using classloader " + this.getClass().getClassLoader());
+    }
+    
+    @Reference
+    public void setWarehouse(Warehouse warehouse) {
+        this.warehouse = warehouse;
+    }
+    
+       
+    public void submitOrder(String order) {
+    	
+        warehouse.fulfillOrder(order + ", submitted");
+        
+    }
+
+    
+    
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
new file mode 100644
index 0000000000..1b7fb15bf1
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
@@ -0,0 +1,46 @@
+/*
+ * 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 supplychain.warehouse.Warehouse;
+
+/**
+ * This class implements the Retailer service component (OSGi declarative services implementation).
+ */
+public class OSGiRetailerComponentImpl implements Retailer {
+    
+    private Warehouse warehouse;
+    
+    
+    protected void setWarehouse(Warehouse warehouse) {
+    	this.warehouse = warehouse;
+    }
+    
+    protected void unsetWarehouse(Warehouse warehouse) {
+    	this.warehouse = null;
+    }
+    
+    public void submitOrder(String order) {
+    	
+        warehouse.fulfillOrder(order + ", submitted");
+       
+    }
+
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
new file mode 100644
index 0000000000..e97331c06c
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.warehouse.Warehouse;
+
+/**
+ * This class implements the Retailer service component (OSGi procedural services implementation).
+ */
+public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
+    
+    private Warehouse warehouse;
+    
+    public OSGiRetailerImpl() {
+
+        super("supplychain.retailer.Retailer", "warehouse");
+    }
+    
+    public void submitOrder(String order) {
+        warehouse.fulfillOrder(order + ", submitted");        
+        
+    }
+
+    
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
new file mode 100644
index 0000000000..1e87d59af1
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
@@ -0,0 +1,28 @@
+/*
+ * 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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
new file mode 100644
index 0000000000..2556a0cfa0
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -0,0 +1,52 @@
+/*
+ * 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 classloader " + 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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
new file mode 100644
index 0000000000..0f88cca213
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
@@ -0,0 +1,45 @@
+/*
+ * 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 supplychain.customer.Customer;
+
+/**
+ * This class implements the Shipper service component (OSGi declarative services implementation).
+ */
+public class OSGiShipperComponentImpl implements Shipper {
+
+    private Customer customer;
+    
+    
+    protected void setCustomer(Customer customer) {
+    	this.customer = customer;
+    }
+    
+    protected void unsetCustomer(Customer customer) {
+    	this.customer = null;
+    }
+    
+    public void processShipment(String order) {
+        customer.notifyShipment(order + ", shipped");
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
new file mode 100644
index 0000000000..f55a068ede
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
@@ -0,0 +1,42 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.customer.Customer;
+
+/**
+ * This class implements the Shipper service component (OSGi procedural services implementation).
+ */
+public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
+
+    private Customer customer;
+    
+    public OSGiShipperImpl() {
+    	super("supplychain.shipper.Shipper", "customer");
+    }
+    
+    
+    public void processShipment(String order) {
+        customer.notifyShipment(order + ", shipped");
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
new file mode 100644
index 0000000000..2514928c10
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
@@ -0,0 +1,28 @@
+/*
+ * 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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
new file mode 100644
index 0000000000..e180c37e3f
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * 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.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+import supplychain.shipper.Shipper;
+
+/**
+ * This class implements the Warehouse service component (POJO implementation).
+ */
+@Service(Warehouse.class)
+@Scope("STATELESS")
+public class JavaWarehouseComponentImpl implements Warehouse {
+    
+    private Shipper shipper;
+    
+    public JavaWarehouseComponentImpl() {
+        System.out.println("Created " + this.getClass().getCanonicalName() + 
+                " using classloader " + this.getClass().getClassLoader());
+    }
+    
+    @Reference
+    public void setShipper(Shipper shipper) {
+        this.shipper = shipper;
+    }
+    
+    public void fulfillOrder(String order) {
+        shipper.processShipment(order + ", fulfilled");
+    }
+    
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
new file mode 100644
index 0000000000..600f3f0c74
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
@@ -0,0 +1,47 @@
+/*
+ * 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 supplychain.shipper.Shipper;
+
+/**
+ * This class implements the Warehouse service component (OSGi declarative services implementation).
+ */
+
+public class OSGiWarehouseComponentImpl implements Warehouse {
+    
+    private Shipper shipper;
+    
+   
+    protected void setShipper(Shipper shipper) {
+    	this.shipper = shipper;
+    }
+    
+    protected void unsetShipper(Shipper shipper) {
+    	this.shipper = null;
+    }
+    
+    public void fulfillOrder(String order) {
+        shipper.processShipment(order + ", fulfilled");
+    	
+    }
+    
+   
+
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
new file mode 100644
index 0000000000..0ba54b363a
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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 supplychain.OSGiBundleImpl;
+import supplychain.shipper.Shipper;
+
+/**
+ * This class implements the Warehouse service component (OSGi procedural services implementation).
+ */
+
+public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
+    
+    private Shipper shipper;
+    
+    public OSGiWarehouseImpl() {
+    	super("supplychain.warehouse.Warehouse", "shipper");
+    }
+    
+    
+    public void fulfillOrder(String order) {
+        shipper.processShipment(order + ", fulfilled");
+    	
+    }
+    
+   
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
new file mode 100644
index 0000000000..6f1f6b8730
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
@@ -0,0 +1,28 @@
+/*
+ * 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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
new file mode 100644
index 0000000000..828dc6f472
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
@@ -0,0 +1,30 @@
+<?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="RetailerV1" location="RetailerV1" />
+   <import namespace="ShipperV1" location="ShipperV1" />
+   <import namespace="WarehouseV1" location="WarehouseV1" />
+   <export namespace="CustomerV1" />
+</contribution>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
new file mode 100644
index 0000000000..9293b1ff52
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?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"/>
+   <export namespace="RetailerV1" />
+</contribution>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
new file mode 100644
index 0000000000..03077aa4d4
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?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"/>
+   <export namespace="ShipperV1" />
+</contribution>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..210a68011f
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
new file mode 100644
index 0000000000..c96deb4e1b
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?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"/>
+   <export namespace="WarehouseV1" />
+</contribution>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
new file mode 100644
index 0000000000..9832da880e
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
new file mode 100644
index 0000000000..5586179421
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
new file mode 100644
index 0000000000..ccc4f84ee4
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
@@ -0,0 +1,28 @@
+<?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/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
new file mode 100644
index 0000000000..404995a90f
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Customer

+Bundle-SymbolicName: supplychain.customer.Customer

+Bundle-Version: 1.0.0

+Bundle-Localization: plugin

+Import-Package: org.osgi.framework,

+                supplychain.retailer;version="[1.0.0,2.0.0)",

+                supplychain.warehouse;version="[1.0.0,2.0.0)",

+                supplychain.shipper;version="[1.0.0,2.0.0)"

+Export-Package: supplychain.customer;version="1.0.0"

+Bundle-Activator: supplychain.customer.OSGiCustomerImpl

+

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
new file mode 100644
index 0000000000..0441e8c6f0
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Customer

+Bundle-SymbolicName: supplychain.customer.Customer

+Bundle-Version: 1.0.0

+Bundle-Localization: plugin

+Import-Package: org.osgi.framework,

+                supplychain.retailer,

+                supplychain.shipper,

+                supplychain.warehouse

+Export-Package: supplychain.customer;version="1.0.0"

+Bundle-Activator: supplychain.customer.OSGiCustomerImpl

+

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
new file mode 100644
index 0000000000..ac0ca72030
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Retailer

+Bundle-SymbolicName: supplychain.retailer.Retailer

+Bundle-Version: 1.0.0

+Bundle-Localization: plugin

+Import-Package: org.osgi.framework,

+ supplychain.warehouse;version="[1.0.0,2.0.0)"

+Export-Package: supplychain.retailer;version="1.0.0"

+Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
new file mode 100644
index 0000000000..2f4b56835b
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
@@ -0,0 +1 @@
+Manifest-Version: 1.0

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
new file mode 100644
index 0000000000..61f62fa16e
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Shipper

+Bundle-SymbolicName: supplychain.shipper.Shipper

+Bundle-Version: 1.0.0

+Bundle-Localization: plugin

+Import-Package: org.osgi.framework,

+                supplychain.customer;version="[1.0.0,2.0.0)"

+Export-Package: supplychain.shipper;version="1.0.0"

+Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
new file mode 100644
index 0000000000..dc4aa2c30e
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: SupplyChain

+Bundle-SymbolicName: supplychain.SupplyChain

+Bundle-Version: 1.0.0

+Bundle-Localization: plugin

+Import-Package: org.osgi.framework

+Export-Package: supplychain.customer;version="1.0.0",

+    supplychain.retailer;version="1.0.0",

+    supplychain.warehouse;version="1.0.0",

+    supplychain.shipper;version="1.0.0"

+Bundle-ClassPath: .,CustomerV1.jar,RetailerV1.jar,WarehouseV1.jar,ShipperV1.jar

+

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
new file mode 100644
index 0000000000..d149165366
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Warehouse

+Bundle-SymbolicName: supplychain.warehouse.Warehouse

+Bundle-Version: 1.0.0

+Bundle-Localization: plugin

+Import-Package: org.osgi.framework,

+                supplychain.shipper;version="[1.0.0,2.0.0)"

+Export-Package: supplychain.warehouse;version="1.0.0"

+Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
new file mode 100644
index 0000000000..4a18aed5f3
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
@@ -0,0 +1,66 @@
+<?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">

+        <!--tuscany:implementation.osgi 

+            bundle="Customer" 

+            bundleLocation="file:target/Customer.jar" 

+            scope="COMPOSITE"

+        /-->

+            

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

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

+    </component>

+

+    <component name="RetailerComponent">

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

+        <!--implementation.osgi

+            bundle="Retailer" 

+            bundleLocation="file:target/Retailer.jar" 

+        /-->

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

+    </component>

+

+    <component name="WarehouseComponent">

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

+        <!--implementation.osgi

+            bundle="Warehouse" 

+            bundleLocation="file:target/Warehouse.jar" 

+        /-->

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

+    </component>

+

+    <component name="ShipperComponent">

+        <!--tuscany:implementation.osgi

+            bundle="Shipper" 

+            bundleLocation="file:target/Shipper.jar" 

+        /-->

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

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

+    </component>

+    

+    

+</composite>

diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-test/pom.xml b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/pom.xml
new file mode 100644
index 0000000000..6853aba2d1
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/pom.xml
@@ -0,0 +1,92 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-contribution-test</artifactId>
+    <name>Apache Tuscany OSGi Contribution tests</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.main</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
new file mode 100644
index 0000000000..108481fcbd
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
@@ -0,0 +1,73 @@
+/*
+ * 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 org.apache.tuscany.sca.contribution.osgi;
+
+import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
+import org.osgi.framework.BundleContext;
+
+
+/**
+ * OSGi Test Utils
+ */
+public  class OSGiTestUtil  {
+    
+    public static BundleContext setUpOSGiTestRuntime() throws Exception {
+
+        setUpFelixTestRuntime();
+        return OSGiRuntime.getRuntime().getBundleContext();
+    }
+    
+    
+    public static void setUpFelixTestRuntime() throws Exception {
+
+        String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties";
+        
+        System.setProperty("felix.config.properties", felixConfigFileName);
+        
+        try {
+            
+            ClassLoader cl = OSGiTestUtil.class.getClassLoader();
+            
+            Class felixMainClass = cl.loadClass("org.apache.felix.main.Main");
+            if (felixMainClass != null) {
+                String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();
+                int index = 0;
+                if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {
+                    felixDir = felixDir.substring(0, index);
+                    System.setProperty("FELIX_DIR", felixDir);
+                }
+            }
+            
+        } catch (Exception e) {
+            // Ignore
+        }
+        
+        
+    }
+    
+    public static void shutdownOSGiRuntime()  {
+        try {
+            OSGiRuntime.stop();
+        
+        } catch (Exception e) {
+            // Ignore
+        }
+    }
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
new file mode 100644
index 0000000000..28fe368663
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
@@ -0,0 +1,43 @@
+/*
+ * 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 org.apache.tuscany.sca.contribution.osgi.test;
+
+
+/*
+ * 
+ * Supplychain using OSGi and non-OSGi contributions
+ * 
+ * 
+ */
+
+public class MixedContributionTestCase extends SCAResolverTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        
+
+        customerJarName = "Customer2";
+        retailerJarName = "RetailerJar";
+    
+        setUpOSGi();
+        setUpSCA();
+        
+    }
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
new file mode 100644
index 0000000000..be3b7365e5
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
@@ -0,0 +1,182 @@
+/*
+ * 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 org.apache.tuscany.sca.contribution.osgi.test;
+
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
+import org.apache.tuscany.sca.contribution.resolver.ClassReference;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+/*
+ * 
+ * Supplychain using OSGi contributions, with nested jar files and bundles used
+ * by <implementation.java/> and <implementation.osgi/>
+ * 
+ * SupplyChain v1 is a bundle containing jar files which are used by <implementation.java/>
+ * SupplyChain v2 is a bundle containing bundles which are used by <implementation.osgi/>
+ */
+
+public class NestedBundleTestCase extends TestCase {
+
+
+    protected  EmbeddedSCADomain domain;
+    
+    private SupplyChain supplyChainV1;
+    private SupplyChain supplyChainV2;
+    
+    @Override
+    protected void setUp() throws Exception {
+    
+        setUpOSGi();
+        setUpSCA();
+    }
+        
+    protected void setUpOSGi() throws Exception {
+        OSGiTestUtil.setUpFelixTestRuntime();
+    }
+    
+    protected void setUpSCA() throws Exception {
+        //Create a test embedded SCA domain
+        ClassLoader cl = getClass().getClassLoader();
+        domain = new EmbeddedSCADomain(cl, "http://localhost");
+
+        //Start the domain
+        domain.start();
+
+        // Contribute the SCA contribution
+        ContributionService contributionService = domain.getContributionService();
+        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
+                contributionService, "V1");
+        supplyChainV1.setUpSCA();
+
+        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
+                contributionService, "V2");
+        supplyChainV2.setUpSCA();
+    }
+
+	
+
+	@Override
+    public void tearDown() throws Exception {
+
+
+        supplyChainV1.tearDownSCA();
+        supplyChainV2.tearDownSCA();
+        
+        domain.stop();
+
+        domain.close();
+        
+        OSGiTestUtil.shutdownOSGiRuntime();
+	}
+
+    
+    @SuppressWarnings("unchecked")
+    public void test() throws Exception {
+        
+        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
+        customerClassRef = supplyChainV1.supplychainContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
+        Class customerClass = customerClassRef.getJavaClass();
+        
+        Object customer = 
+            domain.getService(customerClass, "CustomerComponent");
+                
+        Method m = customerClass.getMethod("purchaseGoods");
+        m.invoke(customer);
+        
+        System.out.println("Sleeping ...");
+        Thread.sleep(1000);
+        
+        ClassReference customerClassRefV2 = new ClassReference("supplychain.customer.Customer");
+        customerClassRefV2 = supplyChainV2.supplychainContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRefV2);
+        Class customerClassV2 = customerClassRefV2.getJavaClass();
+        
+        Object customerV2 = 
+            domain.getService(customerClassV2, "CustomerComponentV2");
+                
+        Method mV2 = customerClassV2.getMethod("purchaseGoods");
+        mV2.invoke(customerV2);
+        
+        System.out.println("Sleeping ...");
+        Thread.sleep(2000);
+        
+        System.out.println("Test complete");
+        
+    }
+    
+    private class SupplyChain {
+        
+        private String folderName;
+        private ContributionService contributionService;
+        private String version;
+        
+        private Contribution supplychainContribution;
+        
+        
+        public SupplyChain(String folderName, ContributionService contributionService, String version) {
+            this.folderName = folderName;
+            this.contributionService = contributionService;
+            this.version = version;
+        }
+        
+        protected void setUpSCA() throws Exception {
+            File supplychainLocation = new File(folderName + "/SupplyChain" + version + ".jar");
+            URL supplychainContribURL = supplychainLocation.toURL();
+
+            
+            String supplychainURI = "SupplyChain" + version;
+
+            supplychainContribution = contributionService.contribute(
+                    supplychainURI, supplychainContribURL, true);
+            
+            for (Composite deployable : supplychainContribution.getDeployables()) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+            // Start Components from my composite
+            for (Composite deployable : supplychainContribution.getDeployables() ) {
+                domain.getCompositeActivator().activate(deployable);
+                domain.getCompositeActivator().start(deployable);
+            }
+        }
+
+        public void tearDownSCA() throws Exception {
+            // Remove the contribution from the in-memory repository
+            contributionService.remove("SupplyChain" + version);
+            
+            // Stop Components from my composite
+            for (Composite deployable : supplychainContribution.getDeployables() ) {
+                domain.getCompositeActivator().stop(deployable);
+                domain.getCompositeActivator().deactivate(deployable);
+            }
+
+        }
+        
+    }
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
new file mode 100644
index 0000000000..03372349f8
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
@@ -0,0 +1,257 @@
+/*
+ * 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 org.apache.tuscany.sca.contribution.osgi.test;
+
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.Hashtable;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
+import org.apache.tuscany.sca.contribution.osgi.impl.OSGiModelResolverImpl;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/*
+ * 
+ * Supplychain using OSGi contributions, using an OSGi ModelResolver
+ * 
+ * Notes:
+ *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
+ *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
+ *    
+ *    All dependent OSGi contribution bundles should be installed before the referring contribution.
+ *    Hence dependencies should be a tree and cannot contain cycles.
+ *    
+ *    For Jar files contained within OSGi bundles, Bundle-Classpath should be
+ *    set so that standard OSGi class resolution is sufficient to resolve classes containing in
+ *    nested jars or bundles.
+ */
+
+public class OSGiResolverTestCase extends TestCase {
+
+
+    protected  EmbeddedSCADomain domain;
+    protected BundleContext bundleContext;
+    
+    private SupplyChain supplyChainV1;
+    private SupplyChain supplyChainV2;
+  
+    @Override
+    protected void setUp() throws Exception {
+    
+        setUpOSGi();
+        setUpSCA();
+    }
+        
+    protected void setUpOSGi() throws Exception {
+        bundleContext = OSGiTestUtil.setUpOSGiTestRuntime();
+    }
+    
+    protected void setUpSCA() throws Exception {
+        //Create a test embedded SCA domain
+        ClassLoader cl = getClass().getClassLoader();
+        domain = new EmbeddedSCADomain(cl, "http://localhost");
+
+        //Start the domain
+        domain.start();
+
+        // Contribute the SCA contribution
+        ContributionService contributionService = domain.getContributionService();
+        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
+                contributionService, "V1");
+        supplyChainV1.setUpSCA();
+
+        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
+                contributionService, "V2");
+        supplyChainV2.setUpSCA();
+    }
+
+	
+
+	@Override
+    public void tearDown() throws Exception {
+
+
+        supplyChainV1.tearDownSCA();
+        supplyChainV2.tearDownSCA();
+        
+        domain.stop();
+
+        domain.close();
+        
+        OSGiTestUtil.shutdownOSGiRuntime();
+	}
+
+    
+    @SuppressWarnings("unchecked")
+    public void test() throws Exception {
+        
+        Class customerClass = supplyChainV1.customerBundle.loadClass("supplychain.customer.Customer");
+        
+        Object customer = 
+            domain.getService(customerClass, "CustomerComponent");
+                
+        Method m = customerClass.getMethod("purchaseGoods");
+        m.invoke(customer);
+        
+        System.out.println("Sleeping ...");
+        Thread.sleep(1000);
+        
+        Class customerClassV2 = supplyChainV2.customerBundle.loadClass("supplychain.customer.Customer");
+        
+        Object customerV2 = 
+            domain.getService(customerClassV2, "CustomerComponentV2");
+                
+        Method mV2 = customerClassV2.getMethod("purchaseGoods");
+        mV2.invoke(customerV2);
+        
+        System.out.println("Sleeping ...");
+        Thread.sleep(2000);
+        
+        System.out.println("Test complete");
+        
+    }
+    
+    private class SupplyChain {
+        
+        private String folderName;
+        private ContributionService contributionService;
+        private String version;
+        
+        private Bundle customerBundle;
+
+
+        private Contribution customerContribution;
+        private Contribution retailerContribution;
+        private Contribution warehouseContribution;
+        private Contribution shipperContribution;
+        
+        
+        public SupplyChain(String folderName, ContributionService contributionService, String version) {
+            this.folderName = folderName;
+            this.contributionService = contributionService;
+            this.version = version;
+        }
+        
+        protected void setUpSCA() throws Exception {
+            File customerLocation = new File(folderName + "/Customer" + version + ".jar");
+            URL customerContribURL = customerLocation.toURL();
+            File retailerLocation = new File(folderName + "/Retailer" + version + ".jar");
+            URL retailerContribURL = retailerLocation.toURL();
+            File warehouseLocation = new File(folderName + "/Warehouse" + version + ".jar");
+            URL warehouseContribURL = warehouseLocation.toURL();
+            File shipperLocation = new File(folderName + "/Shipper" + version + ".jar");
+            URL shipperContribURL = shipperLocation.toURL();
+            
+            customerBundle = bundleContext.installBundle(customerContribURL.toString());
+            Bundle retailerBundle = bundleContext.installBundle(retailerContribURL.toString());
+            Bundle warehouseBundle = bundleContext.installBundle(warehouseContribURL.toString());
+            Bundle shipperBundle = bundleContext.installBundle(shipperContribURL.toString());
+                
+            Hashtable<String,Bundle> bundles = new Hashtable<String,Bundle>();
+            bundles.put("Customer" + version + ".jar", customerBundle);
+            bundles.put("Retailer" + version + ".jar", retailerBundle);
+            bundles.put("Warehouse" + version + ".jar", warehouseBundle);
+            bundles.put("Shipper" + version + ".jar", shipperBundle);
+            
+            ModelResolver customerResolver = new OSGiModelResolverImpl(bundles);
+            
+            bundles = new Hashtable<String,Bundle>();
+            bundles.put("Retailer" + version + ".jar", retailerBundle);
+            ModelResolver retailerResolver = new OSGiModelResolverImpl(bundles);
+            
+            bundles = new Hashtable<String,Bundle>();
+            bundles.put("Warehouse" + version + ".jar", warehouseBundle);
+            ModelResolver warehouseResolver = new OSGiModelResolverImpl(bundles);
+            
+            bundles = new Hashtable<String,Bundle>();
+            bundles.put("Shipper" + version + ".jar", shipperBundle);
+            ModelResolver shipperResolver = new OSGiModelResolverImpl(bundles);
+
+
+            shipperContribution = contributionService.contribute(
+                        "Shipper" + version,
+                        shipperContribURL, shipperResolver, false);
+            warehouseContribution = contributionService.contribute(
+                        "Warehouse" + version,
+                        warehouseContribURL, warehouseResolver, false);
+            retailerContribution = contributionService.contribute(
+                        "Retailer" + version,
+                        retailerContribURL, retailerResolver, false);                
+               
+            customerContribution = contributionService.contribute(
+                        "Customer" + version,
+                        customerContribURL, customerResolver, false);
+             
+            for (Composite deployable : customerContribution.getDeployables()) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+
+            for (Composite deployable : retailerContribution.getDeployables() ) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+            for (Composite deployable : warehouseContribution.getDeployables() ) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+            for (Composite deployable : shipperContribution.getDeployables() ) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+            // Start Components from my composite
+            for (Composite deployable : customerContribution.getDeployables() ) {
+                domain.getCompositeActivator().activate(deployable);
+                domain.getCompositeActivator().start(deployable);
+            }
+        }
+
+        public void tearDownSCA() throws Exception {
+            // Remove the contribution from the in-memory repository
+            contributionService.remove("Customer" + version);
+            contributionService.remove("Retailer" + version);
+            contributionService.remove("Warehouse" + version);
+            contributionService.remove("Shipper" + version);
+
+
+            // Stop Components from my composite
+            for (Composite deployable : customerContribution.getDeployables() ) {
+                domain.getCompositeActivator().stop(deployable);
+                domain.getCompositeActivator().deactivate(deployable);
+            }
+
+        }
+        
+    }
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
new file mode 100644
index 0000000000..a2b3a7bc92
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
@@ -0,0 +1,240 @@
+/*
+ * 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 org.apache.tuscany.sca.contribution.osgi.test;
+
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
+import org.apache.tuscany.sca.contribution.resolver.ClassReference;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+
+/*
+ * 
+ * Supplychain using OSGi contributions, using default SCA resolver
+ * 
+ *    This test uses two sets of four contributions where each set contains a bundle corresponding
+ *    to the four components of supplychain (customer, retailer, warehouse and shipper).
+ *    Tests classes from the bundle used in <implementation.java/>, and the bundles themselves
+ *    used as the bundle in <implementation.osgi/>.
+ * 
+ * Notes:
+ *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
+ *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
+ *    
+ *    Notes:
+ *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
+ *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
+ *    
+ *    All dependent OSGi contribution bundles should be installed before the referring contribution.
+ *    Hence dependencies should be a tree and cannot contain cycles.
+ *    
+ *    For Jar files contained within OSGi bundles, Bundle-Classpath should be
+ *    set so that standard OSGi class resolution is sufficient to resolve classes containing in
+ *    nested jars or bundles.
+ */
+
+public class SCAResolverTestCase extends TestCase {
+
+
+    protected  EmbeddedSCADomain domain;
+    
+    private SupplyChain supplyChainV1;
+    private SupplyChain supplyChainV2;
+    
+    
+    protected String customerJarName = "Customer";
+    protected String retailerJarName = "Retailer";
+    protected String warehouseJarName = "Warehouse";
+    protected String shipperJarName = "Shipper";
+    
+    
+    
+    @Override
+    protected void setUp() throws Exception {
+    
+        setUpOSGi();
+        setUpSCA();
+    }
+        
+    protected void setUpOSGi() throws Exception {
+       OSGiTestUtil.setUpFelixTestRuntime();
+    }
+    
+    protected void setUpSCA() throws Exception {
+        //Create a test embedded SCA domain
+        ClassLoader cl = getClass().getClassLoader();
+        domain = new EmbeddedSCADomain(cl, "http://localhost");
+
+        //Start the domain
+        domain.start();
+
+        // Contribute the SCA contribution
+        ContributionService contributionService = domain.getContributionService();
+        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
+                contributionService, "V1");
+        supplyChainV1.setUpSCA();
+
+        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
+                contributionService, "V2");
+        supplyChainV2.setUpSCA();
+    }
+
+	
+
+	@Override
+    public void tearDown() throws Exception {
+
+
+        supplyChainV1.tearDownSCA();
+        supplyChainV2.tearDownSCA();
+        
+        domain.stop();
+
+        domain.close();
+        
+        OSGiTestUtil.shutdownOSGiRuntime();
+	}
+
+    
+    @SuppressWarnings("unchecked")
+    public void test() throws Exception {
+        
+        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
+        customerClassRef = supplyChainV1.customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
+        Class customerClass = customerClassRef.getJavaClass();
+        
+        Object customer = 
+            domain.getService(customerClass, "CustomerComponent");
+                
+        Method m = customerClass.getMethod("purchaseGoods");
+        m.invoke(customer);
+        
+        System.out.println("Sleeping ...");
+        Thread.sleep(1000);
+        
+        ClassReference customerClassRefV2 = new ClassReference("supplychain.customer.Customer");
+        customerClassRefV2 = supplyChainV2.customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRefV2);
+        Class customerClassV2 = customerClassRefV2.getJavaClass();
+        
+        Object customerV2 = 
+            domain.getService(customerClassV2, "CustomerComponentV2");
+                
+        Method mV2 = customerClassV2.getMethod("purchaseGoods");
+        mV2.invoke(customerV2);
+        
+        System.out.println("Sleeping ...");
+        Thread.sleep(2000);
+        
+        System.out.println("Test complete");
+        
+    }
+    
+    private class SupplyChain {
+        
+        private String folderName;
+        private ContributionService contributionService;
+        private String version;
+        
+        private Contribution customerContribution;
+        private Contribution retailerContribution;
+        private Contribution warehouseContribution;
+        private Contribution shipperContribution;
+        
+        
+        public SupplyChain(String folderName, ContributionService contributionService, String version) {
+            this.folderName = folderName;
+            this.contributionService = contributionService;
+            this.version = version;
+        }
+        
+        protected void setUpSCA() throws Exception {
+            File customerLocation = new File(folderName + "/" + customerJarName + version + ".jar");
+            URL customerContribURL = customerLocation.toURL();
+            File retailerLocation = new File(folderName + "/" + retailerJarName + version + ".jar");
+            URL retailerContribURL = retailerLocation.toURL();
+            File warehouseLocation = new File(folderName + "/" + warehouseJarName + version + ".jar");
+            URL warehouseContribURL = warehouseLocation.toURL();
+            File shipperLocation = new File(folderName + "/" + shipperJarName + version + ".jar");
+            URL shipperContribURL = shipperLocation.toURL();
+            
+            shipperContribution = contributionService.contribute("Shipper"
+                    + version, shipperContribURL, true);
+            warehouseContribution = contributionService.contribute("Warehouse"
+                    + version, warehouseContribURL, true);
+            retailerContribution = contributionService.contribute("Retailer"
+                    + version, retailerContribURL, true);
+            customerContribution = contributionService.contribute("Customer"
+                    + version, customerContribURL, true);
+            
+
+            for (Composite deployable : customerContribution.getDeployables()) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+
+            for (Composite deployable : retailerContribution.getDeployables() ) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+            for (Composite deployable : warehouseContribution.getDeployables() ) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+            for (Composite deployable : shipperContribution.getDeployables() ) {
+                domain.getDomainComposite().getIncludes().add(deployable);
+                domain.buildComposite(deployable);
+            }
+            
+            // Start Components from my composite
+            for (Composite deployable : customerContribution.getDeployables() ) {
+                domain.getCompositeActivator().activate(deployable);
+                domain.getCompositeActivator().start(deployable);
+            }
+        }
+
+        public void tearDownSCA() throws Exception {
+            // Remove the contribution from the in-memory repository
+            contributionService.remove("Customer" + version);
+            contributionService.remove("Retailer" + version);
+            contributionService.remove("Warehouse" + version);
+            contributionService.remove("Shipper" + version);
+
+
+            // Stop Components from my composite
+            for (Composite deployable : customerContribution.getDeployables() ) {
+                domain.getCompositeActivator().stop(deployable);
+                domain.getCompositeActivator().deactivate(deployable);
+            }
+
+        }
+        
+    }
+    
+}
diff --git a/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
new file mode 100644
index 0000000000..ea8d272a0c
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
@@ -0,0 +1,44 @@
+#
+# 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.    
+#
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.0.0, \
+ org.osgi.service.url; version=1.0.0 \
+ org.osgi.util.tracker; version=1.3.2 
+
+
+felix.auto.start.1= \     
+    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
+    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" 
+
+# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
+
+felix.startlevel.framework=1
+felix.startlevel.bundle=1
+
+#
+# Bundle config properties.
+#
+org.osgi.service.http.port=8080
+obr.shell.telnet=on
diff --git a/branches/trunk-20080910/itest/osgi-contribution/pom.xml b/branches/trunk-20080910/itest/osgi-contribution/pom.xml
new file mode 100644
index 0000000000..22a677925e
--- /dev/null
+++ b/branches/trunk-20080910/itest/osgi-contribution/pom.xml
@@ -0,0 +1,52 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-osgi</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany OSGi Contribution Tests</name>
+
+    <modules>
+        <module>contribution-classes</module>
+        <module>contribution-classes-v2</module>
+        <module>contribution-test</module>
+    </modules>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+</project>