diff --git a/src/etc/testcases/taskdefs/libraries.xml b/src/etc/testcases/taskdefs/libraries.xml
index 2cfed3383..7db66e892 100644
--- a/src/etc/testcases/taskdefs/libraries.xml
+++ b/src/etc/testcases/taskdefs/libraries.xml
@@ -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>
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index d7a8edf86..a84b4b205 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -567,7 +567,7 @@ public class XMLValidateTask extends Task {
      * 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 @@ public class XMLValidateTask extends Task {
      * 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;