From 5bb9e1adb2f75349ed43983e93659252f8dc7cc1 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 14 Mar 2014 20:07:05 +0000
Subject: [PATCH] try to help Java5 builds and finally figure out what was
 wrong with disabled test

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1577687 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/taskdefs/taskdef-antlib-test.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index f64bcf541..72f21ae73 100644
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@ -23,7 +23,7 @@
         <property name="tmpdir" location="../../../../build/ant-unit/taskdef" />
         <mkdir dir="${tmpdir}" />
         <echo file="${input}/org/example/antlib.xml">
-            <![CDATA[<antlib xmlns:e="antlib:org.example">
+            <![CDATA[<antlib xmlns:e="ant:current">
                 <macrodef name="echoo" backtrace="false">
                     <attribute name="message" />
                     <sequential>
@@ -41,16 +41,20 @@
         <jar destfile="${test.jar}">
             <fileset dir="${input}" />
         </jar>
+        <sleep seconds="1"/>
     </target>
 
     <target name="testAntlib" depends="setUp">
-        <taskdef classpath="${test.jar}" uri="antlib:org.example" />
+        <taskdef classpath="${test.jar}" uri="antlib:org.example"
+                 loaderref="loader1"/>
         <echoooo xmlns="antlib:org.example" message="exemple" />
         <au:assertLogContains text="exempleexempleexempleexemple" />
     </target>
 
-    <target name="broken_testURI" depends="setUp">
-        <taskdef classpath="${test.jar}" uri="urn:my:exemple" resource="org/example/antlib.xml" />
+    <target name="testURI" depends="setUp">
+        <taskdef classpath="${test.jar}" uri="urn:my:exemple"
+                 loaderref="loader2"
+                 resource="org/example/antlib.xml" />
         <echoooo xmlns="urn:my:exemple" message="exemple" />
         <au:assertLogContains text="exempleexempleexempleexemple" />
     </target>