1.1 --- a/autoproject.java/src/org/netbeans/modules/autoproject/java/BuildSniffer.java	Mon Aug 01 09:45:14 2011 -0400
     1.2 +++ b/autoproject.java/src/org/netbeans/modules/autoproject/java/BuildSniffer.java	Mon Aug 01 09:50:18 2011 -0400
     1.3 @@ -457,7 +457,7 @@
     1.4              basedirs.add(resolve(event, event.evaluate(basedir)).getAbsolutePath());
     1.5          }
     1.6          for (TaskStructure child : event.getTaskStructure().getChildren()) {
     1.7 -            if (child.getName().equals("fileset")) {
     1.8 +            if (child.getName().equals("fileset") || child.getName().equals("zipfileset")) {
     1.9                  basedir = child.getAttribute("dir");
    1.10                  if (basedir != null) {
    1.11                      basedirs.add(resolve(event, event.evaluate(basedir)).getAbsolutePath());

     2.1 --- a/autoproject.java/test/unit/src/org/netbeans/modules/autoproject/java/BuildSnifferTest.java	Mon Aug 01 09:45:14 2011 -0400
     2.2 +++ b/autoproject.java/test/unit/src/org/netbeans/modules/autoproject/java/BuildSnifferTest.java	Mon Aug 01 09:50:18 2011 -0400
     2.3 @@ -258,6 +258,7 @@
     2.4                  "  <jar destfile='c2.jar'><fileset dir='c'/></jar>\n" +
     2.5                  "  <jar jarfile='c3.jar' basedir='c'/>\n" +
     2.6                  "  <jar destfile='c4.jar'><fileset dir='c'/><fileset dir='s'/></jar>\n" +
     2.7 +                "  <jar destfile='c5.jar'><zipfileset dir='c'/></jar>\n" +
     2.8                  " </target>\n" +
     2.9                  "</project>\n");
    2.10          runAnt();
    2.11 @@ -266,6 +267,7 @@
    2.12          assertEquals(prefix + "c", Cache.get(prefix + "c2.jar" + JavaCacheConstants.JAR));
    2.13          assertEquals(prefix + "c", Cache.get(prefix + "c3.jar" + JavaCacheConstants.JAR));
    2.14          assertEquals(prefix + "c" + File.pathSeparator + prefix + "s", Cache.get(prefix + "c4.jar" + JavaCacheConstants.JAR));
    2.15 +        assertEquals(prefix + "c", Cache.get(prefix + "c5.jar" + JavaCacheConstants.JAR));
    2.16      }
    2.17  
    2.18      public void testComputedJar() throws Exception {