diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-24 00:56:09 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-24 00:56:09 +0000 |
commit | 9f462538f3ac1e5522a87206a0668ecdecc9e3c4 (patch) | |
tree | 276a6df554ed8b27127ee751c2f645e3904af065 /branches | |
parent | 635fe997f91dbec1cf8ab0b7aeb8c76c56330013 (diff) |
Fix the file separator issue with windows
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@698408 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
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 |