You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by mc...@apache.org on 2011/06/24 22:23:06 UTC

svn commit: r1139425 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java

Author: mcculls
Date: Fri Jun 24 20:23:05 2011
New Revision: 1139425

URL: http://svn.apache.org/viewvc?rev=1139425&view=rev
Log:
FELIX-2934: don't add '.' to Bundle-ClassPath when embedding dependencies into WABs

Modified:
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java?rev=1139425&r1=1139424&r2=1139425&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java Fri Jun 24 20:23:05 2011
@@ -108,7 +108,7 @@ public final class DependencyEmbedder ex
             }
         }
 
-        if ( bundleClassPath.length() > 0 )
+        if ( analyzer.getProperty( Analyzer.WAB ) == null && bundleClassPath.length() > 0 )
         {
             // set explicit default before merging dependency classpath
             if ( analyzer.getProperty( Analyzer.BUNDLE_CLASSPATH ) == null )