From 9f395ebf3ec27f89c8dc63137bc99c8d6b0cff6d Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:37 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835125 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/osgi/runtime/EquinoxRuntime.java | 112 --------- .../tuscany/sca/osgi/runtime/FelixRuntime.java | 246 -------------------- .../sca/osgi/runtime/KnopflerfishRuntime.java | 162 ------------- .../sca/osgi/runtime/OSGiBundleActivator.java | 258 --------------------- .../tuscany/sca/osgi/runtime/OSGiRuntime.java | 256 -------------------- .../osgi/runtime/OSGiRuntimeModuleActivator.java | 47 ---- 6 files changed, 1081 deletions(-) delete mode 100644 branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java delete mode 100644 branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java delete mode 100644 branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java delete mode 100644 branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java delete mode 100644 branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java delete mode 100644 branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java (limited to 'branches/sca-java-1.2/modules/osgi-runtime/src/main/java') diff --git a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java b/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java deleted file mode 100644 index 2764e72771..0000000000 --- a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java +++ /dev/null @@ -1,112 +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.osgi.runtime; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import org.osgi.framework.BundleContext; - -public class EquinoxRuntime extends OSGiRuntime { - - - private static BundleContext bundleContext; - - private static EquinoxRuntime instance; - - private static Class eclipseStarterClass; - - public static OSGiRuntime getInstance() throws Exception { - if (instance == null) { - eclipseStarterClass = EquinoxRuntime.class.getClassLoader().loadClass("org.eclipse.core.runtime.adaptor.EclipseStarter"); - EquinoxRuntime runtime = new EquinoxRuntime(); - instance = runtime; - } - return instance; - } - - - protected BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception { - - if (bundleContext != null) - return bundleContext; - - Method startupMethod = eclipseStarterClass.getMethod("startup", String [].class, Runnable.class); - - // Equinox version 3.2 upwards have a startup method which returns BundleContext - if (startupMethod.getReturnType() == BundleContext.class) { - bundleContext = (BundleContext) startupMethod.invoke(null, new String[] {"-clean", "-console"}, null ); - } - else { - - // Older versions of Equinox dont have a public method to obtain system bundlecontext - // Extract bundleContext from the private field 'context'. We are assuming that - // there is no access restriction - Method mainMethod = eclipseStarterClass.getMethod("main", String [].class); - mainMethod.invoke(null, (Object)new String[] {"-clean", "-console"}); - - Field contextField = eclipseStarterClass.getDeclaredField("context"); - contextField.setAccessible(true); - bundleContext = (BundleContext) contextField.get(null); - - } - - - return bundleContext; - - } - - @Override - public BundleContext getBundleContext() { - return bundleContext; - } - - @Override - protected void setBundleContext(BundleContext bundleContext) { - super.setBundleContext(bundleContext); - EquinoxRuntime.bundleContext = bundleContext; - } - - @Override - public void shutdown() throws Exception { - - if (bundleContext == null) - return; - bundleContext = null; - instance = null; - if (eclipseStarterClass != null) { - Method shutdownMethod = eclipseStarterClass.getMethod("shutdown"); - try { - shutdownMethod.invoke(eclipseStarterClass); - } catch (Exception e) { - // Ignore errors. - } - } - super.shutdown(); - } - - - @Override - public boolean supportsBundleFragments() { - return false; - } - - - -} diff --git a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java b/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java deleted file mode 100644 index a5f02c7b31..0000000000 --- a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java +++ /dev/null @@ -1,246 +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.osgi.runtime; - -import java.io.File; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class FelixRuntime extends OSGiRuntime implements BundleActivator { - - private static BundleContext bundleContext; - - private static FelixRuntime instance; - - private static Class felixMainClass; - private static Class felixClass; - private static Object felix; - - public static OSGiRuntime getInstance() throws Exception { - if (instance == null) { - felixMainClass = FelixRuntime.class.getClassLoader().loadClass("org.apache.felix.main.Main"); - FelixRuntime runtime = new FelixRuntime(); - instance = runtime; - } - return instance; - } - - - private static void deleteDirectory(File dir) { - - File[] files = dir.listFiles(); - for (int i = 0; i < files.length; i++) { - if (files[i].isDirectory()) - deleteDirectory(files[i]); - else - files[i].delete(); - } - dir.delete(); - - } - - protected BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception { - - if (bundleContext != null) - return bundleContext; - - - ClassLoader cl = FelixRuntime.class.getClassLoader(); - - felixClass = cl.loadClass("org.apache.felix.framework.Felix"); - Method propsMethod = felixMainClass.getMethod("loadConfigProperties"); - Properties props = (Properties)propsMethod.invoke(null); - - File profileDir = new File(".felix"); - if (profileDir.isDirectory()) - deleteDirectory(profileDir); - else - profileDir.delete(); - profileDir.mkdir(); - profileDir.deleteOnExit(); - - props.put("felix.cache.profiledir", profileDir.getAbsolutePath()); - props.put("felix.embedded.execution", "true"); - - String systemPackages = - "org.osgi.framework; version=1.3.0," + - "org.osgi.service.packageadmin; version=1.2.0, " + - "org.osgi.service.startlevel; version=1.0.0, " + - "org.osgi.service.url; version=1.0.0, " + - "org.osgi.util.tracker; version=1.3.2, " + - "javax.xml, " + - "javax.xml.datatype, " + - "javax.xml.namespace, " + - "javax.xml.parsers, " + - "javax.xml.transform, " + - "javax.xml.transform.dom, " + - "javax.xml.transform.sax, " + - "javax.xml.transform.stream, " + - "javax.xml.validation, " + - "javax.xml.xpath, " + - "org.apache.xerces.jaxp.datatype, " + - "org.w3c.dom, " + - "org.xml.sax, " + - "org.xml.sax.ext, " + - "org.xml.sax.helpers, " + - "javax.security.auth, " + - "javax.naming, " + - "javax.naming.spi, " + - "javax.naming.directory, " + - "javax.management, " + - "sun.misc"; - - - if (!tuscanyRunningInOSGiContainer) - systemPackages = systemPackages + ", org.osoa.sca.annotations, org.osoa.sca"; - props.put("org.osgi.framework.system.packages", systemPackages); - - try { - Constructor felixConstructor = felixClass.getConstructor(Map.class, List.class); - List activators = new ArrayList(); - - try { - Class autoActivatorClass = cl.loadClass("org.apache.felix.main.AutoActivator"); - Constructor autoActivatorConstructor = autoActivatorClass.getConstructor(Map.class); - BundleActivator autoActivator = (BundleActivator)autoActivatorConstructor.newInstance(props); - activators.add(autoActivator); - - } catch (Throwable e) { - // Pre-1.0.3 release of Felix did not require AutoActivator - } - - - felix = felixConstructor.newInstance(props, activators); - ((Bundle)felix).start(); - bundleContext = ((Bundle)felix).getBundleContext(); - - - } catch (Exception e) { - - // This is the older Felix API which has been retained temporarily to avoid build break - // TODO: Remove these once Felix 1.0.0 is released. - - Class propertyResolverClass = cl.loadClass("org.apache.felix.framework.util.MutablePropertyResolver"); - Class propertyResolverImplClass = cl.loadClass("org.apache.felix.framework.util.MutablePropertyResolverImpl"); - - Constructor implConstructor = propertyResolverImplClass.getConstructor(Map.class); - Object mutableProps = implConstructor.newInstance(props); - - - try { - Constructor felixConstructor = felixClass.getConstructor(propertyResolverClass, List.class); - List activators = new ArrayList(); - felix = felixConstructor.newInstance(mutableProps, activators); - ((Bundle)felix).start(); - bundleContext = ((Bundle)felix).getBundleContext(); - } catch (Exception e1) { - - - felix = felixClass.newInstance(); - Method startMethod = felixClass.getMethod("start", propertyResolverClass, List.class); - List activators = new ArrayList(); - BundleActivator activator = new FelixRuntime(); - activators.add(activator); - startMethod.invoke(felix, mutableProps, activators); - - synchronized (activator) { - int retries = 0; - while (bundleContext == null && retries++ < 10) { - activator.wait(1000); - } - } - } - } - - return bundleContext; - - } - - public void start(BundleContext context) throws Exception { - - bundleContext = context; - synchronized (this) { - this.notify(); - } - } - - public void stop(BundleContext context) throws Exception { - bundleContext = null; - } - - - - @Override - public BundleContext getBundleContext() { - return bundleContext; - } - - @Override - protected void setBundleContext(BundleContext bundleContext) { - super.setBundleContext(bundleContext); - FelixRuntime.bundleContext = bundleContext; - } - - - @Override - public void shutdown() throws Exception { - - if (bundleContext == null) - return; - bundleContext = null; - instance = null; - - // We could potentially use Felix.stopAndWait, but use timed wait for now because - // stopAndWait hangs with Felix 1.0.0 - if (felix instanceof Bundle) { - Bundle felixBundle = (Bundle)felix; - felixBundle.stop(); - int retries = 50; - synchronized (felix) { - while (retries-- > 0 && felixBundle.getState() != Bundle.UNINSTALLED) { - felix.wait(100); - } - } - } - else if (felix != null) { - Method shutdownMethod = felixClass.getMethod("shutdown"); - try { - shutdownMethod.invoke(felix); - } catch (Exception e) { - // Ignore errors - } - felix = null; - } - super.shutdown(); - } - - @Override - public boolean supportsBundleFragments() { - return false; - } - -} diff --git a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java b/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java deleted file mode 100644 index 9c3373ea8a..0000000000 --- a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java +++ /dev/null @@ -1,162 +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.osgi.runtime; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.Hashtable; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - -public class KnopflerfishRuntime extends OSGiRuntime { - - private static BundleContext bundleContext; - - private static KnopflerfishRuntime instance; - - - private static Class frameworkClass; - - private static Object framework; - - public static OSGiRuntime getInstance() throws Exception { - if (instance == null) { - frameworkClass = KnopflerfishRuntime.class.getClassLoader().loadClass("org.knopflerfish.framework.Framework"); - KnopflerfishRuntime runtime = new KnopflerfishRuntime(); - instance = runtime; - } - return instance; - } - - - - // FIXME: Knopflerfish does not expose the methods used for configuration as public methods - // It may be worth using the private methods in org.knopflerfish.framework.Main for - // configuring using reflection if security policies allow it. - // For now, a simple configuration routine reads sca.xargs from the directory in - // the classpath which contains framework.jar. The entries in init.xargs starting with - // -install are assumed to be single-line entries with full bundle location. - // - protected BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception { - - if (bundleContext != null) - return bundleContext; - - - - System.setProperty("org.knopflerfish.framework.bundlestorage", "memory"); - - Constructor frameworkConstructor = frameworkClass.getConstructor(Object.class); - framework = frameworkConstructor.newInstance(new KnopflerfishRuntime()); - Method launchMethod = frameworkClass.getMethod("launch", long.class); - launchMethod.invoke(framework, 0); - Method getContextMethod = frameworkClass.getMethod("getSystemBundleContext"); - bundleContext = (BundleContext)getContextMethod.invoke(framework); - - System.setProperty("com.gatespace.bundle.cm.store", "knopflerfish.store"); - File xargsFile = null; - String classpath = System.getProperty("java.class.path"); - String[] classpathEntries = classpath.split(System.getProperty("path.separator")); - for (int i = 0; i < classpathEntries.length; i++) { - if (classpathEntries[i].endsWith("framework.jar")) { - String path = classpathEntries[i].substring(0, classpathEntries[i].length() - "framework.jar".length()); - path = path + "sca.xargs"; - xargsFile = new File(path); - if (!xargsFile.exists()) - xargsFile = null; - break; - } - } - if (xargsFile != null) { - BufferedReader reader = new BufferedReader(new FileReader(xargsFile)); - String line; - Hashtable bundles = new Hashtable(); - while ((line = reader.readLine()) != null) { - line = line.trim(); - if (line.startsWith("-install")) { - try { - - String bundleLocation = line.substring("-install".length()).trim(); - Bundle bundle = bundleContext.installBundle(bundleLocation); - bundles.put(bundleLocation, bundle); - - } catch (BundleException e) { - e.printStackTrace(); - } - - } - if (line.startsWith("-start")) { - - try { - String bundleLocation = line.substring("-start".length()).trim(); - Bundle bundle = bundles.get(bundleLocation); - bundle.start(); - } catch (BundleException e) { - e.printStackTrace(); - } - } - } - } - - - return bundleContext; - - } - - @Override - public BundleContext getBundleContext() { - return bundleContext; - } - - @Override - protected void setBundleContext(BundleContext bundleContext) { - super.setBundleContext(bundleContext); - KnopflerfishRuntime.bundleContext = bundleContext; - } - - @Override - public void shutdown() throws Exception { - - if (bundleContext == null) - return; - bundleContext = null; - instance = null; - if (framework != null) { - Method shutdownMethod = frameworkClass.getMethod("shutdown"); - try { - shutdownMethod.invoke(framework); - } catch (Exception e) { - // Ignore errors - } - framework = null; - } - super.shutdown(); - - } - - @Override - public boolean supportsBundleFragments() { - return true; - } -} diff --git a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java b/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java deleted file mode 100644 index 5edf6fe130..0000000000 --- a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java +++ /dev/null @@ -1,258 +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.osgi.runtime; - -import java.io.IOException; -import java.net.URL; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; - -import org.apache.tuscany.sca.extensibility.ServiceDiscovery; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleListener; - -/** - * OSGi bundle activator, which is run when Tuscany is run inside an OSGi runtime. - * - */ -public class OSGiBundleActivator implements BundleActivator, BundleListener { - - private static final String TUSCANY_SCA_BUNDLE_PREFIX = "org.apache.tuscany.sca"; - private static final String TUSCANY_3RD_PARTY_BUNDLE_PREFIX = "org.apache.tuscany.sca.3rdparty"; - private OSGiRuntime runtime; - private BundleClassLoader serviceDiscoveryClassLoader; - private BundleClassLoader threadContextClassLoader; - private ClassLoader origTCCL; - private Bundle thisBundle; - - public void start(BundleContext bundleContext) throws Exception { - - initializeTuscanyClassLoaders(bundleContext); - - runtime = OSGiRuntime.findRuntime(); - runtime.setBundleContext(bundleContext); - runtime.initialize(); - - } - - public void stop(BundleContext bundleContext) throws Exception { - runtime.shutdown(); - - if (Thread.currentThread().getContextClassLoader() == threadContextClassLoader) - Thread.currentThread().setContextClassLoader(origTCCL); - } - - /** - * Create a bundle classloader which has visibility of all Tuscany related - * bundles. Use this classloader as TCCL, and the Tuscany service discovery - * classloader. - * - * @param bundleContext - */ - private void initializeTuscanyClassLoaders(BundleContext bundleContext) { - - thisBundle = bundleContext.getBundle(); - - origTCCL = Thread.currentThread().getContextClassLoader(); - - threadContextClassLoader = new BundleClassLoader(thisBundle, origTCCL); - - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - - serviceDiscoveryClassLoader = new BundleClassLoader(thisBundle, origTCCL); - - Bundle[] bundles = bundleContext.getBundles(); - for (Bundle bundle : bundles) { - updateBundleClassLoader(bundle); - } - bundleContext.addBundleListener(this); - - ServiceDiscovery.getInstance().registerClassLoader(serviceDiscoveryClassLoader); - - - - } - - /** - * Add an installed bundle to the list of bundles in the service discovery classpath - * if the installed bundle is a Tuscany bundle using the same Core-SPI bundle. - * Since the bundle containing this activator is in Tuscany Runtime, this bundle - * will provide access to Runtime and its dependencies (SPI, SCA-API). Third party - * bundles dont need to be in the service discovery classpath, since they will be automatically - * imported by bundles which require them. That leaves Tuscany extension bundles, - * which are added to the service discovery classpath here. - * - * 3rd party bundle should be explicity added to TCCL since classes from these - * bundles use TCCL to load other classes from the bundle. - * - * Load one class from the bundle to check if the new bundle matches this runtime bundle. - * - * @param bundle - */ - private void updateBundleClassLoader(Bundle bundle) { - - if (bundle.getSymbolicName().startsWith(TUSCANY_SCA_BUNDLE_PREFIX)) { - - - // This may be the third party bundle. - if (bundle.getSymbolicName().startsWith(TUSCANY_3RD_PARTY_BUNDLE_PREFIX)) { - - try { - String xmlInputFactory = "javax.xml.stream.XMLInputFactory"; - if (thisBundle.loadClass(xmlInputFactory) == bundle.loadClass(xmlInputFactory)) { - - threadContextClassLoader.addBundle(bundle); - } - } catch (ClassNotFoundException e) { - // Ignore - } - } - else { - - String moduleActivator = "org.apache.tuscany.sca.core.ModuleActivator"; - - try { - if (thisBundle.loadClass(moduleActivator) == bundle.loadClass(moduleActivator)) { - - serviceDiscoveryClassLoader.addBundle(bundle); - threadContextClassLoader.addBundle(bundle); - } - } catch (ClassNotFoundException e) { - // Ignore - } - } - } - } - - - /** - * Handle bundle install/uninstall events - */ - public void bundleChanged(BundleEvent event) { - - Bundle bundle = event.getBundle(); - if (event.getType() == BundleEvent.UNINSTALLED) { - serviceDiscoveryClassLoader.removeBundle(bundle); - threadContextClassLoader.removeBundle(bundle); - } - else if (event.getType() == BundleEvent.INSTALLED) { - updateBundleClassLoader(bundle); - } - } - - - - - /** - * Bundle classloader that searches a bundle classpath consisting of - * a list of bundles. The parent classloader is searched only if a class - * cannot be loaded from the bundle classpath. Tuscany bundles are - * dynamically added and removed from the bundle classpath when the bundles - * are installed and uninstalled. - * - * No ordering of bundles is maintained at the moment. - * - */ - private static class BundleClassLoader extends ClassLoader { - - private HashSet bundles; - - BundleClassLoader(Bundle bundle, ClassLoader parent) { - super(parent); - this.bundles = new HashSet(); - bundles.add(bundle); - } - - private synchronized void addBundle(Bundle bundle) { - bundles.add(bundle); - } - - private synchronized void removeBundle(Bundle bundle) { - if (bundles.contains(bundle)) - bundles.remove(bundle); - } - - - @Override - protected Class findClass(String className) throws ClassNotFoundException { - Class clazz = null; - synchronized (this) { - for (Bundle bundle : bundles) { - try { - clazz = bundle.loadClass(className); - break; - } catch (ClassNotFoundException e) { - } catch (NoClassDefFoundError e) { - } - - } - } - if (clazz != null) { - return clazz; - } - return super.findClass(className); - } - - - @Override - @SuppressWarnings("unchecked") - public Enumeration getResources(String resName) throws IOException { - HashSet urlSet = new HashSet(); - Enumeration urls = null; - synchronized (this) { - for (Bundle bundle : bundles) { - urls = bundle.getResources(resName); - if (urls != null) { - while (urls.hasMoreElements()) { - urlSet.add(urls.nextElement()); - } - } - } - } - if (urlSet.size() > 0) - return Collections.enumeration(urlSet); - return super.getResources(resName); - } - - @Override - public URL getResource(String resName) { - URL url = null; - synchronized (this) { - for (Bundle bundle : bundles) { - url = bundle.getResource(resName); - if (url != null) - return url; - } - } - return super.getResource(resName); - } - - @Override - public String toString() { - return "Tuscany BundleClassLoader " + bundles.iterator().next(); - } - - - - } -} diff --git a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java b/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java deleted file mode 100644 index 7bffa9284e..0000000000 --- a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java +++ /dev/null @@ -1,256 +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.osgi.runtime; - -import java.io.InputStream; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.service.packageadmin.PackageAdmin; - -public abstract class OSGiRuntime { - private static final Logger logger = Logger.getLogger(OSGiRuntime.class.getName()); - - public abstract BundleContext getBundleContext(); - - public abstract boolean supportsBundleFragments(); - - protected abstract BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception; - - private static OSGiRuntime instance; - - private BundleContext bundleContext; - - private PackageAdmin packageAdmin; - - private boolean tuscanyRunningInOSGiContainer; - - /** - * System property org.apache.tuscany.implementation.osgi.runtime.OSGiRuntime can be set to the - * name of the OSGiRuntime class (eg. EquinoxRuntime). If set, start this runtime and return the - * system bundlecontext. If not set, start Equinox/Felix/Knopflerfish (in that order) from the - * classpath. - * - * @throws BundleException - */ - public synchronized static OSGiRuntime findRuntime() throws Exception { - - if (instance != null) { - - return instance; - } - String runtimeClassName = System.getProperty(OSGiRuntime.class.getName()); - - - if (runtimeClassName != null) { - try { - Class runtimeClass = OSGiRuntime.class.getClassLoader().loadClass(runtimeClassName); - Method method = runtimeClass.getMethod("getInstance"); - instance = (OSGiRuntime) method.invoke(null); - return instance; - - } catch (Exception e) { - throw new BundleException("Could not start OSGi runtime " + runtimeClassName, e); - } - } - - try { - - instance = EquinoxRuntime.getInstance(); - return instance; - - } catch (ClassNotFoundException e) { - // Ignore - } catch (Throwable e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - - try { - - instance = FelixRuntime.getInstance(); - return instance; - - } catch (ClassNotFoundException e) { - // Ignore - } catch (Throwable e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - - try { - - instance = KnopflerfishRuntime.getInstance(); - return instance; - - } catch (ClassNotFoundException e) { - // Ignore - } catch (Throwable e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - - throw new BundleException("Could not start OSGi runtime from the classpath"); - } - - - public synchronized static OSGiRuntime getRuntime() throws Exception { - return getRuntime(false); - } - - public synchronized static OSGiRuntime getRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception { - - instance = findRuntime(); - - if (instance != null) { - - if (instance.bundleContext == null) { - instance.tuscanyRunningInOSGiContainer = tuscanyRunningInOSGiContainer; - instance.startRuntime(tuscanyRunningInOSGiContainer); - instance.initialize(); - } - return instance; - } - return instance; - } - - - public void shutdown() throws Exception { - - bundleContext = null; - packageAdmin = null; - } - - protected void setBundleContext(BundleContext bundleContext) { - instance.tuscanyRunningInOSGiContainer = true; - this.bundleContext = bundleContext; - } - - protected void initialize() { - - bundleContext = getBundleContext(); - - if (bundleContext != null) { - - org.osgi.framework.ServiceReference packageAdminReference = - bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin"); - if (packageAdminReference != null) { - - packageAdmin = (PackageAdmin)bundleContext.getService(packageAdminReference); - } - } - - } - - public Bundle findBundle(String bundleSymbolicName, String bundleVersion) { - - if (bundleContext != null) { - Bundle[] installedBundles = bundleContext.getBundles(); - for (Bundle bundle : installedBundles) { - if (bundleSymbolicName.equals(bundle.getSymbolicName()) && (bundleVersion == null || bundleVersion - .equals(bundle.getHeaders().get("Bundle-Version")))) - return bundle; - } - - } - return null; - } - - public synchronized static Bundle findInstalledBundle(String bundleLocation) { - if (instance != null) { - if (bundleLocation.startsWith("bundle:")||bundleLocation.startsWith("bundleresource:")) { - try { - return findInstalledBundle(new URL(bundleLocation)); - } catch (MalformedURLException e) { - // ignore - } - } else { - return instance.findBundle(bundleLocation); - } - } - return null; - } - - public synchronized static Bundle findInstalledBundle(URL bundleURL) { - if (instance != null) { - if (instance.bundleContext != null) { - Bundle[] installedBundles = instance.bundleContext.getBundles(); - for (Bundle bundle : installedBundles) { - try { - if (bundle.getEntry("/").getHost().equals(bundleURL.getHost())) - return bundle; - } catch (Exception e) { - // Ignore exception - } - } - } - return null; - } - return null; - } - - public Bundle findBundle(String bundleLocation) { - - if (bundleContext != null) { - Bundle[] installedBundles = bundleContext.getBundles(); - for (Bundle bundle : installedBundles) { - if (bundle.getLocation().equals(bundleLocation)) - return bundle; - } - - } - return null; - } - - public Bundle installBundle(String bundleLocation, InputStream inputStream) { - - try { - if (bundleContext != null) { - Bundle bundle = findBundle(bundleLocation); - if (bundle != null) - return bundle; - if (inputStream == null) - bundle = bundleContext.installBundle(bundleLocation); - else - bundle = bundleContext.installBundle(bundleLocation, inputStream); - - if (bundle != null && packageAdmin != null) - packageAdmin.refreshPackages(null); - - return bundle; - } - } catch (BundleException e) { - } - return null; - } - - /** - * @return the instance - */ - public synchronized static void stop() throws Exception { - if (instance != null && !instance.tuscanyRunningInOSGiContainer) { - instance.shutdown(); - instance = null; - } - } - -} diff --git a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java b/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java deleted file mode 100644 index 1dbe75f431..0000000000 --- a/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.osgi.runtime; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; - -/** - * @version $Rev$ $Date$ - */ -public class OSGiRuntimeModuleActivator implements ModuleActivator { - - /** - * @see org.apache.tuscany.sca.core.ModuleActivator#start(org.apache.tuscany.sca.core.ExtensionPointRegistry) - */ - public void start(ExtensionPointRegistry registry) { - } - - /** - * @see org.apache.tuscany.sca.core.ModuleActivator#stop(org.apache.tuscany.sca.core.ExtensionPointRegistry) - */ - public void stop(ExtensionPointRegistry registry) { - try { - OSGiRuntime.stop(); - } catch (Throwable e) { - // Ignore the exception - } - } - -} -- cgit v1.2.3