1.1 --- a/autoproject.java/manifest.mf	Fri Jul 29 10:31:27 2011 +0200
     1.2 +++ b/autoproject.java/manifest.mf	Mon Aug 01 09:51:11 2011 -0400
     1.3 @@ -3,5 +3,5 @@
     1.4  OpenIDE-Module: org.netbeans.modules.autoproject.java
     1.5  OpenIDE-Module-Layer: org/netbeans/modules/autoproject/java/layer.xml
     1.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoproject/java/Bundle.properties
     1.7 -OpenIDE-Module-Specification-Version: 1.35
     1.8 +OpenIDE-Module-Specification-Version: 1.36
     1.9  

     2.1 --- a/autoproject.java/src/org/netbeans/modules/autoproject/java/BuildSniffer.java	Fri Jul 29 10:31:27 2011 +0200
     2.2 +++ b/autoproject.java/src/org/netbeans/modules/autoproject/java/BuildSniffer.java	Mon Aug 01 09:51:11 2011 -0400
     2.3 @@ -450,17 +450,17 @@
     2.4          if (jar == null) {
     2.5              return;
     2.6          }
     2.7 -        String key = resolve(event, jar) + JavaCacheConstants.JAR;
     2.8 +        String key = resolve(event, event.evaluate(jar)) + JavaCacheConstants.JAR;
     2.9          List<String> basedirs = new ArrayList<String>();
    2.10          String basedir = event.getTaskStructure().getAttribute("basedir");
    2.11          if (basedir != null) {
    2.12 -            basedirs.add(resolve(event, basedir).getAbsolutePath());
    2.13 +            basedirs.add(resolve(event, event.evaluate(basedir)).getAbsolutePath());
    2.14          }
    2.15          for (TaskStructure child : event.getTaskStructure().getChildren()) {
    2.16 -            if (child.getName().equals("fileset")) {
    2.17 +            if (child.getName().equals("fileset") || child.getName().equals("zipfileset")) {
    2.18                  basedir = child.getAttribute("dir");
    2.19                  if (basedir != null) {
    2.20 -                    basedirs.add(resolve(event, basedir).getAbsolutePath());
    2.21 +                    basedirs.add(resolve(event, event.evaluate(basedir)).getAbsolutePath());
    2.22                  }
    2.23              }
    2.24          }

     3.1 --- a/autoproject.java/test/unit/src/org/netbeans/modules/autoproject/java/BuildSnifferTest.java	Fri Jul 29 10:31:27 2011 +0200
     3.2 +++ b/autoproject.java/test/unit/src/org/netbeans/modules/autoproject/java/BuildSnifferTest.java	Mon Aug 01 09:51:11 2011 -0400
     3.3 @@ -258,6 +258,7 @@
     3.4                  "  <jar destfile='c2.jar'><fileset dir='c'/></jar>\n" +
     3.5                  "  <jar jarfile='c3.jar' basedir='c'/>\n" +
     3.6                  "  <jar destfile='c4.jar'><fileset dir='c'/><fileset dir='s'/></jar>\n" +
     3.7 +                "  <jar destfile='c5.jar'><zipfileset dir='c'/></jar>\n" +
     3.8                  " </target>\n" +
     3.9                  "</project>\n");
    3.10          runAnt();
    3.11 @@ -266,6 +267,23 @@
    3.12          assertEquals(prefix + "c", Cache.get(prefix + "c2.jar" + JavaCacheConstants.JAR));
    3.13          assertEquals(prefix + "c", Cache.get(prefix + "c3.jar" + JavaCacheConstants.JAR));
    3.14          assertEquals(prefix + "c" + File.pathSeparator + prefix + "s", Cache.get(prefix + "c4.jar" + JavaCacheConstants.JAR));
    3.15 +        assertEquals(prefix + "c", Cache.get(prefix + "c5.jar" + JavaCacheConstants.JAR));
    3.16 +    }
    3.17 +
    3.18 +    public void testComputedJar() throws Exception {
    3.19 +        write("build.xml",
    3.20 +                "<project default='c'>\n" +
    3.21 +                " <target name='c'>\n" +
    3.22 +                "  <mkdir dir='s'/>\n" +
    3.23 +                "  <property name='b' location='b'/>\n" +
    3.24 +                "  <mkdir dir='${b}/c'/>\n" +
    3.25 +                "  <javac srcdir='s' destdir='${b}/c'/>\n" +
    3.26 +                "  <jar destfile='${b}/c.jar' basedir='${b}/c'/>\n" +
    3.27 +                " </target>\n" +
    3.28 +                "</project>\n");
    3.29 +        runAnt();
    3.30 +        assertEquals(prefix + "b" + File.separator + "c", Cache.get(prefix + "s" + JavaCacheConstants.BINARY));
    3.31 +        assertEquals(prefix + "b" + File.separator + "c", Cache.get(prefix + "b" + File.separator + "c.jar" + JavaCacheConstants.JAR));
    3.32      }
    3.33  
    3.34      public void testIncludesExcludes() throws Exception {