peterreilly 2003/10/29 02:21:13
Modified: src/etc/testcases/taskdefs Tag: ANT_16_BRANCH xmlns.xml
src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
ProjectHelper.java
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
AntlibDefinition.java
Log:
merge with head
Revision Changes Path
No revision
No revision
1.1.2.1 +1 -1 ant/src/etc/testcases/taskdefs/xmlns.xml
Index: xmlns.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/xmlns.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- xmlns.xml 13 Aug 2003 13:26:31 -0000 1.1
+++ xmlns.xml 29 Oct 2003 10:21:13 -0000 1.1.2.1
@@ -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>
No revision
No revision
1.101.2.1 +1 -1 ant/src/main/org/apache/tools/ant/ProjectHelper.java
Index: ProjectHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
retrieving revision 1.101
retrieving revision 1.101.2.1
diff -u -r1.101 -r1.101.2.1
--- ProjectHelper.java 12 Sep 2003 20:56:45 -0000 1.101
+++ ProjectHelper.java 29 Oct 2003 10:21:13 -0000 1.101.2.1
@@ -86,7 +86,7 @@
*/
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";
No revision
No revision
1.1.2.1 +5 -4
ant/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java
Index: AntlibDefinition.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- AntlibDefinition.java 22 Sep 2003 08:58:58 -0000 1.1
+++ AntlibDefinition.java 29 Oct 2003 10:21:13 -0000 1.1.2.1
@@ -73,10 +73,11 @@
/**
* 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
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
