Author: rob.stryker(a)jboss.com Date: 2010-01-05 12:26:27 -0500 (Tue, 05 Jan 2010) New Revision: 19646 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java Log: JBIDE-5544 - fixed it Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-01-05 15:31:37 UTC (rev 19645) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-01-05 17:26:27 UTC (rev 19646) @@ -153,7 +153,7 @@ } protected IStatus[] removeModule(IServer server, String deployRoot, IModule[] module) { - IPath deployPath = getOutputFilePath(); + IPath deployPath = getOutputFilePath(module); final ArrayList<IStatus> status = new ArrayList<IStatus>(); IFileUtilListener listener = new IFileUtilListener() { public void fileCopied(File source, File dest, boolean result,Exception e) {} @@ -177,7 +177,7 @@ protected IStatus[] fullPublish(IServer server, String deployRoot, IModule[] module) { ArrayList<IStatus> results = new ArrayList<IStatus>(); try { - IPath path = getOutputFilePath(); + IPath path = getOutputFilePath(module); // Get rid of the old FileUtil.safeDelete(path.toFile(), null); @@ -189,6 +189,7 @@ IModule[] children = server.getChildModules(module, new NullProgressMonitor()); for( int i = 0; i < children.length; i++ ) results.addAll(Arrays.asList(fullPublish(server, deployRoot, combine(module, children[i])))); + TrueZipUtil.umount(); return (IStatus[]) results.toArray(new IStatus[results.size()]); } catch( CoreException ce) { results.add(generateCoreExceptionStatus(ce)); @@ -197,7 +198,7 @@ } protected IStatus[] publishChanges(IServer server, String deployRoot, IModule[] module) { - IPath path = getOutputFilePath(); + IPath path = getOutputFilePath(module); de.schlichtherle.io.File root = TrueZipUtil.getFile(path, TrueZipUtil.getJarArchiveDetector()); IModuleResourceDelta[] deltas = ((Server)server).getPublishedResourceDelta(module); return publishChanges(server, deltas, root); @@ -281,7 +282,7 @@ return retval; } - public IPath getOutputFilePath() { + public IPath getOutputFilePath(IModule[] module) { return getDeployPath(module, deployRoot); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2010-01-05 15:31:37 UTC (rev 19645) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2010-01-05 17:26:27 UTC (rev 19646) @@ -80,7 +80,7 @@ LocalZippedPublisherUtil localDelegate = new LocalZippedPublisherUtil(); IStatus localCopyStatus = localDelegate.publishModule(server, deployRoot.toOSString(), module, publishType, delta, monitor); - IPath outputFilepath = localDelegate.getOutputFilePath(); + IPath outputFilepath = localDelegate.getOutputFilePath(module); String deployFolder = getRemoteDeployFolder(server); String deployFile = new Path(deployFolder).append(outputFilepath.lastSegment()).toString();