summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authoredwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>2010-05-07 15:21:46 +0000
committeredwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>2010-05-07 15:21:46 +0000
commitb978f642a6631e2091bd3ce139dc935832a06f84 (patch)
tree73e33525f3aa022bac2a57a2815aefcff730a5dc /sca-java-2.x/trunk
parent34a6dd82886600e219c8fb2d307b0bde4859045c (diff)
Fix enabling Tuscany SDO modules to load under OSGi - code previously treated them as if they were Tuscany SCA modules and as a result they were not being loaded at all under OSGi
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@942121 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java4
1 files changed, 3 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/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 939372d782..fff146ace9 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
@@ -1194,9 +1194,11 @@ final class NodeLauncherUtil {
return true;
}
- // Filter out the Tuscany jars - since the development versions of these are used
+ // Filter out the Tuscany SCA jars - since the development versions of these are used
// from the \target\classes directories...
if (name.startsWith("tuscany")) {
+ // tuscany-sdo jars don't form part of the SCA modules...
+ if (name.startsWith("tuscany-sdo")) return true;
return false;
}