Start to move the runtime pieces into a new implementation-osgi-runtime module

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

16 files changed, 7 insertions, 949 deletions

diff --git a/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorActivator.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorActivator.java
deleted file mode 100644
index 1489ae2b07..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorActivator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package calculator;
-
-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.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/implementation-osgi/src/test/java/calculator/CalculatorService.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 0f7dec116f..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The Calculator service interface.
- */
-@Remotable
-public interface CalculatorService extends Remote {
-
-    double add(double n1, double n2) throws RemoteException;
-
-    double subtract(double n1, double n2) throws RemoteException;
-
-    double multiply(double n1, double n2) throws RemoteException;
-
-    double divide(double n1, double n2) throws RemoteException;
-}
diff --git a/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorServiceDSImpl.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorServiceDSImpl.java
deleted file mode 100644
index 7f9fa6803c..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorServiceDSImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import org.osgi.service.component.ComponentContext;
-
-import calculator.operations.AddService;
-import calculator.operations.DivideService;
-import calculator.operations.MultiplyService;
-import calculator.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/implementation-osgi/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 2d36ba76ad..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-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.operations.AddService;
-import calculator.operations.DivideService;
-import calculator.operations.MultiplyService;
-import calculator.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.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/implementation-osgi/src/test/java/calculator/operations/AddService.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/AddService.java
deleted file mode 100644
index 2fe405a322..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/AddService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/AddServiceImpl.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/AddServiceImpl.java
deleted file mode 100644
index 685d641b1c..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/DivideService.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/DivideService.java
deleted file mode 100644
index dfc5df6784..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/DivideService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/DivideServiceImpl.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/DivideServiceImpl.java
deleted file mode 100644
index 945b0315b0..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/MultiplyService.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/MultiplyService.java
deleted file mode 100644
index b70c233f1a..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/MultiplyService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/MultiplyServiceImpl.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/MultiplyServiceImpl.java
deleted file mode 100644
index 175322c14d..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/OperationsActivator.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/OperationsActivator.java
deleted file mode 100644
index 5da79ee803..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/OperationsActivator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/SubtractService.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/SubtractService.java
deleted file mode 100644
index 1d83a23229..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/SubtractService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/operations/SubtractServiceImpl.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/SubtractServiceImpl.java
deleted file mode 100644
index cf1744bc61..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/operations/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.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/implementation-osgi/src/test/java/calculator/test/CalculatorOSGiTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/calculator/test/CalculatorOSGiTestCase.java
deleted file mode 100644
index 3477732c5f..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/calculator/test/CalculatorOSGiTestCase.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package calculator.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.CalculatorActivator;
-import calculator.CalculatorService;
-import calculator.CalculatorServiceDSImpl;
-import calculator.CalculatorServiceImpl;
-import calculator.operations.AddService;
-import calculator.operations.AddServiceImpl;
-import calculator.operations.DivideService;
-import calculator.operations.DivideServiceImpl;
-import calculator.operations.MultiplyService;
-import calculator.operations.MultiplyServiceImpl;
-import calculator.operations.OperationsActivator;
-import calculator.operations.SubtractService;
-import calculator.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/META-INF/MANIFEST.MF",
-                                                 new String[] {"OSGI-INF/calculator-component.xml"},
-                                                 CalculatorService.class,
-                                                 CalculatorServiceImpl.class,
-                                                 CalculatorServiceDSImpl.class,
-                                                 CalculatorActivator.class));
-
-        bundles.add(OSGiTestBundles.createBundle("target/test-classes/operations-bundle.jar",
-                                                 "calculator/operations/META-INF/MANIFEST.MF",
-                                                 new String[] {"OSGI-INF/add-component.xml",
-                                                               "OSGI-INF/subtract-component.xml",
-                                                               "OSGI-INF/multiply-component.xml",
-                                                               "OSGI-INF/divide-component.xml"},
-                                                 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")) {
-                    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/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
deleted file mode 100644
index 6cdc2db347..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.osgi.runtime;
-
-import java.io.File;
-import java.lang.reflect.Proxy;
-
-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.Assert;
-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;
-    protected static String className;
-    protected static String compositeName;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        host = NodeLauncher.newInstance();
-        className = OSGiTestImpl.class.getName();
-        compositeName = "osgitest.composite";
-        OSGiTestBundles.createBundle("target/test-classes/OSGiTestService.jar",
-                                     OSGiTestInterface.class.getName(),
-                                     null,
-                                     null,
-                                     (String[]) null,
-                                     OSGiTestImpl.class, OSGiTestInterface.class);
-
-        node =
-            host.createNode("osgitest.composite", 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();
-
-        Assert.assertEquals(className, str);
-
-    }
-
-}
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index 716d89c8cd..6d55f6b7ec 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
@@ -154,15 +154,18 @@ public class OSGiTestBundles {
 
     private static void addClass(JarOutputStream jarOut, Class<?> javaClass) throws IOException, FileNotFoundException {
         String classFile = javaClass.getName().replace('.', '/') + ".class";
-
-        ClassLoader cl = javaClass.getClassLoader();
-
-        addResource(jarOut, cl, classFile);
+        URL url = javaClass.getResource(javaClass.getSimpleName() + ".class");
+        addEntry(jarOut, url, classFile);
     }
 
     private static void addResource(JarOutputStream jarOut, ClassLoader cl, String resourceName) throws IOException,
         FileNotFoundException {
         URL url = cl.getResource(resourceName);
+        addEntry(jarOut, url, resourceName);
+    }
+
+    private static void addEntry(JarOutputStream jarOut, URL url, String resourceName) throws IOException,
+        FileNotFoundException {
         String path = url.getPath();
 
         ZipEntry ze = new ZipEntry(resourceName);