diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache')
2 files changed, 6 insertions, 1 deletions
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 90c89fda70..f82e855abb 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 @@ -294,7 +294,7 @@ public class EquinoxHost { for (int i = 0, n = bundleFiles.size(); i < n; i++) { URL bundleFile = bundleFiles.get(i); String bundleName = bundleNames.get(i); - if (bundleName.contains("org.eclipse.jdt.junit")) { + if (bundleName.contains("org.eclipse.jdt.junit") || bundleName.contains("org.apache.tuscany.sca.base")) { continue; } installBundle(bundleFile, bundleName); diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java index 43d5965cc7..851df85d35 100644 --- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java +++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java @@ -86,6 +86,7 @@ import org.osgi.framework.Constants; */ final class NodeLauncherUtil { private static final String NODE_API_BUNDLE = "org.apache.tuscany.sca.node.api"; + private static final String BASE_BUNDLE = "org.apache.tuscany.sca.base"; private static final Logger logger = Logger.getLogger(NodeLauncherUtil.class.getName()); @@ -129,6 +130,10 @@ final class NodeLauncherUtil { bundle = b; break; } + if (b.getSymbolicName().contains(BASE_BUNDLE)) { + bundle = b; + break; + } } if (bundle == null) { throw new IllegalStateException("Bundle " + NODE_API_BUNDLE + " is not installed"); |