Merged some changes from 6.5

svn changeset:17798/svn branch:6.6

3 files changed, 10 insertions, 1 deletions

diff --git a/build/buildhelpers/com/vaadin/buildhelpers/GeneratePackageExports.class b/build/buildhelpers/com/vaadin/buildhelpers/GeneratePackageExports.class
new file mode 100644
index 0000000000..c7f0d86336
--- /dev/null
+++ b/build/buildhelpers/com/vaadin/buildhelpers/GeneratePackageExports.class
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/GeneratePackageExports.java b/build/buildhelpers/com/vaadin/buildhelpers/GeneratePackageExports.java
index 742450f3d5..6f477601ed 100644
--- a/build/buildhelpers/com/vaadin/buildhelpers/GeneratePackageExports.java
+++ b/build/buildhelpers/com/vaadin/buildhelpers/GeneratePackageExports.java
@@ -92,6 +92,14 @@ public class GeneratePackageExports {
             Name name = (Name) attrit.next();
             keys.add(name.toString());
         }
+
+        // Jar must be closed before updating it below, as it's
+        // locked in Windows until closed. (#6045)
+        try {
+            jar.close();
+        } catch (IOException e) {
+            System.err.println("Unable to close JAR '"+jarFilename+"'");
+        }
         
         // Put the manifest version as the first line
         String orderedKeys[] = new String[keys.size()]; 
@@ -121,7 +129,8 @@ public class GeneratePackageExports {
         // the loop above, but it's not guaranteed that it exists.
         manifest.writeAttribute("Export-Package", exportPackage);
 
-        // Update the manifest in the Jar
+        // Update the manifest in the Jar. The jar must be closed
+        // before this is done.
         int status = manifest.updateJar(jarFilename);
 
         if (status != 0)
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/ManifestWriter.class b/build/buildhelpers/com/vaadin/buildhelpers/ManifestWriter.class
new file mode 100644
index 0000000000..bd48e3b356
--- /dev/null
+++ b/build/buildhelpers/com/vaadin/buildhelpers/ManifestWriter.class