svn commit: r1199889 - /incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java

[scottbw]

Author: scottbw
Date: Wed Nov  9 17:35:58 2011
New Revision: 1199889

URL: http://svn.apache.org/viewvc?rev=1199889&view=rev
Log:
Remove previous widget files when unzipping an updated version - see WOOKIE-239

Modified:
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java?rev=1199889&r1=1199888&r2=1199889&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
 Wed Nov  9 17:35:58 2011
@@ -26,6 +26,7 @@ import java.util.Enumeration;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 import org.apache.wookie.w3c.util.LocalizationUtils;
@@ -211,6 +212,11 @@ public class WidgetPackageUtils {
         * @throws IOException
         */
        public static void unpackZip(ZipFile zipfile, File targetFolder) throws 
IOException {
+         //
+         // Delete directory and contents if it already exists. See WOOKIE-239
+         //
+         if (targetFolder.exists() && targetFolder.isDirectory()) 
FileUtils.deleteDirectory(targetFolder);
+         
                targetFolder.mkdirs();
                BufferedOutputStream out = null;
                InputStream in = null;