# 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/emptyJar.jar MIME: application/octet-stream; encoding: Base64; length: 345 UEsDBBQACAAIAHNmJDgAAAAAAAAAAAAAAAAJAAQATUVUQS1JTkYv/soAAAMA UEsHCAAAAAACAAAAAAAAAFBLAwQUAAgACABzZiQ4AAAAAAAAAAAAAAAAFAAA AE1FVEEtSU5GL01BTklGRVNULk1G803My0xLLS7RDUstKs7Mz7NSMNQz4OVy LkpNLElN0XWqBAmY6RnEGxgraASX5in4ZiYX5RdXFpek5hYreOYl62nycvFy AQBQSwcIwvY1j0cAAABHAAAAUEsBAhQAFAAIAAgAc2YkOAAAAAACAAAAAAAA AAkABAAAAAAAAAAAAAAAAAAAAE1FVEEtSU5GL/7KAABQSwECFAAUAAgACABz ZiQ4wvY1j0cAAABHAAAAFAAAAAAAAAAAAAAAAAA9AAAATUVUQS1JTkYvTUFO SUZFU1QuTUZQSwUGAAAAAAIAAgB9AAAAxgAAAAAA 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) @@ -44,14 +44,17 @@ import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Iterator; +import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.j2ee.deployment.execution.DeploymentTarget; import org.netbeans.modules.j2ee.deployment.execution.ModuleConfigurationProvider; import javax.enterprise.deploy.spi.Target; +import org.openide.filesystems.FileAlreadyLockedException; import org.openide.util.NbBundle; import javax.enterprise.deploy.shared.CommandType; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; @@ -61,6 +64,7 @@ import org.openide.filesystems.FileLock; import org.openide.filesystems.FileUtil; import org.netbeans.modules.j2ee.deployment.plugins.spi.IncrementalDeployment; +import org.openide.util.Utilities; /** * @@ -175,8 +179,22 @@ FileObject[] garbages = destRoot.getChildren(); for (int i=0; i