diff options
Diffstat (limited to 'sandbox/sebastien/java/shell/modules/extensibility-equinox/src')
8 files changed, 789 insertions, 0 deletions
diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java new file mode 100644 index 0000000000..2503c0606e --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java @@ -0,0 +1,330 @@ +/* + * 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.extensibility.equinox; + +import java.io.IOException; +import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Collection; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.tuscany.sca.extensibility.ServiceDeclaration; +import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser; +import org.apache.tuscany.sca.extensibility.ServiceDiscoverer; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.Version; +import org.osgi.util.tracker.BundleTracker; + +/** + * A ServiceDiscoverer that find META-INF/services/... in installed bundles + * + * @version $Rev$ $Date$ + */ +public class EquinoxServiceDiscoverer implements ServiceDiscoverer { + private static final Logger logger = Logger.getLogger(EquinoxServiceDiscoverer.class.getName()); + + private BundleContext context; + private Version version; + private BundleTracker bundleTracker; + + public EquinoxServiceDiscoverer(BundleContext context) { + this.context = context; + Bundle bundle = context.getBundle(); + this.version = getSCAVersion(bundle); + if (this.version.equals(Version.emptyVersion)) { + this.version = Version.parseVersion("1.1"); + } + bundleTracker = new ActiveBundleTracker(context); + bundleTracker.open(); + } + + public void stop() { + bundleTracker.close(); + } + + private Version getSCAVersion(Bundle bundle) { + String header = (String)bundle.getHeaders().get("SCA-Version"); + return Version.parseVersion(header); + } + + public static class ActiveBundleTracker extends BundleTracker { + + /** + * @param context + * @param stateMask + * @param customizer + */ + public ActiveBundleTracker(BundleContext context) { + super(context, Bundle.RESOLVED | Bundle.ACTIVE | Bundle.STARTING, null); + } + + @Override + public Object addingBundle(Bundle bundle, BundleEvent event) { + if (event != null && event.getType() == BundleEvent.STOPPED) { + return null; + } + return super.addingBundle(bundle, event); + } + + } + + + public static class ServiceDeclarationImpl implements ServiceDeclaration { + private Bundle bundle; + private URL url; + private String className; + private Class<?> javaClass; + private Map<String, String> attributes; + + public ServiceDeclarationImpl(Bundle bundle, URL url, String className, Map<String, String> attributes) { + super(); + this.bundle = bundle; + this.url = url; + this.className = className; + this.attributes = attributes; + } + + public Map<String, String> getAttributes() { + return attributes; + } + + public String getClassName() { + return className; + } + + public Class<?> loadClass() throws ClassNotFoundException { + if (className == null) { + return null; + } + if (javaClass == null) { + javaClass = loadClass(className); + } + return javaClass; + } + + public Class<?> loadClass(String className) throws ClassNotFoundException { + return bundle.loadClass(className); + } + + public URL getLocation() { + return url; + } + + public URL getResource(final String name) { + return AccessController.doPrivileged(new PrivilegedAction<URL>() { + public URL run() { + return bundle.getResource(name); + } + }); + } + + @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("Bundle: ").append(EquinoxServiceDiscoverer.toString(bundle)); + sb.append(" Resource: ").append(url); + sb.append(" Attributes: ").append(attributes); + return sb.toString(); + } + + public Bundle getBundle() { + return bundle; + } + + public boolean isAssignableTo(Class<?> serviceType) { + try { + loadClass(); + } catch (ClassNotFoundException e) { + // Ignore + } + return (javaClass != null && serviceType.isAssignableFrom(javaClass)); + } + + } + + /** + * Empty static method to trigger the activation of this bundle. + */ + public static void init() { + } + + private static String toString(Bundle b) { + StringBuffer sb = new StringBuffer(); + sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); + int s = b.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"); + } + return sb.toString(); + + } + + + public ServiceDeclaration getServiceDeclaration(String name) throws IOException { + Collection<ServiceDeclaration> declarations = getServiceDeclarations(name); + if (declarations.isEmpty()) { + return null; + } else { + return declarations.iterator().next(); + } + } + + private boolean isProviderBundle(Bundle bundle, boolean isTuscanyService) { + if (bundle.getBundleId() == 0 || bundle.getSymbolicName().startsWith("1.x-osgi-bundle") + || bundle.getHeaders().get(Constants.FRAGMENT_HOST) != null) { + // Skip system bundle as it has access to the application classloader + // Skip the 1.x runtime bundle as this has 1.x services in it + // For testing running 1.x and 2.x in same VM. + // Don't know what final form will be yet. + // Skip bundle fragments too + return false; + } + // FIXME: [rfeng] What bundles should be searched? ACTIVE and STARTING? + if ((bundle.getState() & Bundle.UNINSTALLED) != 0) { + return false; + } + if (isTuscanyService) { + Version scaVersion = getSCAVersion(bundle); + return scaVersion.compareTo(version) == 0; + } + return true; + } + + protected Collection<Bundle> getBundles(boolean isTuscanyService) { + // return bundles.keySet(); + Set<Bundle> set = new HashSet<Bundle>(); + for (Bundle b : context.getBundles()) { + if (isProviderBundle(b, isTuscanyService)) { + set.add(b); + } + /* + else { + if (b.getBundleId() != 0 && isTuscanyService) { + logger.warning("Bundle is skipped for service discovery: " + toString(b)); + } + } + */ + } + return set; + } + + public Collection<ServiceDeclaration> getServiceDeclarations(String serviceName) throws IOException { + boolean debug = logger.isLoggable(Level.FINE); + Collection<ServiceDeclaration> descriptors = new HashSet<ServiceDeclaration>(); + + // http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/xpath/XPathFactory.html + boolean isPropertyFile = "javax.xml.xpath.XPathFactory".equals(serviceName); + boolean isTuscanyService = serviceName.startsWith("org.apache.tuscany.sca.") || + serviceName.startsWith("META-INF/services/org.apache.tuscany.sca."); + + Set<URL> visited = new HashSet<URL>(); + //System.out.println(">>>> getServiceDeclarations()"); + for (Bundle bundle : getBundles(isTuscanyService)) { +// if (!isProviderBundle(bundle)) { +// continue; +// } + Enumeration<URL> urls = null; + try { + // Use getResources to find resources on the classpath of the bundle + // Please note there are cases that getResources will return null even + // the bundle containing such entries: + // 1. There is a match on Import-Package or DynamicImport-Package, and another + // bundle exports the resource package, there is a possiblity that it doesn't + // find the containing entry + // 2. The bundle cannot be resolved, then getResources will return null + urls = bundle.getResources(serviceName); + if (urls == null) { + URL entry = bundle.getEntry(serviceName); + if (entry != null) { + logger.warning("Unresolved resource " + serviceName + " found in " + toString(bundle)); + try { + bundle.start(); + } catch (BundleException e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + // urls = Collections.enumeration(Arrays.asList(entry)); + } + } + } catch (IOException e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + if (urls == null) { + if(! serviceName.startsWith("META-INF/services/")) { + return getServiceDeclarations("META-INF/services/" + serviceName); + } + + continue; + } + while (urls.hasMoreElements()) { + final URL url = urls.nextElement(); + + if (!visited.add(url)) { + // The URL has already been processed + continue; + } + + if (debug) { + logger.fine("Reading service provider file: " + url.toExternalForm()); + } + try { + for (Map<String, String> attributes : ServiceDeclarationParser.load(url, isPropertyFile)) { + String className = attributes.get("class"); + ServiceDeclarationImpl descriptor = new ServiceDeclarationImpl(bundle, url, className, attributes); + descriptors.add(descriptor); + } + } catch (IOException e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + } + return descriptors; + } + + public ClassLoader getContextClassLoader() { + // Get the bundle classloader for the extensibility bundle that has DynamicImport-Package * + return getClass().getClassLoader(); + } + +} diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java new file mode 100644 index 0000000000..14ad6670a8 --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java @@ -0,0 +1,49 @@ +/* + * 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.extensibility.equinox; + +import org.apache.tuscany.sca.extensibility.ServiceDiscovery; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * The Bundle Activator that creates the Equinox-based service discoverer + * + * @version $Rev$ $Date$ + */ +public class EquinoxServiceDiscoveryActivator implements BundleActivator { + // private static final Logger logger = Logger.getLogger(EquinoxServiceDiscoveryActivator.class.getName()); + private EquinoxServiceDiscoverer discoverer; + + public void start(BundleContext context) throws Exception { + discoverer = new EquinoxServiceDiscoverer(context); + ServiceDiscovery.getInstance().setServiceDiscoverer(discoverer); + // logger.info("Equinox-based service discoverer is now configured."); + } + + public void stop(BundleContext context) throws Exception { + ServiceDiscovery.getInstance().setServiceDiscoverer(null); + if (discoverer != null) { + discoverer.stop(); + discoverer = null; + } + } + +} diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java new file mode 100644 index 0000000000..4b5fffff01 --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java @@ -0,0 +1,106 @@ +/* + * 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.extensibility.equinox; + +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; +import org.apache.tuscany.sca.extensibility.ServiceDeclaration; +import org.apache.tuscany.sca.extensibility.ServiceDiscovery; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; + +/** + * OSGi ServiceRegistry based extension point registry + */ +public class OSGiExtensionPointRegistry extends DefaultExtensionPointRegistry { + private Map<Class<?>, ServiceRegistration> registrations = new ConcurrentHashMap<Class<?>, ServiceRegistration>(); + private BundleContext bundleContext; + + public OSGiExtensionPointRegistry(BundleContext bundleContext) { + super(ServiceDiscovery.getInstance(new EquinoxServiceDiscoverer(bundleContext))); + this.bundleContext = bundleContext; + } + + @Override + protected void registerExtensionPoint(Class<?> extensionPointType, + Object extensionPoint, + ServiceDeclaration declaration) { + BundleContext context = bundleContext; + if (declaration instanceof EquinoxServiceDiscoverer.ServiceDeclarationImpl) { + EquinoxServiceDiscoverer.ServiceDeclarationImpl declarationImpl = + (EquinoxServiceDiscoverer.ServiceDeclarationImpl)declaration; + Bundle bundle = declarationImpl.getBundle(); + /** + * If this bundle is not in the STARTING, ACTIVE, or STOPPING states or this bundle + * is a fragment bundle, then this bundle has no valid BundleContext. This method will + * return null if this bundle has no valid BundleContext + */ + if ((bundle.getState() & (Bundle.ACTIVE | Bundle.STARTING)) == 0) { + try { + bundle.start(); + } catch (BundleException e) { + throw new IllegalStateException(e); + } + } + context = bundle.getBundleContext(); + } + Dictionary<Object, Object> props = new Hashtable<Object, Object>(); + ServiceRegistration registration = context.registerService(extensionPointType.getName(), extensionPoint, props); + registrations.put(extensionPointType, registration); + super.registerExtensionPoint(extensionPointType, extensionPoint, declaration); + } + + @Override + protected void unregisterExtensionPoint(Class<?> i) { + ServiceRegistration registration = registrations.remove(i); + if (registration != null) { + try { + registration.unregister(); + } catch (IllegalStateException e) { + // The service has been unregistered, ignore it + } + } + super.unregisterExtensionPoint(i); + } + + @Override + public synchronized void stop() { + for (ServiceRegistration reg : registrations.values()) { + try { + ServiceReference ref = reg.getReference(); + if (ref != null) { + reg.unregister(); + } + } catch (IllegalStateException e) { + // Ignore it, the service has been unregistered when the owning bundle stops + } + } + registrations.clear(); + super.stop(); + } + +} diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java new file mode 100644 index 0000000000..aa9cd50abc --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java @@ -0,0 +1,95 @@ +/* + * 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.extensibility.equinox; + +import java.util.Dictionary; +import java.util.Enumeration; + +import org.junit.Assert; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; + +/** + * Test start/stop the Equinox runtime. + * + * @version $Rev$ $Date$ + */ +public class EquinoxHostTestCase { + @Test + public void testStartThenStop() { + TestEquinoxHost host = new TestEquinoxHost(); + BundleContext context = host.start(); + Assert.assertNotNull(context); + for (Bundle b : context.getBundles()) { + System.out.println(toString(b, false)); + } + host.stop(); + } + + @Test + public void testStartTwice() { + TestEquinoxHost host = new TestEquinoxHost(); + host.start(); + try { + host.start(); + Assert.fail(); + } catch (IllegalStateException e) { + Assert.assertTrue(IllegalStateException.class.isInstance(e.getCause())); + } finally { + host.stop(); + } + } + + public static String toString(Bundle b, boolean verbose) { + StringBuffer sb = new StringBuffer(); + sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); + int s = b.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"); + } + + sb.append(" ").append(b.getLocation()); + if (verbose) { + Dictionary<Object, Object> dict = b.getHeaders(); + Enumeration<Object> keys = dict.keys(); + while (keys.hasMoreElements()) { + Object key = keys.nextElement(); + sb.append(" ").append(key).append("=").append(dict.get(key)); + } + } + return sb.toString(); + } +} diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java new file mode 100644 index 0000000000..0b0e46fd15 --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java @@ -0,0 +1,132 @@ +/* + * 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.extensibility.equinox; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Collection; + +import org.apache.tuscany.sca.extensibility.ServiceDeclaration; +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; + +/** + * Test the Equinox service discoverer. + * + * @version $Rev$ $Date$ + */ +public class EquinoxServiceDiscovererTestCase { + private static EquinoxServiceDiscoverer discoverer; + private static Bundle testBundle1; + private static Bundle testBundle2; + private static TestEquinoxHost host; + + private static String getState(Bundle b) { + StringBuffer sb = new StringBuffer(); + int s = b.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 "); + } + return sb.toString(); + + } + + /** + * @throws java.lang.Exception + */ + @BeforeClass + public static void setUpBeforeClass() throws Exception { + host = new TestEquinoxHost(); + BundleContext context = host.start(); + + InputStream is = EquinoxServiceDiscovererTestCase.class.getResourceAsStream("/test-bundle-v1.jar"); + testBundle1 = context.installBundle("test-bundle-v1", is); + is.close(); + + is = EquinoxServiceDiscovererTestCase.class.getResourceAsStream("/test-bundle-v2.jar"); + testBundle2 = context.installBundle("test-bundle-v2", is); + is.close(); + + discoverer = new EquinoxServiceDiscoverer(context); + } + + /** + * @throws java.lang.Exception + */ + @AfterClass + public static void tearDownAfterClass() throws Exception { + if (testBundle1 != null) { + // Uninstall the bundle to clean up the cache + testBundle1.uninstall(); + } + if (testBundle2 != null) { + // Uninstall the bundle to clean up the cache + testBundle2.uninstall(); + } + host.stop(); + System.out.println("Done"); + } + + @Test + public void testDiscovery() throws IOException { + // Both version 1 and 2 should be found because test.TestService is not a Tuscany service + Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("test.TestService"); + Assert.assertEquals(2, descriptors.size()); + descriptors = discoverer.getServiceDeclarations("notthere"); + Assert.assertEquals(0, descriptors.size()); + } + + @Test + public void testDiscoveryFirst() throws IOException { + ServiceDeclaration descriptor = discoverer.getServiceDeclaration("test.TestService"); + Assert.assertNotNull(descriptor); + descriptor = discoverer.getServiceDeclaration("notthere"); + Assert.assertNull(descriptor); + } + + @Test + public void testTuscanyDiscovery() throws IOException { + Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("org.apache.tuscany.sca.test.TestService"); + // Only the version 2 should be found + Assert.assertEquals(1, descriptors.size()); + ServiceDeclaration sd = descriptors.iterator().next(); + Assert.assertEquals("2", sd.getAttributes().get("version")); + } + +} diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java new file mode 100644 index 0000000000..566cd6e1a5 --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java @@ -0,0 +1,77 @@ +/* + * 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.extensibility.equinox; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.extensibility.ServiceDeclaration; +import org.apache.tuscany.sca.extensibility.ServiceDiscovery; +import org.osgi.framework.BundleContext; +import org.osgi.framework.launch.Framework; +import org.osgi.framework.launch.FrameworkFactory; + +/** + * A test host that starts/stops Equinox. + * + * @version $Rev$ $Date$ + */ +public class TestEquinoxHost { + private Framework framework; + + private BundleContext init() throws Exception { + if (framework != null) { + throw new IllegalStateException("The framework is started already"); + } + ServiceDeclaration sd = ServiceDiscovery.getInstance().getServiceDeclaration(FrameworkFactory.class.getName()); + Class<?> factoryCls = sd.loadClass(); + FrameworkFactory factory = (FrameworkFactory)factoryCls.newInstance(); + Map<Object, Object> props = new HashMap<Object, Object>(); + props.put("osgi.clean", "true"); + props.put("osgi.instance.area", new File("target/workspace").toURI().toString()); + props.put("osgi.install.area", new File("target/eclipse").toURI().toString()); + props.put("osgi.configuration.area", new File("target/eclipse").toURI().toString()); + framework = factory.newFramework(props); + framework.start(); + return framework.getBundleContext(); + } + + public BundleContext start() { + try { + return init(); + } catch (Exception e) { + throw new IllegalStateException(e); + } + } + + public void stop() { + try { + if (framework != null) { + framework.stop(); + framework.waitForStop(2000); + framework = null; + } + } catch (Exception e) { + throw new IllegalStateException(e); + } + } + +} diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar Binary files differnew file mode 100644 index 0000000000..61c7b5a49e --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar diff --git a/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar Binary files differnew file mode 100644 index 0000000000..b02c368c58 --- /dev/null +++ b/sandbox/sebastien/java/shell/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar |