Author: rob.stryker(a)jboss.com Date: 2007-11-07 18:40:27 -0500 (Wed, 07 Nov 2007) New Revision: 4761 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java Log: JBIDE-975 separate filesets for each applicable folder. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java 2007-11-07 18:10:45 UTC (rev 4760) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java 2007-11-07 23:40:27 UTC (rev 4761) @@ -21,6 +21,8 @@ */ package org.jboss.ide.eclipse.as.core.extensions.archives; +import java.util.ArrayList; + import org.apache.tools.ant.DirectoryScanner; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -158,13 +160,23 @@ IPath path = new Path(files[0]); path = path.removeLastSegments(1).append("lib"); sourcePath = project.getFullPath().append(path).toString(); - } - - if(sourcePath == null) { + addFileset(project, folder, sourcePath, "*.jar"); // add default jars + } else { //having failed to find 'lib' directory, let us make source of the project itself sourcePath = project.getName(); + DirectoryScanner scanner2 = + DirectoryScannerFactory.createDirectoryScanner(projectPath, "**/*.jar", null, true); + String[] files2 = scanner2.getIncludedFiles(); + IPath p; + ArrayList list = new ArrayList(); + for( int i = 0; i < files2.length; i++ ) { + p = project.getFullPath().append(files2[i]).removeLastSegments(1); + if( !list.contains(p)) { + list.add(p); + addFileset(project, folder, p.toString(), "*.jar"); // add default jars + } + } } - addFileset(project, folder, sourcePath, "**/*.jar"); // add default jars } protected void addReferencedProjectsAsLibs(IProject project, IArchiveFolder folder) { IJavaProject jp = JavaCore.create(project);