You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/10/04 18:32:06 UTC

svn commit: r1004317 - in /tuscany/sca-java-2.x/trunk/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/

Author: slaws
Date: Mon Oct  4 16:32:06 2010
New Revision: 1004317

URL: http://svn.apache.org/viewvc?rev=1004317&view=rev
Log:
Add more info about where bundles are coming from and what bundles are causing problems. 

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

Modified: tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java?rev=1004317&r1=1004316&r2=1004317&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java Mon Oct  4 16:32:06 2010
@@ -288,17 +288,17 @@ public class EquinoxServiceDiscoverer im
                 if (urls == null) {
                     URL entry = bundle.getEntry(serviceName);
                     if (entry != null) {
-                        logger.warning("Unresolved resource " + serviceName + " found in " + toString(bundle));
+                        logger.warning("Unresolved resource " + serviceName + " found in bundle: " + toString(bundle));
                         try {
                             bundle.start();
                         } catch (BundleException e) {
-                            logger.log(Level.SEVERE, e.getMessage(), e);
+                            logger.log(Level.SEVERE, "Bundle: " + bundle.getSymbolicName() + " - " + e.getMessage(), e);
                         }
                         // urls = Collections.enumeration(Arrays.asList(entry));
                     }
                 }
             } catch (IOException e) {
-                logger.log(Level.SEVERE, e.getMessage(), e);
+                logger.log(Level.SEVERE, "Bundle: " + bundle.getSymbolicName() + " - " + e.getMessage(), e);
             }
             if (urls == null) {
                 continue;
@@ -322,7 +322,7 @@ public class EquinoxServiceDiscoverer im
                         descriptors.add(descriptor);
                     }
                 } catch (IOException e) {
-                    logger.log(Level.SEVERE, e.getMessage(), e);
+                    logger.log(Level.SEVERE, "Bundle: " + bundle.getSymbolicName() + " - " + e.getMessage(), e);
                 }
             }
         }

Modified: tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java?rev=1004317&r1=1004316&r2=1004317&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java Mon Oct  4 16:32:06 2010
@@ -514,7 +514,7 @@ public class EquinoxHost {
             }
             bundle = bundleContext.installBundle(location);
             if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Bundle installed in " + (currentTimeMillis() - installStart)
+                logger.fine("Bundle " + bundleFile + " installed in " + (currentTimeMillis() - installStart)
                     + " ms: "
                     + string(bundle, false));
             }