svn commit: r699996 - in /tuscany/branches/sca-equinox/modules: extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/ node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/

[jsdelfino]

Author: jsdelfino
Date: Sun Sep 28 23:28:04 2008
New Revision: 699996

URL: http://svn.apache.org/viewvc?rev=699996&view=rev
Log:
Added a log, and start bundle to help debugging.

Modified:
    
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
    
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java

Modified: 
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java?rev=699996&r1=699995&r2=699996&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
 (original)
+++ 
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
 Sun Sep 28 23:28:04 2008
@@ -45,6 +45,7 @@
 import org.apache.tuscany.sca.extensibility.ServiceDiscoverer;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 
 /**
  * A ServiceDiscoverer that find META-INF/services/... in installed bundles
@@ -220,6 +221,11 @@
                     URL entry = bundle.getEntry(serviceName);
                     if (entry != null) {
                         logger.warning("Unresolved resource " + serviceName + 
" found in " + toString(bundle));
+                        try {
+                            bundle.start();
+                        } catch (BundleException e) {
+                            throw new IllegalStateException(e);
+                        }
                         // urls = 
Collections.enumeration(Arrays.asList(entry));
                     }
                 }

Modified: 
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java?rev=699996&r1=699995&r2=699996&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
 (original)
+++ 
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
 Sun Sep 28 23:28:04 2008
@@ -246,9 +246,6 @@
                 if (bundleName.contains("org.eclipse.jdt.junit")) {
                     continue;
                 }
-                if (bundleName.contains("host.openejb")) {
-                    continue;
-                }
                 Bundle bundle = allBundles.get(bundleName);
                 if (bundle == null) {
                     long installStart = currentTimeMillis();
@@ -256,6 +253,7 @@
                     if (logger.isLoggable(Level.FINE)) {
                         logger.fine("Bundle installed in " + 
(currentTimeMillis() - installStart) + " ms: " + string(bundle, false));
                     }
+                    logger.info("Bundle installed in " + (currentTimeMillis() 
- installStart) + " ms: " + string(bundle, false));
                     allBundles.put(bundleName, bundle);
                     installedBundles.add(bundle);
                 }