ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/depend DependTest.java
Date Thu, 11 Apr 2002 04:24:17 GMT
conor       02/04/10 21:24:16

  Modified:    src/main/org/apache/tools/ant/types ZipFileSet.java
               src/testcases/org/apache/tools/ant/taskdefs/optional/depend
                        DependTest.java
  Added:       src/etc/testcases/taskdefs war.xml
               src/testcases/org/apache/tools/ant/taskdefs WarTest.java
  Log:
  Fix up zipfileset references to allow any fileset
  
  Revision  Changes    Path
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/war.xml
  
  Index: war.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <project name="war-test" basedir="." default="help">
    <property name="working.dir" value="working"/>
  
    <target name="help">
      <echo message="Test file for the war task"/>
    </target>
  
    <target name="setup">
      <mkdir dir="${working.dir}"/>
    </target>
    
    <target name="testlibrefs" depends="setup">
      <fileset id="test" dir="." includes="foobar"/>
      <war webxml="war.xml" destfile="${working.dir}/test.war">
        <lib refid="test"/>
      </war>
    </target>
    
    <target name="clean">
      <delete dir="${working.dir}"/>
    </target>
  </project>
  
  
  
  1.7       +20 -0     jakarta-ant/src/main/org/apache/tools/ant/types/ZipFileSet.java
  
  Index: ZipFileSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/ZipFileSet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- ZipFileSet.java	2 Feb 2002 08:06:45 -0000	1.6
  +++ ZipFileSet.java	11 Apr 2002 04:24:16 -0000	1.7
  @@ -58,6 +58,7 @@
   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 @@
           }
       }
   
  +    /**
  +     * 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;
  +        }
  +    }
   }
  
  
  
  1.1                  jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java
  
  Index: WarTest.java
  ===================================================================
  /*
   * 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
   * <http://www.apache.org/>.
   */
  
  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");
      }
  }
  
  
  
  1.6       +4 -1      jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
  
  Index: DependTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- DependTest.java	9 Apr 2002 13:20:08 -0000	1.5
  +++ DependTest.java	11 Apr 2002 04:24:16 -0000	1.6
  @@ -74,12 +74,15 @@
   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() {
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message