Author: rob.stryker(a)jboss.com Date: 2011-06-03 07:54:16 -0400 (Fri, 03 Jun 2011) New Revision: 31805 Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java Log: JBIDE-8952 critical fix to branch Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java =================================================================== --- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2011-06-03 10:35:24 UTC (rev 31804) +++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2011-06-03 11:54:16 UTC (rev 31805) @@ -38,8 +38,12 @@ }; public static DirectoryScannerExtension createDirectoryScanner(IArchiveStandardFileSet fs, boolean scan) { + String excludes = fs.getExcludesPattern(); + if( fs.getRootArchive().isDestinationInWorkspace() ) { + excludes += "," + fs.getRootArchive().getRawDestinationPath(); //$NON-NLS-1$ + } return createDirectoryScanner(fs.getRawSourcePath(), fs.getRootArchiveRelativePath(), - fs.getIncludesPattern(), fs.getExcludesPattern(), fs.getProjectName(), + fs.getIncludesPattern(), excludes, fs.getProjectName(), fs.isInWorkspace(), fs.getDescriptorVersion(), scan); }