Author: rob.stryker(a)jboss.com Date: 2010-12-05 23:51:08 -0500 (Sun, 05 Dec 2010) New Revision: 27180 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/InnerZipResourceTimestampTest.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java Log: JBIDE-7199 - jdtCompilerAdapter issue - whew Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2010-12-06 04:48:21 UTC (rev 27179) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2010-12-06 04:51:08 UTC (rev 27180) @@ -57,7 +57,7 @@ public static boolean copyFile(String source, de.schlichtherle.io.File file) { file.getParentFile().mkdirs(); - boolean b = new de.schlichtherle.io.File(source).archiveCopyAllTo(file); + boolean b = new de.schlichtherle.io.File(source, ArchiveDetector.NULL).archiveCopyAllTo(file); return b && updateParentTimestamps(file); } Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/InnerZipResourceTimestampTest.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/InnerZipResourceTimestampTest.java 2010-12-06 04:48:21 UTC (rev 27179) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/InnerZipResourceTimestampTest.java 2010-12-06 04:51:08 UTC (rev 27180) @@ -65,15 +65,14 @@ } catch(IOException ioe){} return null; } - + public void testRawTruezipTimestamps() { java.io.File someJar = findSomeJar(); IPath src = new Path(someJar.getAbsolutePath()); IPath dest = ArchivesTest.getDefault().getStateLocation().append("some.jar"); - //File destFile = new de.schlichtherle.io.File(dest.toOSString(), new PureSourceArchiveDetector()); - File destFile = new de.schlichtherle.io.File(dest.toOSString(), ArchiveDetector.NULL); + File destFile = new de.schlichtherle.io.File(dest.toOSString(), ArchiveDetector.DEFAULT); - boolean copySuccess = new de.schlichtherle.io.File(someJar).archiveCopyAllTo(destFile); + boolean copySuccess = new de.schlichtherle.io.File(someJar, ArchiveDetector.NULL).archiveCopyAllTo(destFile); destFile.setLastModified(new Date().getTime()); TrueZipUtil.umount(); assertTrue(copySuccess); @@ -146,11 +145,4 @@ e.printStackTrace(); } } - - - private static class PureSourceArchiveDetector extends AbstractArchiveDetector { - public ArchiveDriver getArchiveDriver(String path) { - return null; - } - } } 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-12-06 04:48:21 UTC (rev 27179) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-12-06 04:51:08 UTC (rev 27180) @@ -264,7 +264,7 @@ IModuleFile mf = (IModuleFile)children[i]; java.io.File source = getFile(mf); de.schlichtherle.io.File destination = getFileInArchive(root, mf.getModuleRelativePath().append(mf.getName())); - boolean b = new de.schlichtherle.io.File(source).archiveCopyAllTo(destination); + boolean b = new de.schlichtherle.io.File(source, ArchiveDetector.NULL).archiveCopyAllTo(destination); if( !b ) results.add(generateCopyFailStatus(source, destination)); } else if( children[i] instanceof IModuleFolder ) { @@ -290,7 +290,7 @@ protected de.schlichtherle.io.File getFileInArchive(de.schlichtherle.io.File root, IPath relative) { while(relative.segmentCount() > 0 ) { root = new de.schlichtherle.io.File(root, - relative.segment(0), ArchiveDetector.DEFAULT); + relative.segment(0), ArchiveDetector.NULL); relative = relative.removeFirstSegments(1); } return root;