felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r723253 - in /felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi: Analyzer.java Verifier.java
Date Thu, 04 Dec 2008 08:57:54 GMT
Author: mcculls
Date: Thu Dec  4 00:57:54 2008
New Revision: 723253

URL: http://svn.apache.org/viewvc?rev=723253&view=rev
Log:
FELIX-660: temporarily commit BND patch

Modified:
    felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
    felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java

Modified: felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java?rev=723253&r1=723252&r2=723253&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java Thu Dec  4 00:57:54
2008
@@ -1580,7 +1580,7 @@
                     }
                 } else {
                     if (dot.getDirectories().containsKey(path)) {
-                        analyzeJar(dot, path, classSpace, contained, referred,
+                        analyzeJar(dot, path + '/', classSpace, contained, referred,
                                 uses);
                     } else {
                         warning("No sub JAR or directory " + path);

Modified: felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java?rev=723253&r1=723252&r2=723253&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java Thu Dec  4 00:57:54
2008
@@ -159,8 +159,7 @@
 
                         try {
                             Jar sub = new Jar(jarOrDir);
-                            EmbeddedResource.build(sub, resource);
-                            
+                            addClose(sub);
                             // TODO verify if directory exists and see how to 
                             // get it in a JAR ...
                             list.add(sub);



Mime
View raw message