Return-Path: 
 <commons-dev-return-22441-qmlist-jakarta-archive-commons-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@apache.org
Received: (qmail 31087 invoked from network); 8 Jan 2003 17:03:48 -0000
Received: from exchange.sun.com (192.18.33.10)
  by daedalus.apache.org with SMTP; 8 Jan 2003 17:03:48 -0000
Received: (qmail 11383 invoked by uid 97); 8 Jan 2003 17:05:05 -0000
Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org
Received: (qmail 11364 invoked by uid 97); 8 Jan 2003 17:05:04 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 11353 invoked by uid 97); 8 Jan 2003 17:05:03 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 8 Jan 2003 17:03:40 -0000
Message-ID: <20030108170340.69879.qmail@icarus.apache.org>
From: morgand@apache.org
To: jakarta-commons-sandbox-cvs@apache.org
Subject: cvs commit: jakarta-commons-sandbox/jelly/jelly-tags/html build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

morgand     2003/01/08 09:03:40

  Modified:    jelly/jelly-tags/html build.xml
  Log:
  rebuilt ant script with an up-to-date Maven install
  
  Revision  Changes    Path
  1.2       +112 -41   jakarta-commons-sandbox/jelly/jelly-tags/html/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/html/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	3 Jan 2003 21:55:57 -0000	1.1
  +++ build.xml	8 Jan 2003 17:03:40 -0000	1.2
  @@ -6,12 +6,24 @@
     <property name="classesdir" value="target/classes"></property>
     <property name="testclassesdir" value="target/test-classes"></property>
     <property name="testreportdir" value="target/test-reports"></property>
  +  
  +  
  +  
  +  
  +  	
  +		
  +		  
  +		
  +  
  +  
  +  <property name="resourcedir" value="."></property>
  +  
     <property name="distdir" value="dist"></property>
     <property name="javadocdir" value="target/docs/apidocs"></property>
  -  <property name="final.name" value="commons-jelly-tags-html-1.0-beta-1"></property>
  +  <property name="final.name" value="commons-jelly-tags-html-1.0-SNAPSHOT"></property>
     
     <target name="init" description="o Initializes some properties">
  -
  +    <mkdir dir="lib"></mkdir>
       <condition property="noget">
         <equals arg2="only" arg1="${build.sysclasspath}"></equals>
       </condition>
  @@ -33,6 +45,54 @@
       </javac>
       
       
  +		
  + 
  +    <copy todir="${classesdir}">
  +      
  +      
  +      
  +      
  +      <fileset dir="src/java">
  +      
  +      
  +        <include name="**/*.properties"></include>
  +      
  +      
  +      </fileset>
  +    </copy>
  +    
  +		
  +
  +    
  +		
  + 
  +    <copy todir="${testclassesdir}">
  +      
  +      
  +      
  +      
  +      <fileset dir="src/test">
  +      
  +      
  +        <include name="**/*.jelly"></include>
  +      
  +        <include name="**/*.xml"></include>
  +      
  +        <include name="**/*.xsl"></include>
  +      
  +        <include name="**/*.rng"></include>
  +      
  +        <include name="**/*.dtd"></include>
  +      
  +        <include name="**/*.properties"></include>
  +      
  +        <include name="**/*.html"></include>
  +      
  +      
  +      </fileset>
  +    </copy>
  + 
  +		
   
     </target>
       
  @@ -54,46 +114,57 @@
       </copy>
     </target>
    
  -  <target name="test" description="o Run the test cases" depends="compile-tests">
  -    <mkdir dir="${testreportdir}"></mkdir>
  -    <junit dir="./" printSummary="yes" fork="true" haltonerror="true">
  -      <sysproperty key="basedir" value="src/test"></sysproperty>
  -      <formatter type="xml"></formatter>
  -      <formatter usefile="true" type="plain"></formatter>
  -      <classpath>
  -        <fileset dir="lib">
  -          <include name="*.jar"></include>
  -        </fileset>
  -        <pathelement location="target/${final.name}.jar"></pathelement>
  -        <pathelement path="${testclassesdir}"></pathelement>
  -      </classpath>
  -      <batchtest todir="${testreportdir}">
  -        <fileset dir="src/test">
  -              
  -                <include name="**/Test*.java"></include>
  -              
  -              
  -        </fileset>
  -      </batchtest>
  -    </junit>
  +  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
  +    <fail message="There were test failures."></fail>
  +  </target>
  +  <target name="internal-test" depends="compile-tests">
  +    
  +      <mkdir dir="${testreportdir}"></mkdir>
  +      <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
  +        
  +        <sysproperty key="basedir" value="."></sysproperty>
  +        <formatter type="xml"></formatter>
  +        <formatter usefile="true" type="plain"></formatter>
  +        <classpath>
  +          <fileset dir="lib">
  +            <include name="*.jar"></include>
  +          </fileset>
  +          <pathelement path="${testclassesdir}"></pathelement>
  +          <pathelement path="${classesdir}"></pathelement>
  +        </classpath>
  +        <batchtest todir="${testreportdir}">
  +          <fileset dir="src/test">
  +            
  +              <include name="**/Test*.java"></include>
  +            
  +            
  +            
  +            
  +            
  +          </fileset>
  +        </batchtest>
  +      </junit>
  +    
     </target>
   
     <target name="compile-tests" depends="compile">
  -    <mkdir dir="${testclassesdir}"></mkdir>
  -    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
  -      <src>
  -        <pathelement location="src/test"></pathelement>
  -      </src>
  -      <classpath>
  -        <fileset dir="lib">
  -          <include name="*.jar"></include>
  -        </fileset>
  -        <pathelement location="target/${final.name}.jar"></pathelement>
  -      </classpath>
  -    </javac>
  -
       
  +      <mkdir dir="${testclassesdir}"></mkdir>
  +      <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
  +        <src>
  +          <pathelement location="src/test"></pathelement>
  +        </src>
  +        <classpath>
  +          <fileset dir="lib">
  +            <include name="*.jar"></include>
  +          </fileset>
  +          <pathelement path="${classesdir}"></pathelement>
  +        </classpath>
  +      </javac>
  +
  +      
      
  +      
       
     </target>
   
  @@ -109,7 +180,7 @@
    
       <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
    
  -    <property name="title" value="commons-jelly-tags-html 1.0-beta-1 API"></property>
  +    <property name="title" value="commons-jelly-tags-html 1.0-SNAPSHOT API"></property>
    
       <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.jelly.tags.html.*">
         <classpath>
  @@ -124,7 +195,6 @@
   
     <target name="get-deps" unless="noget" depends="init">
     
  -    <mkdir dir="lib"></mkdir>
       
       <get dest="lib/commons-jexl-1.0-beta-1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.0-beta-1.jar"></get>
       <get dest="lib/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar"></get>
  @@ -135,10 +205,11 @@
       <get dest="lib/jaxp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jaxp/jars/jaxp-1.2.jar"></get>
       <get dest="lib/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar"></get>
       <get dest="lib/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar"></get>
  -    <get dest="lib/nekohtml-0.6.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/nekohtml/jars/nekohtml-0.6.5.jar"></get>
  +    <get dest="lib/nekohtml-0.7.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/nekohtml/jars/nekohtml-0.7.1.jar"></get>
       
       <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get>
  -  
  +    <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get>
  +    <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get>
     </target>
   
     
  
  
  

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