From 26d891efe46bc234fd1df687b0d9a57a1a8e7a2b Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 30 Mar 2003 23:29:45 +0000
Subject: [PATCH] Explicity use ant name space. In prep for removal of jeez etc

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113234 13f79535-47bb-0310-9956-ffa450edef68
---
 jdiff/plugin.jelly    | 147 +++++++++++++++++++++---------------------
 jellydoc/plugin.jelly |  42 ++++++------
 2 files changed, 94 insertions(+), 95 deletions(-)

diff --git a/jdiff/plugin.jelly b/jdiff/plugin.jelly
index 90ec54c7..eb6f5583 100644
--- a/jdiff/plugin.jelly
+++ b/jdiff/plugin.jelly
@@ -11,120 +11,119 @@
   <goal name="jdiff" prereqs="xdoc:init"
     description="generate an api difference report between versions">
 
-    <property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
-    <mkdir dir="${maven.jdiff.dir}"/>
+    <ant:property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
+    <ant:mkdir dir="${maven.jdiff.dir}"/>
 
     <j:set var="docsDest"
       value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
     <j:set var="javadocDestdir"
       value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
       
-    <property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>    
-    <mkdir dir="${maven.jdiff.changes.dir}"/>
+    <ant:property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>    
+    <ant:mkdir dir="${maven.jdiff.changes.dir}"/>
             
-    <condition property="maven.jdiff.new.current" value="true">
-        <equals arg1="${maven.jdiff.new.tag}" arg2="CURRENT"/>
-    </condition>
+    <ant:condition property="maven.jdiff.new.current" value="true">
+      <ant:equals arg1="${maven.jdiff.new.tag}" arg2="CURRENT"/>
+    </ant:condition>
             
-    <condition property="maven.jdiff.old.current" value="true">
-        <equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
-    </condition>
+    <ant:condition property="maven.jdiff.old.current" value="true">
+      <ant:equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
+    </ant:condition>
 
-  <j:choose>
+    <j:choose>
   
-    <j:when test="${maven.jdiff.new.current}">  
-        
-      <property name="maven.jdiff.new.src" value="${pom.build.SourceDirectory}"/>
+      <j:when test="${maven.jdiff.new.current}">  
+        <ant:property name="maven.jdiff.new.src" value="${pom.build.SourceDirectory}"/>
+      </j:when>
+      
+      <j:otherwise>
+        <ant:property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>  
+        <ant:mkdir dir="${maven.jdiff.new.dir}"/>
 
-    </j:when>
-    <j:otherwise>
-    
-      <property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>  
-      <mkdir dir="${maven.jdiff.new.dir}"/>
-
-      <cvs
-        cvsRoot="${pom.repository.cvsRoot}"
-        package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
-        dest="${maven.jdiff.new.dir}"
-        tag="${maven.jdiff.new.tag}"
-      />
-      <property name="maven.jdiff.new.src" value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
+        <ant:cvs
+          cvsRoot="${pom.repository.cvsRoot}"
+          package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
+          dest="${maven.jdiff.new.dir}"
+          tag="${maven.jdiff.new.tag}"
+        />
+        <ant:property name="maven.jdiff.new.src" 
+          value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
     
       </j:otherwise>
-  </j:choose>
+    </j:choose>
 
-  <j:choose>
+    <j:choose>
   
-    <j:when test="${maven.jdiff.old.current}">
-      <property name="maven.jdiff.old.src" value="${pom.build.SourceDirectory}"/>
-      
-
-    </j:when>
-    <j:otherwise>
+      <j:when test="${maven.jdiff.old.current}">
+        <ant:property name="maven.jdiff.old.src" value="${pom.build.SourceDirectory}"/>
+      </j:when>
     
-      <property name="maven.jdiff.old.dir" value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>  
-      <mkdir dir="${maven.jdiff.old.dir}"/>
+      <j:otherwise>
+        <ant:property name="maven.jdiff.old.dir" 
+          value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>  
+        <ant:mkdir dir="${maven.jdiff.old.dir}"/>
 
-      <cvs
-        cvsRoot="${pom.repository.cvsRoot}"
-        package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
-        dest="${maven.jdiff.old.dir}"
-        tag="${maven.jdiff.old.tag}"
-      />
+        <ant:cvs
+          cvsRoot="${pom.repository.cvsRoot}"
+          package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
+          dest="${maven.jdiff.old.dir}"
+          tag="${maven.jdiff.old.tag}"
+        />
     
-      <property name="maven.jdiff.old.src" value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
-    </j:otherwise>
-  </j:choose>
+        <ant:property name="maven.jdiff.old.src" 
+          value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
+      </j:otherwise>
+    </j:choose>
 
     
-      <property name="maven.cp.sub" refid="maven-classpath"/>
-      <property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
+    <ant:property name="maven.cp.sub" refid="maven-classpath"/>
+    <ant:property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
 
-    <property name="baseuri" value="${maven.home}/plugins/jdiff"/>
+    <ant:property name="baseuri" value="${maven.home}/plugins/jdiff"/>
     
-    <javadoc 
+    <ant:javadoc 
       sourcepath="${maven.jdiff.old.src}"
       packagenames="${pom.package}.*"
       >
-      <doclet name="jdiff.JDiff"
+      <ant:doclet name="jdiff.JDiff"
         path="${maven.cp}">
-        <param name="-apiname" value="${maven.jdiff.old.tag}"/>
-        <param name="-baseURI" value="${baseuri}"/>
-      </doclet>
-    </javadoc>    
+        <ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
+        <ant:param name="-baseURI" value="${baseuri}"/>
+      </ant:doclet>
+    </ant:javadoc>    
 
