summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java2
-rw-r--r--branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index f47a088c52..2307e94907 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
@@ -275,7 +275,7 @@ public class EquinoxHost {
//bundle.start();
} catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e);
- throw e;
+ // throw e;
}
logger.info("Bundle: " + string(bundle, false));
}
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index 96e2684cb9..c2544a1872 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
@@ -499,7 +499,7 @@ final class NodeLauncherUtil {
Manifest manifest = new Manifest(new FileInputStream(mf));
bundleName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME);
} else {
- if (file.getPath().endsWith("target/classes")) {
+ if (file.toURI().getPath().endsWith("/target/classes/")) {
// Development mode, MANIFEST.MF is outside the bundle location
mf = new File(file.getParentFile().getParentFile(), "META-INF/MANIFEST.MF");
if (mf.isFile()) {
@@ -652,7 +652,7 @@ final class NodeLauncherUtil {
}
}
}
- } else if (uri.getPath().endsWith("target/classes/")) {
+ } else if (uri.getPath().endsWith("/target/classes/")) {
// Development mode, we're running off classes in a workspace
// and not from Maven surefire, collect all bundles in the workspace