Browse Source

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
master
Peter Reilly 21 years ago
parent
commit
38bc40702e
3 changed files with 7 additions and 6 deletions
  1. +1
    -1
      src/etc/testcases/taskdefs/xmlns.xml
  2. +1
    -1
      src/main/org/apache/tools/ant/ProjectHelper.java
  3. +5
    -4
      src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java

+ 1
- 1
src/etc/testcases/taskdefs/xmlns.xml View File

@@ -26,7 +26,7 @@
<target name="core">
<typedef file="test.antlib.xml"
classpathref="testclasses"
uri="ant:core" />
uri="antlib:org.apache.tools.ant" />
<mytask/>
</target>



+ 1
- 1
src/main/org/apache/tools/ant/ProjectHelper.java View File

@@ -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";


+ 5
- 4
src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java View File

@@ -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
*/


Loading…
Cancel
Save