From 38bc40702ede652372e8ee3395e2cf4e663cfea5 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Wed, 29 Oct 2003 10:18:14 +0000 Subject: [PATCH] Change default uri from ant:core to antlib:org.apache.tools.ant git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275581 13f79535-47bb-0310-9956-ffa450edef68 --- src/etc/testcases/taskdefs/xmlns.xml | 2 +- src/main/org/apache/tools/ant/ProjectHelper.java | 2 +- .../org/apache/tools/ant/taskdefs/AntlibDefinition.java | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/etc/testcases/taskdefs/xmlns.xml b/src/etc/testcases/taskdefs/xmlns.xml index 3e8f65219..05ecfb932 100644 --- a/src/etc/testcases/taskdefs/xmlns.xml +++ b/src/etc/testcases/taskdefs/xmlns.xml @@ -26,7 +26,7 @@ + uri="antlib:org.apache.tools.ant" /> diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index 91749736a..7c420e7ba 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -86,7 +86,7 @@ import org.xml.sax.AttributeList; */ public class ProjectHelper { /** The URI for ant name space */ - public static final String ANT_CORE_URI = "ant:core"; + public static final String ANT_CORE_URI = "antlib:org.apache.tools.ant"; /** The URI for antlib current definitions */ public static final String ANT_CURRENT_URI = "ant:current"; diff --git a/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java b/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java index 538d708a3..acf3eb5dc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java @@ -73,10 +73,11 @@ public class AntlibDefinition extends Task { /** * The URI for this definition. - * If the URI is "ant:core", the uri will be set to "". (This - * is the default uri). - * URIs that start with "ant:" and are not - * "ant:core" are reserved and are not allowed in this context. + * If the URI is "antlib:org.apache.tools.ant", + * (this is the default uri) + * the uri will be set to "". + * URIs that start with "ant:" are reserved + * and are not allowed in this context. * @param uri the namespace URI * @throws BuildException if a reserved URI is used */