Move the test into node-impl-osgi

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

98 files changed, 1834 insertions, 0 deletions

diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java
new file mode 100644
index 0000000000..b2d8ffb44c
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java
@@ -0,0 +1,74 @@
+/*
+ * 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 calculator.dosgi;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.logging.Logger;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+import calculator.dosgi.operations.AddService;
+
+/**
+ * 
+ */
+public class CalculatorActivator implements BundleActivator {
+    private Logger logger = Logger.getLogger(CalculatorActivator.class.getName());
+
+    private Bundle getBundle(BundleContext bundleContext, Class<?> cls) {
+        PackageAdmin packageAdmin = null;
+        // PackageAdmin is used to resolve bundles 
+        ServiceReference ref = bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin");
+        if (ref != null) {
+            packageAdmin = (PackageAdmin)bundleContext.getService(ref);
+            Bundle bundle = packageAdmin.getBundle(cls);
+            if (bundle != null) {
+                logger.info(cls.getName() + " is loaded by bundle: " + bundle.getSymbolicName());
+            }
+            bundleContext.ungetService(ref);
+            return bundle;
+        }
+        return null;
+    }
+
+    public void start(BundleContext context) throws Exception {
+        logger.info("Starting " + context.getBundle());
+        Dictionary<String, Object> props = new Hashtable<String, Object>();
+        props.put("sca.service", "CalculatorComponent#service-name(Calculator)");
+        props.put("calculator", "Calculator");
+        logger.info("Registering " + CalculatorService.class.getName());
+        CalculatorService calculator = new CalculatorServiceImpl(context);
+        context.registerService(CalculatorService.class.getName(), calculator, props);
+
+        getBundle(context, AddService.class);
+
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        logger.info("Stopping " + context.getBundle());
+        // Registered services will be automatically unregistered
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
new file mode 100644
index 0000000000..cc562b7c2f
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
@@ -0,0 +1,36 @@
+/*
+ * 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 calculator.dosgi;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The Calculator service interface.
+ */
+@Remotable
+public interface CalculatorService {
+
+    double add(double n1, double n2);
+
+    double subtract(double n1, double n2);
+
+    double multiply(double n1, double n2);
+
+    double divide(double n1, double n2);
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java
new file mode 100644
index 0000000000..9a1d64077b
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java
@@ -0,0 +1,113 @@
+/*
+ * 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 calculator.dosgi;
+
+import org.osgi.service.component.ComponentContext;
+
+import calculator.dosgi.operations.AddService;
+import calculator.dosgi.operations.DivideService;
+import calculator.dosgi.operations.MultiplyService;
+import calculator.dosgi.operations.SubtractService;
+
+/**
+ * An implementation of the Calculator service.
+ */
+public class CalculatorServiceDSImpl implements CalculatorService {
+    private AddService addService;
+    private SubtractService subtractService;
+    private MultiplyService multiplyService;
+    private DivideService divideService;
+
+    public CalculatorServiceDSImpl() {
+        super();
+        System.out.println("CalculatorServiceDSImpl()");
+    }
+
+    protected void activate(ComponentContext context) {
+        System.out.println("Activating " + context);
+    }
+
+    protected void deactivate(ComponentContext context) {
+        System.out.println("Deactivating " + context);
+    }
+
+    /*
+     * The following setters can be used for DS injection
+     */
+    public void setAddService(AddService addService) {
+        System.out.println("setAddService()");
+        this.addService = addService;
+    }
+
+    public void setSubtractService(SubtractService subtractService) {
+        this.subtractService = subtractService;
+    }
+
+    public void setDivideService(DivideService divideService) {
+        this.divideService = divideService;
+    }
+
+    public void setMultiplyService(MultiplyService multiplyService) {
+        this.multiplyService = multiplyService;
+    }
+
+    /*
+     * The following setters can be used for DS injection
+     */
+    public void unsetAddService(AddService addService) {
+        System.out.println("unsetAddService()");
+        this.addService = null;
+    }
+
+    public void unsetSubtractService(SubtractService subtractService) {
+        this.subtractService = null;
+    }
+
+    public void unsetDivideService(DivideService divideService) {
+        this.divideService = null;
+    }
+
+    public void unsetMultiplyService(MultiplyService multiplyService) {
+        this.multiplyService = null;
+    }    
+    private <T> T getService(Class<T> cls) {
+        for (Object s : new Object[] {addService, subtractService, multiplyService, divideService}) {
+            if (cls.isInstance(s)) {
+                return cls.cast(s);
+            }
+        }
+        throw new IllegalStateException(cls.getSimpleName() + " is not available");
+    }
+
+    public double add(double n1, double n2) {
+        return getService(AddService.class).add(n1, n2);
+    }
+
+    public double subtract(double n1, double n2) {
+        return getService(SubtractService.class).subtract(n1, n2);
+    }
+
+    public double multiply(double n1, double n2) {
+        return getService(MultiplyService.class).multiply(n1, n2);
+    }
+
+    public double divide(double n1, double n2) {
+        return getService(DivideService.class).divide(n1, n2);
+    }
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..9f31afbd1f
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
@@ -0,0 +1,104 @@
+/*
+ * 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 calculator.dosgi;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.util.tracker.ServiceTracker;
+
+import calculator.dosgi.operations.AddService;
+import calculator.dosgi.operations.DivideService;
+import calculator.dosgi.operations.MultiplyService;
+import calculator.dosgi.operations.SubtractService;
+
+/**
+ * An implementation of the Calculator service.
+ */
+public class CalculatorServiceImpl implements CalculatorService {
+//    private AddService addService;
+//    private SubtractService subtractService;
+//    private MultiplyService multiplyService;
+//    private DivideService divideService;
+
+    private ServiceTracker tracker;
+
+    public CalculatorServiceImpl() {
+        super();
+    }
+
+    public CalculatorServiceImpl(BundleContext context) {
+        super();
+        Filter filter = null;
+        try {
+            filter = context.createFilter("(" + Constants.OBJECTCLASS + "=calculator.dosgi.operations.*)");
+        } catch (InvalidSyntaxException e) {
+            e.printStackTrace();
+        }
+        this.tracker = new ServiceTracker(context, filter, null);
+        tracker.open();
+    }
+
+    /*
+     * The following setters can be used for DS injection
+     */
+    /*
+    public void setAddService(AddService addService) {
+        this.addService = addService;
+    }
+
+    public void setSubtractService(SubtractService subtractService) {
+        this.subtractService = subtractService;
+    }
+
+    public void setDivideService(DivideService divideService) {
+        this.divideService = divideService;
+    }
+
+    public void setMultiplyService(MultiplyService multiplyService) {
+        this.multiplyService = multiplyService;
+    }
+    */
+
+    private <T> T getService(Class<T> cls) {
+        for (Object s : tracker.getServices()) {
+            if (cls.isInstance(s)) {
+                return cls.cast(s);
+            }
+        }
+        throw new IllegalStateException(cls.getSimpleName() + " is not available");
+    }
+
+    public double add(double n1, double n2) {
+        return getService(AddService.class).add(n1, n2);
+    }
+
+    public double subtract(double n1, double n2) {
+        return getService(SubtractService.class).subtract(n1, n2);
+    }
+
+    public double multiply(double n1, double n2) {
+        return getService(MultiplyService.class).multiply(n1, n2);
+    }
+
+    public double divide(double n1, double n2) {
+        return getService(DivideService.class).divide(n1, n2);
+    }
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
new file mode 100644
index 0000000000..971500782f
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
@@ -0,0 +1,31 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The interface for the add service
+ */
+@Remotable
+public interface AddService {
+
+    double add(double n1, double n2);
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java
new file mode 100644
index 0000000000..6bdbfa5fb5
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Add service
+ */
+public class AddServiceImpl implements AddService {
+
+    public double add(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.INFO, "Adding " + n1 + " and " + n2);
+        return n1 + n2;
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
new file mode 100644
index 0000000000..49b8a1c0bf
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
@@ -0,0 +1,31 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The interface for the divide service
+ */
+@Remotable
+public interface DivideService {
+
+    double divide(double n1, double n2);
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java
new file mode 100644
index 0000000000..eafc9b0f4f
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Divide service.
+ */
+public class DivideServiceImpl implements DivideService {
+
+    public double divide(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.INFO, "Dividing " + n1 + " with " + n2);
+        return n1 / n2;
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
new file mode 100644
index 0000000000..f4e59d12ea
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
@@ -0,0 +1,31 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The interface for the multiply service
+ */
+@Remotable
+public interface MultiplyService {
+
+    double multiply(double n1, double n2);
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..c2e39ad2f4
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Multiply service.
+ */
+public class MultiplyServiceImpl implements MultiplyService {
+
+    public double multiply(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.INFO, "Multiplying " + n1 + " with " + n2);
+        return n1 * n2;
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java
new file mode 100644
index 0000000000..7db89cd98d
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java
@@ -0,0 +1,63 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.logging.Logger;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * 
+ */
+public class OperationsActivator implements BundleActivator {
+    private Logger logger = Logger.getLogger(OperationsActivator.class.getName());
+
+    public void start(BundleContext context) throws Exception {
+        logger.info("Starting " + context.getBundle());
+
+        Dictionary<String, Object> props = new Hashtable<String, Object>();
+
+        logger.info("Registering " + AddService.class.getName());
+        props.put("sca.service", "AddComponent#service-name(Add)");
+        context.registerService(AddService.class.getName(), new AddServiceImpl(), props);
+
+        logger.info("Registering " + SubtractService.class.getName());
+        props.put("sca.service", "SubtractComponent#service-name(Subtract)");
+        context.registerService(SubtractService.class.getName(), new SubtractServiceImpl(), props);
+
+        logger.info("Registering " + MultiplyService.class.getName());
+        props.put("sca.service", "MultiplyComponent#service-name(Multiply)");
+        context.registerService(MultiplyService.class.getName(), new MultiplyServiceImpl(), props);
+
+        logger.info("Registering " + DivideService.class.getName());
+        props.put("sca.service", "DivideComponent#service-name(Divide)");
+        context.registerService(DivideService.class.getName(), new DivideServiceImpl(), props);
+
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        logger.info("Stopping " + context.getBundle());
+        // Registered services will be automatically unregistered    
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
new file mode 100644
index 0000000000..bfb9b820f7
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
@@ -0,0 +1,31 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The interface for the subtract service
+ */
+@Remotable
+public interface SubtractService {
+
+    double subtract(double n1, double n2);
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java
new file mode 100644
index 0000000000..64cc776884
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator.dosgi.operations;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the subtract service.
+ */
+public class SubtractServiceImpl implements SubtractService {
+
+    public double subtract(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.INFO, "Subtracting " + n1 + " from " + n2);
+        return n1 - n2;
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
new file mode 100644
index 0000000000..8e39625dfa
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
@@ -0,0 +1,242 @@
+/*
+ * 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 calculator.dosgi.test;
+
+import java.io.File;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleContributionScanner;
+import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
+import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
+import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost;
+import org.apache.tuscany.sca.node.osgi.impl.NodeImpl;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import calculator.dosgi.CalculatorActivator;
+import calculator.dosgi.CalculatorService;
+import calculator.dosgi.CalculatorServiceDSImpl;
+import calculator.dosgi.CalculatorServiceImpl;
+import calculator.dosgi.operations.AddService;
+import calculator.dosgi.operations.AddServiceImpl;
+import calculator.dosgi.operations.DivideService;
+import calculator.dosgi.operations.DivideServiceImpl;
+import calculator.dosgi.operations.MultiplyService;
+import calculator.dosgi.operations.MultiplyServiceImpl;
+import calculator.dosgi.operations.OperationsActivator;
+import calculator.dosgi.operations.SubtractService;
+import calculator.dosgi.operations.SubtractServiceImpl;
+
+/**
+ * 
+ */
+public class CalculatorOSGiNodeTestCase {
+    private static EquinoxHost host;
+    private static BundleContext context;
+
+    public static URL getCodeLocation(final Class<?> anchorClass) {
+        return AccessController.doPrivileged(new PrivilegedAction<URL>() {
+            public URL run() {
+                return anchorClass.getProtectionDomain().getCodeSource().getLocation();
+            }
+        });
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        try {
+            Set<URL> bundles = new HashSet<URL>();
+
+            File plugins = new File("target/test-classes/plugins");
+            for (File f : plugins.listFiles()) {
+                if (f.isFile()) {
+                    bundles.add(f.toURI().toURL());
+                }
+            }
+
+            bundles.add(getCodeLocation(OSGiImplementation.class));
+            bundles.add(getCodeLocation(OSGiBundleContributionScanner.class));
+            bundles.add(getCodeLocation(NodeImpl.class));
+
+            bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar",
+                                                     "calculator/dosgi/META-INF/MANIFEST.MF",
+                                                     new String[][] {
+                                                                     {"OSGI-INF/calculator-component.xml", null},
+                                                                     {"calculator/dosgi/bundle.componentType",
+                                                                      "OSGI-INF/sca/bundle.componentType"},
+                                                                     {"calculator/dosgi/calculator.composite",
+                                                                      "OSGI-INF/sca/bundle.composite"}},
+                                                     CalculatorService.class,
+                                                     CalculatorServiceImpl.class,
+                                                     CalculatorServiceDSImpl.class,
+                                                     CalculatorActivator.class));
+
+            bundles.add(OSGiTestBundles
+                .createBundle("target/test-classes/operations-bundle.jar",
+                              "calculator/dosgi/operations/META-INF/MANIFEST.MF",
+                              new String[][] {
+                                              {"OSGI-INF/add-component.xml", null},
+                                              {"OSGI-INF/subtract-component.xml", null},
+                                              {"OSGI-INF/multiply-component.xml", null},
+                                              {"OSGI-INF/divide-component.xml", null},
+                                              {"calculator/dosgi/operations/bundle.componentType",
+                                               "OSGI-INF/sca/bundle.componentType"},
+                                              {"calculator/dosgi/operations/operations.composite",
+                                               "OSGI-INF/sca/bundle.composite"}},
+                              OperationsActivator.class,
+                              AddService.class,
+                              AddServiceImpl.class,
+                              SubtractService.class,
+                              SubtractServiceImpl.class,
+                              MultiplyService.class,
+                              MultiplyServiceImpl.class,
+                              DivideService.class,
+                              DivideServiceImpl.class));
+            host = new EquinoxHost();
+            context = host.start();
+            for (URL loc : bundles) {
+                host.installBundle(loc, null);
+            }
+            for (Bundle b : context.getBundles()) {
+                if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName()
+                    .startsWith("org.apache.tuscany.sca.")) {
+                    try {
+                        b.start();
+                    } catch (Exception e) {
+                        System.out.println(string(b, false));
+                        e.printStackTrace();
+                    }
+                    System.out.println(string(b, false));
+                }
+            }
+            for (Bundle b : context.getBundles()) {
+                if (b.getSymbolicName().equals("calculator.dosgi")) {
+                    b.start();
+                    System.out.println(string(b, false));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    private static <T> T cast(Object obj, Class<T> cls) {
+        if (cls.isInstance(obj)) {
+            return cls.cast(obj);
+        } else {
+            return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(),
+                                                   new Class<?>[] {cls},
+                                                   new InvocationHandlerImpl(obj)));
+        }
+    }
+
+    private static class InvocationHandlerImpl implements InvocationHandler {
+        private Object instance;
+
+        public InvocationHandlerImpl(Object instance) {
+            super();
+            this.instance = instance;
+        }
+
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
+            return m.invoke(instance, args);
+        }
+
+    }
+
+    @Test
+    public void testOSGi() {
+        ServiceReference ref = context.getServiceReference(CalculatorService.class.getName());
+        Assert.assertNotNull(ref);
+        Object service = context.getService(ref);
+        Assert.assertNotNull(service);
+        CalculatorService calculator = cast(service, CalculatorService.class);
+        System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0));
+        System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0));
+        System.out.println("2.0 * 1.0 = " + calculator.multiply(2.0, 1.0));
+        System.out.println("2.0 / 1.0 = " + calculator.divide(2.0, 1.0));
+    }
+
+    /**
+     * Returns a string representation of the given bundle.
+     * 
+     * @param b
+     * @param verbose
+     * @return
+     */
+    static String string(Bundle bundle, boolean verbose) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName());
+        int s = bundle.getState();
+        if ((s & Bundle.UNINSTALLED) != 0) {
+            sb.append(" UNINSTALLED");
+        }
+        if ((s & Bundle.INSTALLED) != 0) {
+            sb.append(" INSTALLED");
+        }
+        if ((s & Bundle.RESOLVED) != 0) {
+            sb.append(" RESOLVED");
+        }
+        if ((s & Bundle.STARTING) != 0) {
+            sb.append(" STARTING");
+        }
+        if ((s & Bundle.STOPPING) != 0) {
+            sb.append(" STOPPING");
+        }
+        if ((s & Bundle.ACTIVE) != 0) {
+            sb.append(" ACTIVE");
+        }
+
+        if (verbose) {
+            sb.append(" ").append(bundle.getLocation());
+            sb.append(" ").append(bundle.getHeaders());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        if (host != null) {
+            host.stop();
+            context = null;
+        }
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
new file mode 100644
index 0000000000..8f9162c749
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
@@ -0,0 +1,211 @@
+/*
+ * 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 calculator.dosgi.test;
+
+import java.io.File;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
+import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import calculator.dosgi.CalculatorActivator;
+import calculator.dosgi.CalculatorService;
+import calculator.dosgi.CalculatorServiceDSImpl;
+import calculator.dosgi.CalculatorServiceImpl;
+import calculator.dosgi.operations.AddService;
+import calculator.dosgi.operations.AddServiceImpl;
+import calculator.dosgi.operations.DivideService;
+import calculator.dosgi.operations.DivideServiceImpl;
+import calculator.dosgi.operations.MultiplyService;
+import calculator.dosgi.operations.MultiplyServiceImpl;
+import calculator.dosgi.operations.OperationsActivator;
+import calculator.dosgi.operations.SubtractService;
+import calculator.dosgi.operations.SubtractServiceImpl;
+
+/**
+ * 
+ */
+public class CalculatorOSGiTestCase {
+    private static EquinoxHost host;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        Set<URL> bundles = new HashSet<URL>();
+
+        File plugins = new File("target/test-classes/plugins");
+        for (File f : plugins.listFiles()) {
+            if (f.isFile()) {
+                bundles.add(f.toURI().toURL());
+            }
+        }
+
+        bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar",
+                                                 "calculator/dosgi/META-INF/MANIFEST.MF",
+                                                 new String[][] {
+                                                                 {"OSGI-INF/calculator-component.xml", null},
+                                                                 {"calculator/dosgi/bundle.componentType",
+                                                                  "OSGI-INF/sca/bundle.componentType"},
+                                                                 {"calculator/dosgi/calculator.composite",
+                                                                  "OSGI-INF/sca/bundle.composite"}},
+                                                 CalculatorService.class,
+                                                 CalculatorServiceImpl.class,
+                                                 CalculatorServiceDSImpl.class,
+                                                 CalculatorActivator.class));
+
+        bundles.add(OSGiTestBundles
+            .createBundle("target/test-classes/operations-bundle.jar",
+                          "calculator/dosgi/operations/META-INF/MANIFEST.MF",
+                          new String[][] {
+                                          {"OSGI-INF/add-component.xml", null},
+                                          {"OSGI-INF/subtract-component.xml", null},
+                                          {"OSGI-INF/multiply-component.xml", null},
+                                          {"OSGI-INF/divide-component.xml", null},
+                                          {"calculator/dosgi/operations/bundle.componentType",
+                                           "OSGI-INF/sca/bundle.componentType"},
+                                          {"calculator/dosgi/operations/operations.composite",
+                                           "OSGI-INF/sca/bundle.composite"}},
+                          OperationsActivator.class,
+                          AddService.class,
+                          AddServiceImpl.class,
+                          SubtractService.class,
+                          SubtractServiceImpl.class,
+                          MultiplyService.class,
+                          MultiplyServiceImpl.class,
+                          DivideService.class,
+                          DivideServiceImpl.class));
+        try {
+            host = new EquinoxHost(bundles);
+            BundleContext context = host.start();
+            for (Bundle b : context.getBundles()) {
+                if (b.getSymbolicName().equals("org.eclipse.equinox.ds")) {
+                    b.start();
+                    System.out.println(string(b, false));
+                }
+            }
+            for (Bundle b : context.getBundles()) {
+                if (b.getSymbolicName().startsWith("calculator.dosgi")) {
+                    b.start();
+                    System.out.println(string(b, false));
+                }
+            }
+            ServiceReference ref = context.getServiceReference(CalculatorService.class.getName());
+            CalculatorService calculator = cast(context.getService(ref), CalculatorService.class);
+            System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0));
+            System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0));
+            System.out.println("2.0 * 1.0 = " + calculator.multiply(2.0, 1.0));
+            System.out.println("2.0 / 1.0 = " + calculator.divide(2.0, 1.0));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    private static <T> T cast(Object obj, Class<T> cls) {
+        if (cls.isInstance(obj)) {
+            return cls.cast(obj);
+        } else {
+            return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(),
+                                                   new Class<?>[] {cls},
+                                                   new InvocationHandlerImpl(obj)));
+        }
+    }
+
+    private static class InvocationHandlerImpl implements InvocationHandler {
+        private Object instance;
+
+        public InvocationHandlerImpl(Object instance) {
+            super();
+            this.instance = instance;
+        }
+
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
+            return m.invoke(instance, args);
+        }
+
+    }
+
+    @Test
+    public void testOSGi() {
+
+    }
+
+    /**
+     * Returns a string representation of the given bundle.
+     * 
+     * @param b
+     * @param verbose
+     * @return
+     */
+    static String string(Bundle bundle, boolean verbose) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName());
+        int s = bundle.getState();
+        if ((s & Bundle.UNINSTALLED) != 0) {
+            sb.append(" UNINSTALLED");
+        }
+        if ((s & Bundle.INSTALLED) != 0) {
+            sb.append(" INSTALLED");
+        }
+        if ((s & Bundle.RESOLVED) != 0) {
+            sb.append(" RESOLVED");
+        }
+        if ((s & Bundle.STARTING) != 0) {
+            sb.append(" STARTING");
+        }
+        if ((s & Bundle.STOPPING) != 0) {
+            sb.append(" STOPPING");
+        }
+        if ((s & Bundle.ACTIVE) != 0) {
+            sb.append(" ACTIVE");
+        }
+
+        if (verbose) {
+            sb.append(" ").append(bundle.getLocation());
+            sb.append(" ").append(bundle.getHeaders());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        if (host != null) {
+            host.stop();
+        }
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
new file mode 100644
index 0000000000..e95629c611
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
@@ -0,0 +1,84 @@
+/*
+ * 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.implementation.osgi.runtime;
+
+import java.io.File;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+
+import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
+import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestImpl;
+import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
+import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * 
+ * Test the execution of an OSGi implementation type
+ *
+ * @version $Rev$ $Date$
+ */
+public class OSGiTestCase {
+    private static NodeLauncher host;
+    private static Node node;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        host = NodeLauncher.newInstance();
+        String compositeName = "osgitest.composite";
+        URL bundle =
+            OSGiTestBundles.createBundle("target/test-classes/OSGiTestService.jar",
+                                         "osgi.test",
+                                         null,
+                                         null,
+                                         (String[])null,
+                                         OSGiTestImpl.class,
+                                         OSGiTestInterface.class);
+
+        node =
+            host.createNode(compositeName, new Contribution("c1", new File("target/test-classes").toURI().toString()));
+        node.start();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        if (host != null) {
+            node.stop();
+            host.destroy();
+        }
+    }
+
+    @Test
+    public void testOSGiComponent() throws Exception {
+
+        OSGiTestInterface testService = node.getService(OSGiTestInterface.class, "OSGiTestServiceComponent");
+        assert (testService != null);
+
+        assert (testService instanceof Proxy);
+
+        String str = testService.testService();
+        System.out.println(str);
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
new file mode 100644
index 0000000000..aad5772037
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
@@ -0,0 +1,183 @@
+/*
+ * 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.implementation.osgi.test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.Constants;
+
+/**
+ * 
+ * Utility class to create OSGi bundles
+ *
+ * @version $Rev$ $Date$
+ */
+public class OSGiTestBundles {
+    private static String getPackageName(Class<?> cls) {
+        String name = cls.getName();
+        int index = name.lastIndexOf('.');
+        return index == -1 ? "" : name.substring(0, index);
+    }
+
+    public static URL createBundle(String jarName, String mfFile, String[][] resources, Class<?>... classes)
+        throws IOException {
+        InputStream is = OSGiTestBundles.class.getClassLoader().getResourceAsStream(mfFile);
+        Manifest manifest = new Manifest(is);
+        is.close();
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        JarOutputStream jarOut = new JarOutputStream(out, manifest);
+
+        for (Class<?> cls : classes) {
+            addClass(jarOut, cls);
+        }
+
+        if (resources != null) {
+            for (String resource[] : resources) {
+                addResource(jarOut, OSGiTestBundles.class.getClassLoader(), resource[0], resource[1]);
+            }
+        }
+
+        jarOut.close();
+        out.close();
+
+        File jar = new File(jarName);
+        FileOutputStream fileOut = new FileOutputStream(jar);
+        fileOut.write(out.toByteArray());
+        fileOut.close();
+
+        return jar.toURI().toURL();
+    }
+
+    public static URL createBundle(String jarName,
+                                   String bundleName,
+                                   String exports,
+                                   String imports,
+                                   String[] resources,
+                                   Class<?>... classes) throws IOException {
+
+        Class<?> activator = null;
+        Set<String> packages = new HashSet<String>();
+        StringBuffer exportPackages = new StringBuffer();
+        if (exports != null) {
+            exportPackages.append(exports);
+        }
+        for (Class<?> cls : classes) {
+            if (BundleActivator.class.isAssignableFrom(cls)) {
+                activator = cls;
+            }
+            if (exports == null && cls.isInterface()) {
+                String pkg = getPackageName(cls);
+                if (packages.add(pkg)) {
+                    exportPackages.append(pkg).append(",");
+                }
+            }
+        }
+        int len = exportPackages.length();
+        if (len > 0 && exportPackages.charAt(len - 1) == ',') {
+            exportPackages.deleteCharAt(len - 1);
+        }
+
+        Manifest manifest = new Manifest();
+        // This attribute Manifest-Version is required so that the MF will be added to the jar
+        manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
+        manifest.getMainAttributes().putValue(Constants.BUNDLE_MANIFESTVERSION, "2");
+        manifest.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, bundleName);
+        manifest.getMainAttributes().putValue(Constants.BUNDLE_VERSION, "1.0.0");
+        manifest.getMainAttributes().putValue(Constants.BUNDLE_NAME, bundleName);
+        manifest.getMainAttributes().putValue(Constants.EXPORT_PACKAGE, exportPackages.toString());
+        StringBuffer importPackages = new StringBuffer();
+        if (imports != null) {
+            importPackages.append(imports).append(",org.osgi.framework");
+        } else {
+            importPackages.append("org.osgi.framework");
+        }
+        manifest.getMainAttributes().putValue(Constants.IMPORT_PACKAGE, importPackages.toString());
+
+        if (activator != null) {
+            manifest.getMainAttributes().putValue(Constants.BUNDLE_ACTIVATOR, activator.getName());
+        }
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        JarOutputStream jarOut = new JarOutputStream(out, manifest);
+
+        for (Class<?> cls : classes) {
+            addClass(jarOut, cls);
+        }
+
+        if (resources != null) {
+            for (String resource : resources) {
+                addResource(jarOut, OSGiTestBundles.class.getClassLoader(), resource, null);
+            }
+        }
+
+        jarOut.close();
+        out.close();
+
+        File jar = new File(jarName);
+        FileOutputStream fileOut = new FileOutputStream(jar);
+        fileOut.write(out.toByteArray());
+        fileOut.close();
+
+        return jar.toURI().toURL();
+    }
+
+    private static void addClass(JarOutputStream jarOut, Class<?> javaClass) throws IOException, FileNotFoundException {
+        String classFile = javaClass.getName().replace('.', '/') + ".class";
+        URL url = javaClass.getResource(javaClass.getSimpleName() + ".class");
+        addEntry(jarOut, url, classFile);
+    }
+
+    private static void addResource(JarOutputStream jarOut, ClassLoader cl, String resourceName, String entryName)
+        throws IOException, FileNotFoundException {
+        URL url = cl.getResource(resourceName);
+        if (entryName == null) {
+            entryName = resourceName;
+        }
+        addEntry(jarOut, url, entryName);
+    }
+
+    private static void addEntry(JarOutputStream jarOut, URL url, String resourceName) throws IOException,
+        FileNotFoundException {
+        String path = url.getPath();
+
+        ZipEntry ze = new ZipEntry(resourceName);
+
+        jarOut.putNextEntry(ze);
+        FileInputStream file = new FileInputStream(path);
+        byte[] fileContents = new byte[file.available()];
+        file.read(fileContents);
+        jarOut.write(fileContents);
+        jarOut.closeEntry();
+    }
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
new file mode 100644
index 0000000000..f6db6edc12
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
@@ -0,0 +1,50 @@
+/*
+ * 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.implementation.osgi.test;
+
+import java.util.Hashtable;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * 
+ * Test class - Implementation of an OSGi service
+ *
+ * @version $Rev$ $Date$
+ */
+public class OSGiTestImpl implements OSGiTestInterface, BundleActivator {
+
+    public String testService() {
+
+        return OSGiTestImpl.class.getName();
+
+    }
+
+    public void start(BundleContext bc) throws Exception {
+
+        bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
+
+    }
+
+    public void stop(BundleContext bc) throws Exception {
+    }
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
new file mode 100644
index 0000000000..499ec8082e
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
@@ -0,0 +1,32 @@
+/*
+ * 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.implementation.osgi.test;
+
+/**
+ *
+ * Test class - Interface for an OSGi service
+ *
+ * @version $Rev$ $Date$
+ */
+public interface OSGiTestInterface {
+
+    String testService() throws Exception;
+
+}
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml
new file mode 100644
index 0000000000..a7d563023c
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml
@@ -0,0 +1,25 @@
+<?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.    
+-->
+<scr:component name="AddComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <implementation class="calculator.dosgi.operations.AddServiceImpl" />
+    <service>
+        <provide interface="calculator.dosgi.operations.AddService" />
+    </service>
+</scr:component>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml
new file mode 100644
index 0000000000..3e537df732
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml
@@ -0,0 +1,36 @@
+<?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.    
+-->
+<scr:component name="CalculatorComponent" 
+               xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <implementation class="calculator.dosgi.CalculatorServiceDSImpl" />
+    <service>
+        <provide interface="calculator.dosgi.CalculatorService" />
+    </service>
+
+    <reference name="addService" interface="calculator.dosgi.operations.AddService" bind="setAddService" unbind="unsetAddService"
+        policy="dynamic" />
+    <reference name="subtractService" interface="calculator.dosgi.operations.SubtractService" bind="setSubtractService"
+        unbind="unsetSubtractService" policy="dynamic" />
+    <reference name="multiplyService" interface="calculator.dosgi.operations.MultiplyService" bind="setMultiplyService"
+        unbind="unsetMultiplyService" policy="dynamic" />
+    <reference name="divideService" interface="calculator.dosgi.operations.DivideService" bind="setDivideService"
+        unbind="unsetDivideService" policy="dynamic" />
+
+</scr:component>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml
new file mode 100644
index 0000000000..def7fce23c
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml
@@ -0,0 +1,25 @@
+<?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.    
+-->
+<scr:component name="DivideComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <implementation class="calculator.dosgi.operations.DivideServiceImpl" />
+    <service>
+        <provide interface="calculator.dosgi.operations.DivideService" />
+    </service>
+</scr:component>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml
new file mode 100644
index 0000000000..57f627f990
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml
@@ -0,0 +1,25 @@
+<?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.    
+-->
+<scr:component name="MultiplyComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <implementation class="calculator.dosgi.operations.MultiplyServiceImpl" />
+    <service>
+        <provide interface="calculator.dosgi.operations.MultiplyService" />
+    </service>
+</scr:component>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml
new file mode 100644
index 0000000000..073ee5ea40
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml
@@ -0,0 +1,25 @@
+<?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.    
+-->
+<scr:component name="SubtractComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <implementation class="calculator.dosgi.operations.SubtractServiceImpl" />
+    <service>
+        <provide interface="calculator.dosgi.operations.SubtractService" />
+    </service>
+</scr:component>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..5a4db21087
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0

+Export-Package: calculator.dosgi;version="1.0.0"

+Bundle-Version: 1.0.0

+Bundle-Name: calculator.dosgi

+Bundle-Activator: calculator.dosgi.CalculatorActivator

+Bundle-ManifestVersion: 2

+Import-Package: calculator.dosgi.operations;version="1.0.0",

+ org.osgi.framework,

+ org.osgi.service.packageadmin,

+ org.osgi.util.tracker,

+ org.osgi.service.component;resolution:=optional

+Bundle-SymbolicName: calculator.dosgi

+Bundle-Vendor: The Apache Software Foundation

+Bundle-ActivationPolicy: lazy

+Eclipse-LazyStart: true

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-DocURL: http://www.apache.org/

+Service-Component: OSGI-INF/calculator-component.xml

+

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
new file mode 100644
index 0000000000..7860094626
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
@@ -0,0 +1,54 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200903" 

+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+               xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">

+    <!-- The service elment defines an SCA view of the OSGi service -->

+    <service name="Calculator">

+        <!-- The interface will be mapped into the OSGi service class -->

+        <interface.java interface="calculator.dosgi.CalculatorService"/>

+        <!-- The list of OSGi properties -->

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </service>

+    

+    <!-- The reference elment defines an SCA proxy to a remote OSGi service -->

+    <reference name="addService">

+        <interface.java interface="calculator.dosgi.operations.AddService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </reference>

+    <reference name="subtractService">

+        <interface.java interface="calculator.dosgi.operations.SubtractService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </reference>

+    <reference name="multiplyService">

+        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </reference>

+    <reference name="divideService">

+        <interface.java interface="calculator.dosgi.operations.DivideService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </reference>

+    

+</componentType>

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
new file mode 100644
index 0000000000..bc054b7db8
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
@@ -0,0 +1,53 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200903" 

+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

+    targetNamespace="http://calculator.dosgi" 

+    name="CalculatorComposite">

+

+    <component name="CalculatorComponent">

+        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />

+        <reference name="addService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/AddService"/>

+        </reference>

+        <reference name="subtractService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/SubtractService"/>

+        </reference>

+        <reference name="multiplyService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/MultiplyService"/>

+        </reference>

+        <reference name="divideService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/DivideService"/>

+        </reference>

+        

+        <!-- 

+        <reference name="addService" target="OperationsComponent/AddService">

+        </reference>

+        <reference name="subtractService" target="OperationsComponent/SubtractService">

+        </reference>

+        <reference name="multiplyService" target="OperationsComponent/MultiplyService">

+        </reference>

+        <reference name="divideService" target="OperationsComponent/DivideService">

+        </reference>

+         -->

+    </component>

+

+</composite>

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..eb15e778b1
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0

+Export-Package: calculator.dosgi.operations;version="1.0.0"

+Bundle-Version: 1.0.0

+Bundle-Name: calculator.dosgi.operations

+Bundle-Activator: calculator.dosgi.operations.OperationsActivator

+Bundle-ManifestVersion: 2

+Import-Package: calculator.dosgi.operations;version="1.0.0",

+ org.osgi.framework,

+ org.osgi.service.component;resolution:=optional

+Bundle-SymbolicName: calculator.dosgi.operations

+Bundle-Vendor: The Apache Software Foundation

+Bundle-ActivationPolicy: lazy

+Eclipse-LazyStart: true

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-DocURL: http://www.apache.org/

+Service-Component: OSGI-INF/add-component.xml,

+ OSGI-INF/subtract-component.xml,

+ OSGI-INF/multiply-component.xml,

+ OSGI-INF/divide-component.xml

+

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
new file mode 100644
index 0000000000..6f6f4bdce6
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
@@ -0,0 +1,47 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200903" 

+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+               xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">

+

+    

+    <!-- The service elment defines an SCA proxy to a remote OSGi service -->

+    <service name="AddService">

+        <interface.java interface="calculator.dosgi.operations.AddService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </service>

+    <service name="SubtractService">

+        <interface.java interface="calculator.dosgi.operations.SubtractService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </service>

+    <service name="MultiplyService">

+        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </service>

+    <service name="DivideService">

+        <interface.java interface="calculator.dosgi.operations.DivideService"/>

+        <t:osgi.property name="prop1">1</t:osgi.property>

+        <t:osgi.property name="prop2">ABC</t:osgi.property>

+    </service>

+    

+</componentType>

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
new file mode 100644
index 0000000000..c9fb3818b8
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
@@ -0,0 +1,43 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200903" 

+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

+    targetNamespace="http://calculator.dosgi" 

+    name="OperationsComposite">

+

+    <component name="OperationsComponent">

+        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />

+        <service name="AddService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>

+        </service>

+        <service name="SubtractService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>

+        </service>

+        <service name="MultiplyService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>

+        </service>

+        <service name="DivideService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>

+        </service>

+        

+    </component>

+

+</composite>

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/configuration/.options b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/configuration/.options
new file mode 100644
index 0000000000..8559d89634
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/configuration/.options
@@ -0,0 +1,2 @@
+org.eclipse.equinox.ds/debug=true

+org.eclipse.equinox.ds/print_on_console=true

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/configuration/config.ini b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/configuration/config.ini
new file mode 100644
index 0000000000..e18b59db54
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/configuration/config.ini
@@ -0,0 +1,4 @@
+osgi.bundles=calculator-bundle.jar,operations-bundle.jar,javax.servlet.jsp_2.0.0.v200806031607.jar,javax.servlet_2.4.0.v200806031604.jar,org.apache.commons.el_1.0.0.v200806031608.jar,org.apache.commons.logging_1.0.4.v20080605-1930.jar,org.apache.jasper_5.5.17.v200806031609.jar,org.eclipse.equinox.app_1.1.0.v20080421-2006.jar,org.eclipse.equinox.cm_1.0.0.v20080509-1800.jar,org.eclipse.equinox.common_3.4.0.v20080421-2006.jar,org.eclipse.equinox.device_1.0.1.v20080303.jar,org.eclipse.equinox.ds_1.0.0.v20080427-0830.jar,org.eclipse.equinox.event_1.1.0.v20080225.jar,org.eclipse.equinox.http.jetty_1.1.0.v20080425.jar,org.eclipse.equinox.http.registry_1.0.100.v20080427-0830.jar,org.eclipse.equinox.http.servletbridge_1.0.0.v20080427-0830.jar,org.eclipse.equinox.http.servlet_1.0.100.v20080427-0830.jar,org.eclipse.equinox.http_1.0.200.v20080421-2006.jar,org.eclipse.equinox.io_1.0.0.v20080218.jar,org.eclipse.equinox.ip_1.0.0.v20080218.jar,org.eclipse.equinox.jsp.jasper.registry_1.0.0.v20080427-0830.jar,org.eclipse.equinox.jsp.jasper_1.0.100.v20080427-0830.jar,org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar,org.eclipse.equinox.log_1.1.0.v20080414.jar,org.eclipse.equinox.metatype_1.0.0.v20070827.jar,org.eclipse.equinox.preferences_3.2.200.v20080421-2006.jar,org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar,org.eclipse.equinox.servletbridge_1.0.100.v20080427-0830.jar,org.eclipse.equinox.simpleconfigurator_1.0.0.v20080604.jar,org.eclipse.equinox.transforms.hook_1.0.0.v20080610.jar,org.eclipse.equinox.transforms.xslt_1.0.0.v20080610.jar,org.eclipse.equinox.useradmin_1.1.0.v20080508-1815.jar,org.eclipse.equinox.util_1.0.0.v20080414.jar,org.eclipse.equinox.wireadmin_1.0.0.v20080407.jar,org.eclipse.osgi.services_3.1.200.v20071203.jar,org.eclipse.osgi.util_3.1.300.v20080303.jar,org.eclipse.osgi_3.4.0.v20080605-1900.jar,org.mortbay.jetty_5.1.14.v200806031611.jar

+eclipse.ignoreApp=true

+osgi.noShutdown=true

+osgi.console=
\ No newline at end of file
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/javax.servlet.jsp_2.0.0.v200806031607.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/javax.servlet.jsp_2.0.0.v200806031607.jar
new file mode 100644
index 0000000000..a303c2e0d9
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/javax.servlet.jsp_2.0.0.v200806031607.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/javax.servlet_2.4.0.v200806031604.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/javax.servlet_2.4.0.v200806031604.jar
new file mode 100644
index 0000000000..9a9baa3daa
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/javax.servlet_2.4.0.v200806031604.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.commons.el_1.0.0.v200806031608.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.commons.el_1.0.0.v200806031608.jar
new file mode 100644
index 0000000000..9d33af9179
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.commons.el_1.0.0.v200806031608.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.commons.logging_1.0.4.v20080605-1930.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.commons.logging_1.0.4.v20080605-1930.jar
new file mode 100644
index 0000000000..20829286c0
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.commons.logging_1.0.4.v20080605-1930.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.jasper_5.5.17.v200806031609.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.jasper_5.5.17.v200806031609.jar
new file mode 100644
index 0000000000..529d4d0561
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.apache.jasper_5.5.17.v200806031609.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.app.source_1.1.0.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.app.source_1.1.0.v20080421-2006.jar
new file mode 100644
index 0000000000..c2803db4b4
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.app.source_1.1.0.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
new file mode 100644
index 0000000000..4639bb5dfd
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.cm.source_1.0.0.v20080509-1800.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.cm.source_1.0.0.v20080509-1800.jar
new file mode 100644
index 0000000000..1d1b412158
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.cm.source_1.0.0.v20080509-1800.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.cm_1.0.0.v20080509-1800.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.cm_1.0.0.v20080509-1800.jar
new file mode 100644
index 0000000000..866cb3af8a
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.cm_1.0.0.v20080509-1800.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.common.source_3.4.0.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.common.source_3.4.0.v20080421-2006.jar
new file mode 100644
index 0000000000..bf97f3f594
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.common.source_3.4.0.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
new file mode 100644
index 0000000000..ecac7a850d
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.device.source_1.0.1.v20080303.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.device.source_1.0.1.v20080303.jar
new file mode 100644
index 0000000000..a3bfeaa994
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.device.source_1.0.1.v20080303.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.device_1.0.1.v20080303.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.device_1.0.1.v20080303.jar
new file mode 100644
index 0000000000..8ce53ee3a1
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.device_1.0.1.v20080303.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ds.source_1.0.0.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ds.source_1.0.0.v20080427-0830.jar
new file mode 100644
index 0000000000..e847e62731
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ds.source_1.0.0.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ds_1.0.0.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ds_1.0.0.v20080427-0830.jar
new file mode 100644
index 0000000000..ca83661a5f
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ds_1.0.0.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.event.source_1.1.0.v20080225.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.event.source_1.1.0.v20080225.jar
new file mode 100644
index 0000000000..5b9c259523
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.event.source_1.1.0.v20080225.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.event_1.1.0.v20080225.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.event_1.1.0.v20080225.jar
new file mode 100644
index 0000000000..f1d9895537
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.event_1.1.0.v20080225.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.jetty.source_1.1.0.v20080425.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.jetty.source_1.1.0.v20080425.jar
new file mode 100644
index 0000000000..5064c28d69
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.jetty.source_1.1.0.v20080425.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.jetty_1.1.0.v20080425.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.jetty_1.1.0.v20080425.jar
new file mode 100644
index 0000000000..d7dba0debb
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.jetty_1.1.0.v20080425.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.registry.source_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.registry.source_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..f7afe5c68f
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.registry.source_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.registry_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.registry_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..8dacd12328
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.registry_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servlet.source_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servlet.source_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..6a840067c6
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servlet.source_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servlet_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servlet_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..ea863aafde
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servlet_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servletbridge.source_1.0.0.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servletbridge.source_1.0.0.v20080427-0830.jar
new file mode 100644
index 0000000000..f1bdc3c295
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servletbridge.source_1.0.0.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servletbridge_1.0.0.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servletbridge_1.0.0.v20080427-0830.jar
new file mode 100644
index 0000000000..2b48432ce6
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.servletbridge_1.0.0.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.source_1.0.200.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.source_1.0.200.v20080421-2006.jar
new file mode 100644
index 0000000000..15ed161125
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http.source_1.0.200.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http_1.0.200.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http_1.0.200.v20080421-2006.jar
new file mode 100644
index 0000000000..1aed3c0890
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.http_1.0.200.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.io.source_1.0.0.v20080218.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.io.source_1.0.0.v20080218.jar
new file mode 100644
index 0000000000..95b0273472
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.io.source_1.0.0.v20080218.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.io_1.0.0.v20080218.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.io_1.0.0.v20080218.jar
new file mode 100644
index 0000000000..1296e1f0fe
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.io_1.0.0.v20080218.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ip.source_1.0.0.v20080218.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ip.source_1.0.0.v20080218.jar
new file mode 100644
index 0000000000..5874d141c5
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ip.source_1.0.0.v20080218.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ip_1.0.0.v20080218.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ip_1.0.0.v20080218.jar
new file mode 100644
index 0000000000..4873686e07
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.ip_1.0.0.v20080218.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.registry.source_1.0.0.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.registry.source_1.0.0.v20080427-0830.jar
new file mode 100644
index 0000000000..45d9330ad9
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.registry.source_1.0.0.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.registry_1.0.0.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.registry_1.0.0.v20080427-0830.jar
new file mode 100644
index 0000000000..a8df5bc2cb
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.registry_1.0.0.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.source_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.source_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..f82d461da5
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper.source_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..e5e4f14942
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.jsp.jasper_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.launcher.source_1.0.100.v20080509-1800.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.launcher.source_1.0.100.v20080509-1800.jar
new file mode 100644
index 0000000000..1702b686c0
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.launcher.source_1.0.100.v20080509-1800.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar
new file mode 100644
index 0000000000..bfa9bb8c26
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.log.source_1.1.0.v20080414.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.log.source_1.1.0.v20080414.jar
new file mode 100644
index 0000000000..437bf8bb48
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.log.source_1.1.0.v20080414.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.log_1.1.0.v20080414.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.log_1.1.0.v20080414.jar
new file mode 100644
index 0000000000..80a6761bd1
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.log_1.1.0.v20080414.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.metatype.source_1.0.0.v20070827.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.metatype.source_1.0.0.v20070827.jar
new file mode 100644
index 0000000000..54da919bc4
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.metatype.source_1.0.0.v20070827.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.metatype_1.0.0.v20070827.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.metatype_1.0.0.v20070827.jar
new file mode 100644
index 0000000000..a991bc67ec
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.metatype_1.0.0.v20070827.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.preferences.source_3.2.200.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.preferences.source_3.2.200.v20080421-2006.jar
new file mode 100644
index 0000000000..430e6ad49b
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.preferences.source_3.2.200.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.preferences_3.2.200.v20080421-2006.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.preferences_3.2.200.v20080421-2006.jar
new file mode 100644
index 0000000000..bae2270346
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.preferences_3.2.200.v20080421-2006.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.registry.source_3.4.0.v20080516-0950.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.registry.source_3.4.0.v20080516-0950.jar
new file mode 100644
index 0000000000..dccd196367
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.registry.source_3.4.0.v20080516-0950.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
new file mode 100644
index 0000000000..6c45bb9b45
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.servletbridge.source_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.servletbridge.source_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..b30e68bbfe
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.servletbridge.source_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.servletbridge_1.0.100.v20080427-0830.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.servletbridge_1.0.100.v20080427-0830.jar
new file mode 100644
index 0000000000..182dcd75a8
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.servletbridge_1.0.100.v20080427-0830.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.simpleconfigurator.source_1.0.0.v20080604.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.simpleconfigurator.source_1.0.0.v20080604.jar
new file mode 100644
index 0000000000..b9d855846d
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.simpleconfigurator.source_1.0.0.v20080604.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.simpleconfigurator_1.0.0.v20080604.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.simpleconfigurator_1.0.0.v20080604.jar
new file mode 100644
index 0000000000..dc6888a191
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.simpleconfigurator_1.0.0.v20080604.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.hook.source_1.0.0.v20080610.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.hook.source_1.0.0.v20080610.jar
new file mode 100644
index 0000000000..9ca96805c1
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.hook.source_1.0.0.v20080610.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.hook_1.0.0.v20080610.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.hook_1.0.0.v20080610.jar
new file mode 100644
index 0000000000..aec6cf6037
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.hook_1.0.0.v20080610.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.xslt.source_1.0.0.v20080610.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.xslt.source_1.0.0.v20080610.jar
new file mode 100644
index 0000000000..d28ab47f5a
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.xslt.source_1.0.0.v20080610.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.xslt_1.0.0.v20080610.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.xslt_1.0.0.v20080610.jar
new file mode 100644
index 0000000000..8e504363d7
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.transforms.xslt_1.0.0.v20080610.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.useradmin.source_1.1.0.v20080508-1815.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.useradmin.source_1.1.0.v20080508-1815.jar
new file mode 100644
index 0000000000..a984ed79ab
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.useradmin.source_1.1.0.v20080508-1815.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.useradmin_1.1.0.v20080508-1815.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.useradmin_1.1.0.v20080508-1815.jar
new file mode 100644
index 0000000000..f4f4c8c679
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.useradmin_1.1.0.v20080508-1815.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.util.source_1.0.0.v20080414.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.util.source_1.0.0.v20080414.jar
new file mode 100644
index 0000000000..b689e01000
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.util.source_1.0.0.v20080414.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.util_1.0.0.v20080414.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.util_1.0.0.v20080414.jar
new file mode 100644
index 0000000000..0209c77a79
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.util_1.0.0.v20080414.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.wireadmin.source_1.0.0.v20080407.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.wireadmin.source_1.0.0.v20080407.jar
new file mode 100644
index 0000000000..64242bf7eb
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.wireadmin.source_1.0.0.v20080407.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.wireadmin_1.0.0.v20080407.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.wireadmin_1.0.0.v20080407.jar
new file mode 100644
index 0000000000..b7860ccda4
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.equinox.wireadmin_1.0.0.v20080407.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.services.source_3.1.200.v20071203.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.services.source_3.1.200.v20071203.jar
new file mode 100644
index 0000000000..c738820577
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.services.source_3.1.200.v20071203.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.services_3.1.200.v20071203.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.services_3.1.200.v20071203.jar
new file mode 100644
index 0000000000..fc24c62e30
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.services_3.1.200.v20071203.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.source_3.4.0.v20080605-1900.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.source_3.4.0.v20080605-1900.jar
new file mode 100644
index 0000000000..7ec3ee293d
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.source_3.4.0.v20080605-1900.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.util.source_3.1.300.v20080303.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.util.source_3.1.300.v20080303.jar
new file mode 100644
index 0000000000..2b9426d6b0
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.util.source_3.1.300.v20080303.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.util_3.1.300.v20080303.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.util_3.1.300.v20080303.jar
new file mode 100644
index 0000000000..6871396713
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi.util_3.1.300.v20080303.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi_3.4.0.v20080605-1900.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi_3.4.0.v20080605-1900.jar
new file mode 100644
index 0000000000..402c02d65b
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.eclipse.osgi_3.4.0.v20080605-1900.jar
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.mortbay.jetty_5.1.14.v200806031611.jar b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.mortbay.jetty_5.1.14.v200806031611.jar
new file mode 100644
index 0000000000..2365e80ce9
--- /dev/null
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/plugins/org.mortbay.jetty_5.1.14.v200806031611.jar