Don't install jars in the distribution lib folder into the OSGi runtime

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@942391 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 0 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 fff146ace9..43d5965cc7 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
@@ -867,12 +867,17 @@ final class NodeLauncherUtil {
             }
 
             // Collect files under <directory>/lib
+/* SL - this is commented out to prevent the jars in the lib dir being installed as 
+ *      OSGi bundles. There must have been a time (1.x?) when lib jars would have been 
+ *      installed but now the shaded jars live in lib and we don't want to install them
+ *             
             File libDirectory = new File(directoryFile, "lib");
             URL libDirectoryURL = libDirectory.toURI().toURL();
             if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
                 jarDirectoryURLs.add(libDirectoryURL);
                 collectClasspathEntries(libDirectory, jarURLs, filter, true);
             }
+*/            
         }
     }