Added an dynamicimport declaration to extensibility-equinox. Forced activation of all bundles for now to help diagnose any errors. Added a call to set the the current thread context classloader to the extensiblity-equinox bundle's classloader.

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

2 files changed, 9 insertions, 7 deletions

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);
             }
         }