Author: edwardsmj
Date: Fri May 7 15:21:46 2010
New Revision: 942121
URL: http://svn.apache.org/viewvc?rev=942121&view=rev
Log:
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
Modified:
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
Modified:
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java?rev=942121&r1=942120&r2=942121&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
Fri May 7 15:21:46 2010
@@ -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;
}
