Return-Path: 
 <dev-return-61925-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 68945 invoked from network); 1 Dec 2004 22:49:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 1 Dec 2004 22:49:12 -0000
Received: (qmail 18148 invoked by uid 500); 1 Dec 2004 22:49:07 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 18076 invoked by uid 500); 1 Dec 2004 22:49:07 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 18033 invoked by uid 500); 1 Dec 2004 22:49:06 -0000
Received: (qmail 18024 invoked by uid 99); 1 Dec 2004 22:49:06 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 01 Dec 2004 14:49:03 -0800
Received: (qmail 68777 invoked by uid 1365); 1 Dec 2004 22:49:02 -0000
Date: 1 Dec 2004 22:49:02 -0000
Message-ID: <20041201224902.68776.qmail@minotaur.apache.org>
From: stevel@apache.org
To: ant-cvs@apache.org
Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional
 XMLValidateTask.java
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

stevel      2004/12/01 14:49:02

  Modified:    src/etc/testcases/taskdefs libraries.xml
               src/main/org/apache/tools/ant/taskdefs/optional
                        XMLValidateTask.java
  Log:
  Library flattens files; make class static in xmlvalidate
  
  Revision  Changes    Path
  1.3       +10 -1     ant/src/etc/testcases/taskdefs/libraries.xml
  
  Index: libraries.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/libraries.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- libraries.xml	24 Nov 2004 23:10:47 -0000	1.2
  +++ libraries.xml	1 Dec 2004 22:49:02 -0000	1.3
  @@ -10,8 +10,10 @@
       
       <property name="commons.logging.project" value="commons-logging"/>
       <property name="version" value="1.0.4"/>
  +    <property name="commons.logging.filename"
  +      value="${commons.logging.project}-${version}.jar"/>
       <property name="commons.logging"
  -      value="${commons.logging.project}/jars/${commons.logging.project}-${version}.jar"/>
  +      value="${commons.logging.project}/jars/${commons.logging.filename}"/>
   
       <presetdef name="gl1">
         <libraries destDir="${lib.dir}">
  @@ -307,5 +309,12 @@
       </gl1>
     </target>
   
  +  <target name="testFlatten" depends="init">
  +    <getlib flatten="true">
  +      <mavenrepository/>
  +      <assertdownloaded count="1"/>
  +    </getlib>
  +    <assert-downloaded library="${commons.logging.filename}"/>
  +  </target>
   </project>
   
  
  
  
  1.44      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
  
  Index: XMLValidateTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- XMLValidateTask.java	22 Nov 2004 09:23:32 -0000	1.43
  +++ XMLValidateTask.java	1 Dec 2004 22:49:02 -0000	1.44
  @@ -567,7 +567,7 @@
        * The class to create to set a feature of the parser.
        * @since ant1.6
        */
  -    public class Attribute {
  +    public static class Attribute {
           /** The name of the attribute to set.
            *
            * Valid attributes <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description">include.</a>
  @@ -617,7 +617,7 @@
        * XML parser properties</a> for usable properties
        * @since ant 1.6.2
        */
  -    public final class Property {
  +    public static final class Property {
   
           private String name;
           private String value;
  
  
  

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