svn commit: r942391 - /tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java

[slaws]

Author: slaws
Date: Sat May  8 14:39:28 2010
New Revision: 942391

URL: http://svn.apache.org/viewvc?rev=942391&view=rev
Log:
Don't install jars in the distribution lib folder into the OSGi runtime

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=942391&r1=942390&r2=942391&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
 Sat May  8 14:39:28 2010
@@ -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);
             }
+*/            
         }
     }