Author: rfeng
Date: Tue Sep 23 17:56:09 2008
New Revision: 698408
URL: http://svn.apache.org/viewvc?rev=698408&view=rev
Log:
Fix the file separator issue with windows
Modified:
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
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=698408&r1=698407&r2=698408&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
Tue Sep 23 17:56:09 2008
@@ -275,7 +275,7 @@
//bundle.start();
} catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e);
- throw e;
+ // throw e;
}
logger.info("Bundle: " + string(bundle, false));
}
Modified:
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.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/NodeLauncherUtil.java?rev=698408&r1=698407&r2=698408&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
(original)
+++
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
Tue Sep 23 17:56:09 2008
@@ -499,7 +499,7 @@
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 @@
}
}
}
- } 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
