diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-28 19:06:08 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-28 19:06:08 +0000 |
commit | 0376e0e4f9d31c3e08159f56a8a9d54b4dc47783 (patch) | |
tree | 8676c4444709d5ca7afad059702170aa3cc49875 /branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java | |
parent | db72136306cdedbee6b1cfb03a299fab8157ff8e (diff) |
Adjusted algorithm to determine classpath entries.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@699881 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java')
-rw-r--r-- | branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java | 13 |
1 files changed, 12 insertions, 1 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 e95263d2f2..96cde75779 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 @@ -158,7 +158,18 @@ class EquinoxHost { } // Determine the runtime classpath entries - Set<URL> urls = runtimeClasspathEntries(); + Set<URL> urls; + if (!startedEclipse) { + + // Use classpath entries from a distribution if there is one and the modules + // directories available in a dev environment for example + urls = runtimeClasspathEntries(true, false, true); + } else { + + // Use classpath entries from a distribution if there is one and the classpath + // entries on the current application's classloader + urls = runtimeClasspathEntries(true, true, false); + } // Sort out which are bundles (and not already installed) and which are just // regular JARs |