From f3bed24affbd48a080d5f70071bb07449fb30516 Mon Sep 17 00:00:00 2001 From: slaws Date: Sat, 8 May 2010 14:39:28 +0000 Subject: 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 --- .../apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sca-java-2.x/trunk') 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 /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); } +*/ } } -- cgit v1.2.3