diff options
Diffstat (limited to 'java/sca')
4 files changed, 16 insertions, 7 deletions
diff --git a/java/sca/modules/extensibility-equinox/pom.xml b/java/sca/modules/extensibility-equinox/pom.xml index e20d34e453..ee3b1d9f22 100644 --- a/java/sca/modules/extensibility-equinox/pom.xml +++ b/java/sca/modules/extensibility-equinox/pom.xml @@ -79,6 +79,7 @@ <Bundle-Activator>org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator</Bundle-Activator> <Export-Package>org.apache.tuscany.sca.extensibility.equinox*</Export-Package> <Eclipse-AutoStart>true</Eclipse-AutoStart> + <DynamicImport-Package>*</DynamicImport-Package> </instructions> </configuration> </plugin> diff --git a/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java index c1888d2cdd..0bd1c37113 100644 --- a/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java +++ b/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java @@ -19,6 +19,8 @@ package org.apache.tuscany.sca.extensibility.equinox; +import java.util.logging.Logger; + import org.apache.tuscany.sca.extensibility.ServiceDiscovery; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -29,10 +31,14 @@ import org.osgi.framework.BundleContext; * @version $Rev: $ $Date: $ */ public class EquinoxServiceDiscoveryActivator implements BundleActivator { + private static Logger logger = Logger.getLogger(EquinoxServiceDiscoveryActivator.class.getName()); public void start(BundleContext context) throws Exception { + logger.info("Installing service discovery"); EquinoxServiceDiscoverer discoverer = new EquinoxServiceDiscoverer(context); ServiceDiscovery.getInstance().setServiceDiscoverer(discoverer); + logger.info("Installed service discovery"); + Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); } public void stop(BundleContext context) throws Exception { diff --git a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java index a61449be21..4419f22c5c 100644 --- a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java +++ b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java @@ -151,12 +151,14 @@ public class EquinoxHost { launcherBundle.start(); // Start all bundles for now to help diagnose any class loading issues - //for (Bundle bundle: context.getBundles()) { - // if ((bundle.getState() & Bundle.ACTIVE) == 0) { - // logger.info("Starting bundle: " + string(bundle, false)); - // bundle.start(); - // } - //} + long activateStart = System.currentTimeMillis(); + for (Bundle bundle: context.getBundles()) { + if ((bundle.getState() & Bundle.ACTIVE) == 0) { + logger.info("Starting bundle: " + string(bundle, false)); + bundle.start(); + } + } + logger.info("Tuscany bundles are started in " + (System.currentTimeMillis() - activateStart) + " ms."); return context; diff --git a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java index 0c71970b95..4e790fc015 100644 --- a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java +++ b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherBundleActivator.java @@ -72,7 +72,7 @@ public class LauncherBundleActivator implements BundleActivator, Constants, Bund } long installStart = System.currentTimeMillis(); Bundle bundle = bundleContext.installBundle(bundleFile); - //logger.info("Bundle installed in " + (System.currentTimeMillis() - installStart) + " ms: " + NodeLauncherUtil.string(bundle, false)); + logger.info("Bundle installed in " + (System.currentTimeMillis() - installStart) + " ms: " + NodeLauncherUtil.string(bundle, false)); installedBundles.add(bundle); } } |