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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