-    <javadoc 
+    <ant:javadoc 
       packagenames="${pom.package}.*"
       sourcepath="${maven.jdiff.new.src}">
       
-      <doclet name="jdiff.JDiff"
+      <ant:doclet name="jdiff.JDiff"
         path="${maven.cp}">
-        <param name="-apiname" value="${maven.jdiff.new.tag}"/>
-        <param name="-baseURI" value="${baseuri}"/>
-      </doclet>
-    </javadoc>    
+        <ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
+        <ant:param name="-baseURI" value="${baseuri}"/>
+      </ant:doclet>
+    </ant:javadoc>    
     
-    <javadoc 
+    <ant:javadoc 
       private="yes"
       destdir="${maven.jdiff.changes.dir}"
       packagenames="${pom.package}.*"
       sourcepath="${maven.jdiff.new.src}"
       >
 
-      <doclet name="jdiff.JDiff" path="${maven.cp}">
-        <param name="-stats"/>
-        <param name="-oldapi" value="${maven.jdiff.old.tag}"/>
-        <param name="-newapi" value="${maven.jdiff.new.tag}"/>
-        <param name="-javadocnew" value="${javadocDestdir}/"/>
-      </doclet>      
+      <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
+        <ant:param name="-stats"/>
+        <ant:param name="-oldapi" value="${maven.jdiff.old.tag}"/>
+        <ant:param name="-newapi" value="${maven.jdiff.new.tag}"/>
+        <ant:param name="-javadocnew" value="${javadocDestdir}/"/>
+      </ant:doclet>      
 
-    </javadoc> 
+    </ant:javadoc> 
     
-    <copy todir="${maven.jdiff.changes.dir}">
-      <fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0">
-        <include name="*.gif"/>
-      </fileset>
-    </copy> 
+    <ant:copy todir="${maven.jdiff.changes.dir}">
+      <ant:fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0">
+        <ant:include name="*.gif"/>
+      </ant:fileset>
+    </ant:copy> 
     
   </goal>
 
diff --git a/jellydoc/plugin.jelly b/jellydoc/plugin.jelly
index 9171d5ec..7a2591a0 100644
--- a/jellydoc/plugin.jelly
+++ b/jellydoc/plugin.jelly
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
 <project
+  xmlns:ant="jelly:ant"
   xmlns:j="jelly:core"
   xmlns:doc="doc">
 
@@ -26,7 +27,7 @@
   <goal name="jellydoc" prereqs="jellydoc:doclet"
     description="Generates the tag documentation">
 
-    <mkdir dir="${genDocs}"/>
+    <ant:mkdir dir="${genDocs}"/>
 
     <j:file name="${genDocs}/tags.xml">
 
@@ -51,35 +52,35 @@
       <j:set var="maven.jellydoc.packages" value="${pom.package}.*"/>
     </j:if>
 
-    <echo>Generating jellydoc for packages ${maven.jellydoc.packages}</echo>
+    <ant:echo>Generating jellydoc for packages ${maven.jellydoc.packages}</ant:echo>
 
-    <mkdir dir="target"/>
+    <ant:mkdir dir="target"/>
 
-    <echo>Source directory is ${basedir}/${pom.build.sourceDirectory}</echo>
+    <ant:echo>Source directory is ${basedir}/${pom.build.sourceDirectory}</ant:echo>
 
-    <javadoc
+    <ant:javadoc
       sourcepath="${basedir}/${pom.build.sourceDirectory}"
       packagenames="${maven.jellydoc.packages}"
       classpathref="doclet.classpath"
       docletpathref="doclet.classpath"
       doclet="org.apache.maven.jellydoc.TagXMLDoclet">
-    </javadoc>
+    </ant:javadoc>
 
     <!-- if ran inside the reactor then lets copy the generated file -->
-    <copy tofile="${genDocs}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
+    <ant:copy tofile="${genDocs}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
   </goal>
 
   <!-- runs the XML doclet -->
   <goal name="jellydoc:xml-doclet" prereqs="jellydoc:init"
     description="Creates an XML representation of the doclet information">
 
-    <javadoc
+    <ant:javadoc
       sourcepath="${basedir}/${pom.build.sourceDirectory}"
       packagenames="${pom.package}.*"
       classpathref="doclet.classpath"
       docletpathref="doclet.classpath"
       doclet="org.apache.maven.jellydoc.XMLDoclet">
-    </javadoc>
+    </ant:javadoc>
 
   </goal>
 
@@ -91,19 +92,18 @@
       value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
 
     <!-- just in case this is ran before a compile -->
-    <mkdir dir="${genDocs}"/>
+    <ant:mkdir dir="${genDocs}"/>
 
-    <path id="doclet.classpath">
-      <path refid="maven.dependency.classpath"/>
-      <pathelement path="${plugin.dir}"/>
-      <pathelement path="${plugin.getDependencyPath('javadoc')}"/>
-      <pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
-      <pathelement path="${plugin.getDependencyPath('dom4j')}"/>
-      <pathelement path="${plugin.getDependencyPath('xerces')}"/>
-      <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-      <pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
-    </path>
+    <ant:path id="doclet.classpath">
+      <ant:path refid="maven.dependency.classpath"/>
+      <ant:pathelement path="${plugin.dir}"/>
+      <ant:pathelement path="${plugin.getDependencyPath('javadoc')}"/>
+      <ant:pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
+      <ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
+      <ant:pathelement path="${plugin.getDependencyPath('xerces')}"/>
+      <ant:pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+      <ant:pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
+    </ant:path>
   </goal>
 
-
 </project>