From bbc333a9beba4f07085696e59587bcab4ee8faf5 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Thu, 11 Apr 2002 04:24:16 +0000 Subject: [PATCH] Fix up zipfileset references to allow any fileset git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272352 13f79535-47bb-0310-9956-ffa450edef68 --- src/etc/testcases/taskdefs/war.xml | 24 ++++++ .../apache/tools/ant/types/ZipFileSet.java | 20 +++++ .../apache/tools/ant/taskdefs/WarTest.java | 86 +++++++++++++++++++ .../taskdefs/optional/depend/DependTest.java | 5 +- 4 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 src/etc/testcases/taskdefs/war.xml create mode 100644 src/testcases/org/apache/tools/ant/taskdefs/WarTest.java diff --git a/src/etc/testcases/taskdefs/war.xml b/src/etc/testcases/taskdefs/war.xml new file mode 100644 index 000000000..d83908cdf --- /dev/null +++ b/src/etc/testcases/taskdefs/war.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java index 71798e0e4..99452c3d6 100644 --- a/src/main/org/apache/tools/ant/types/ZipFileSet.java +++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java @@ -58,6 +58,7 @@ import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; +import java.util.Stack; /** * A ZipFileSet is a FileSet with extra attributes useful in the context of @@ -182,4 +183,23 @@ public class ZipFileSet extends FileSet { } } + /** + * A ZipFileset can accept any fileset as a reference as it just uses the + * standard directory scanner. + */ + protected AbstractFileSet getRef(Project p) { + if (!checked) { + Stack stk = new Stack(); + stk.push(this); + dieOnCircularReference(stk, p); + } + + Object o = ref.getReferencedObject(p); + if (!(o instanceof FileSet)) { + String msg = ref.getRefId()+" doesn\'t denote a fileset"; + throw new BuildException(msg); + } else { + return (AbstractFileSet) o; + } + } } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java new file mode 100644 index 000000000..d09f90aa4 --- /dev/null +++ b/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java @@ -0,0 +1,86 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Ant", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + */ + +package org.apache.tools.ant.taskdefs; + +import org.apache.tools.ant.BuildFileTest; + +/** + * Testcase for the war task + * + * @author Conor MacNeill + */ +public class WarTest extends BuildFileTest { + public static final String TEST_BUILD_FILE + = "src/etc/testcases/taskdefs/war.xml"; + + public WarTest(String name) { + super(name); + } + + public void setUp() { + configureProject(TEST_BUILD_FILE); + } + + public void tearDown() { + executeTarget("clean"); + } + + /** + * Test direct dependency removal + */ + public void testLibRefs() { + executeTarget("testlibrefs"); + } +} diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java index 9c48b076b..20bae5417 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java @@ -74,12 +74,15 @@ import org.apache.tools.ant.DirectoryScanner; public class DependTest extends BuildFileTest { public static final String RESULT_FILESET = "result"; + public static final String TEST_BUILD_FILE + = "src/etc/testcases/taskdefs/optional/depend/depend.xml"; + public DependTest(String name) { super(name); } public void setUp() { - configureProject("src/etc/testcases/taskdefs/optional/depend/depend.xml"); + configureProject(TEST_BUILD_FILE); } public void tearDown() {