# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java Base (1.23)
+++ j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java Locally Modified (Based On 1.23)
@@ -175,8 +175,12 @@
             
             FileObject[] garbages = destRoot.getChildren();
             for (int i=0; i<garbages.length; i++) {
+                try {
                 garbages[i].delete();
+                } catch (java.io.IOException ioe) {
+                    Logger.getLogger(InitialServerFileDistributor.class.getName()).log(Level.FINER,null,ioe);
             }
+            }
             
             while(rootedEntries.hasNext()) {
                 J2eeModule.RootedEntry entry = (J2eeModule.RootedEntry) rootedEntries.next();
@@ -185,7 +189,7 @@
                 FileObject destFolder = ServerFileDistributor.findOrCreateParentFolder(destRoot, relativePath);
                 if (sourceFO.isData ()) {
                     //try {
-                        FileUtil.copyFile(sourceFO, destFolder, sourceFO.getName());
+                        ServerFileDistributor.createOrReplace(sourceFO, null, destRoot, relativePath);
                     /*} catch (java.io.SyncFailedException sfe) {
                         in = sourceFO.getInputStream();
                         FileObject destFO = destFolder.getFileObject(sourceFO.getName(), sourceFO.getExt());
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerFileDistributor.java
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerFileDistributor.java Base (1.30)
+++ j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerFileDistributor.java Locally Modified (Based On 1.30)
@@ -266,6 +266,13 @@
     
     private static void createOrReplace(FileObject sourceFO, FileObject targetFO,
             FileObject destRoot, String relativePath, AppChanges mc, Map destMap) throws IOException {
+        createOrReplace(sourceFO,targetFO, destRoot,relativePath);
+        destMap.remove(relativePath);
+        mc.record(relativePath);
+    }
+    
+    static void createOrReplace(FileObject sourceFO, FileObject targetFO,
+            FileObject destRoot, String relativePath) throws IOException {
         FileObject destFolder;
         OutputStream destStream = null;
         InputStream sourceStream = null;
@@ -279,7 +286,7 @@
                 destFolder = findOrCreateParentFolder(destRoot, relativePath);
             } else {
                 // remove from map to form of to-remove-target-list
-                destMap.remove(relativePath);
+                //destMap.remove(relativePath);
                 
                 //check timestamp
                 if (! sourceFO.lastModified().after(targetFO.lastModified())) {
@@ -292,7 +299,7 @@
                 destStream = targetFO.getOutputStream();
                 
             }
-            mc.record(relativePath);
+            //mc.record(relativePath);
             
             if (null == destStream) {
                 FileUtil.copyFile(sourceFO, destFolder, sourceFO.getName());