svn commit: r683313 - in /felix/trunk/bundleplugin/src: main/java/org/apache/felix/bundleplugin/ test/java/org/apache/felix/bundleplugin/

[mcculls]

Author: mcculls
Date: Wed Aug  6 09:05:23 2008
New Revision: 683313

URL: http://svn.apache.org/viewvc?rev=683313&view=rev
Log:
FELIX-661: must remember to close all BND builders and analyzers

Modified:
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
    
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java?rev=683313&r1=683312&r2=683313&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
 Wed Aug  6 09:05:23 2008
@@ -82,6 +82,9 @@
             buildXml = StringUtils.replace( buildXml, "ARTIFACT_ID", 
artifactId );
 
             FileUtils.fileWrite( baseDir + BUILD_XML, buildXml );
+
+            // cleanup...
+            builder.close();
         }
         catch ( Exception e )
         {

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java?rev=683313&r1=683312&r2=683313&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
 Wed Aug  6 09:05:23 2008
@@ -383,6 +383,10 @@
 
             BundleInfo bundleInfo = addExportedPackages( project, 
exportedPackages );
 
+            // cleanup...
+            analyzer.close();
+            osgiJar.close();
+
             return bundleInfo;
         }
         /* too bad Jar.write throws Exception */

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=683313&r1=683312&r2=683313&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 Wed Aug  6 09:05:23 2008
@@ -334,6 +334,9 @@
                     getLog().error( "Error trying to write Manifest to file " 
+ outputFile, e );
                 }
             }
+
+            // cleanup...
+            builder.close();
         }
         catch ( MojoFailureException e )
         {

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java?rev=683313&r1=683312&r2=683313&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
 Wed Aug  6 09:05:23 2008
@@ -36,6 +36,7 @@
 import org.apache.maven.project.MavenProject;
 
 import aQute.lib.osgi.Analyzer;
+import aQute.lib.osgi.Builder;
 import aQute.lib.osgi.Jar;
 
 
@@ -56,7 +57,9 @@
         {
             if ( "bundle".equals( project.getPackaging() ) )
             {
-                manifest = buildOSGiBundle( project, instructions, properties, 
classpath ).getJar().getManifest();
+                Builder builder = buildOSGiBundle( project, instructions, 
properties, classpath );
+                manifest = builder.getJar().getManifest();
+                builder.close();
             }
             else
             {
@@ -131,7 +134,12 @@
             }
         }
 
-        return analyzer.getJar().getManifest();
+        Manifest manifest = analyzer.getJar().getManifest();
+
+        // cleanup...
+        analyzer.close();
+
+        return manifest;
     }
 
 

Modified: 
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java?rev=683313&r1=683312&r2=683313&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
 (original)
+++ 
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
 Wed Aug  6 09:05:23 2008
@@ -122,6 +122,8 @@
         analyzer.calcManifest();
 
         assertEquals( 3, analyzer.getExports().size() );
+
+        analyzer.close();
     }