summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-10-04 16:32:06 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-10-04 16:32:06 +0000
commit683e110cccf929388b5a0bf3ef36c8fe603c3b8e (patch)
treede2effc771ad60252d50748bf9fe5a1c00007b58
parent52d2b04f2790ad5554ea160bcfd09f2053f2a722 (diff)
Add more info about where bundles are coming from and what bundles are causing problems.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1004317 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java8
-rw-r--r--sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index 97b4a7696b..122729a2a4 100644
--- a/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
@@ -288,17 +288,17 @@ public class EquinoxServiceDiscoverer implements ServiceDiscoverer {
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 implements ServiceDiscoverer {
descriptors.add(descriptor);
}
} catch (IOException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
+ logger.log(Level.SEVERE, "Bundle: " + bundle.getSymbolicName() + " - " + e.getMessage(), e);
}
}
}
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index a5ae4b38af..ae7aa57cb9 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
@@ -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));
}