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@113240 13f79535-47bb-0310-9956-ffa450edef68

jnlp/plugin.jelly

@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 
 <project
-  xmlns:j="jelly:core"
-  xmlns:u="jelly:util"
+  xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
-  xmlns:jarfile="jarfile">
+  xmlns:j="jelly:core"
+  xmlns:jarfile="jarfile"
+  xmlns:u="jelly:util">
 
     <define:taglib uri="jarfile">
       <define:jellybean
@@ -25,8 +26,8 @@
              description="Generate the .jnlp file and sign all jars"
              prereqs="java:jar">
 
-        <mkdir dir="${maven.jnlp.dir}"/>
-        <echo>Creating ${maven.jnlp.dir}/${pom.artifactId}.jnlp ...</echo>
+        <ant:mkdir dir="${maven.jnlp.dir}"/>
+        <ant:echo>Creating ${maven.jnlp.dir}/${pom.artifactId}.jnlp ...</ant:echo>
 
         <!-- ================== -->
         <!-- Generate JNLP file -->
@@ -34,34 +35,34 @@
         <j:file name="${maven.jnlp.dir}/${pom.artifactId}.jnlp" prettyPrint="true"
           xmlns="dummy">
             <jnlp spec="${maven.jnlp.spec}"
-                  codebase="${maven.jnlp.http.codebase}"
-                  href="${pom.artifactId}.jnlp">
+              codebase="${maven.jnlp.http.codebase}"
+              href="${pom.artifactId}.jnlp">
 
-                <information>
-                    <title>${maven.jnlp.title}</title>
-                    <j:if test="${context.getVariable('maven.jnlp.vendor') != null}">
-                        <vendor>${maven.jnlp.vendor}</vendor>
-                    </j:if>
-                    <j:if test="${context.getVariable('maven.jnlp.homepage') != null}">
-                        <homepage href="${maven.jnlp.homepage}"/>
-                    </j:if>
-                    <j:if test="${context.getVariable('maven.jnlp.icon') != null}">
-                        <icon href="${maven.jnlp.icon}"/>
-                    </j:if>
-                    <j:if test="${context.getVariable('maven.jnlp.icon.splash') != null}">
-                        <icon kind="splash" href="${maven.jnlp.icon.splash}"/>
-                    </j:if>
-                    <j:if test="${context.getVariable('maven.jnlp.description') != null}">
-                        <description>${maven.jnlp.description}</description>
-                    </j:if>
-                    <j:if test="${context.getVariable('maven.jnlp.description.one-line') != null}">
-                        <description kind="one-line">${maven.jnlp.description.one-line}</description>
-                    </j:if>
-                    <j:if test="${context.getVariable('maven.jnlp.description.short') != null}">
-                        <description kind="short">${maven.jnlp.description.short}</description>
-                    </j:if>
-                    <j:if test="${context.getVariable('maven.jnlp.description.tooltip') != null}">
-                        <description kind="tooltip">${maven.jnlp.description.tooltip}</description>
+              <information>
+                <title>${maven.jnlp.title}</title>
+                  <j:if test="${context.getVariable('maven.jnlp.vendor') != null}">
+                    <vendor>${maven.jnlp.vendor}</vendor>
+                  </j:if>
+                  <j:if test="${context.getVariable('maven.jnlp.homepage') != null}">
+                    <homepage href="${maven.jnlp.homepage}"/>
+                  </j:if>
+                  <j:if test="${context.getVariable('maven.jnlp.icon') != null}">
+                    <icon href="${maven.jnlp.icon}"/>
+                  </j:if>
+                  <j:if test="${context.getVariable('maven.jnlp.icon.splash') != null}">
+                    <icon kind="splash" href="${maven.jnlp.icon.splash}"/>
+                  </j:if>
+                  <j:if test="${context.getVariable('maven.jnlp.description') != null}">
+                    <description>${maven.jnlp.description}</description>
+                  </j:if>
+                  <j:if test="${context.getVariable('maven.jnlp.description.one-line') != null}">
+                    <description kind="one-line">${maven.jnlp.description.one-line}</description>
+                  </j:if>
+                  <j:if test="${context.getVariable('maven.jnlp.description.short') != null}">
+                    <description kind="short">${maven.jnlp.description.short}</description>
+                  </j:if>
+                  <j:if test="${context.getVariable('maven.jnlp.description.tooltip') != null}">
+                    <description kind="tooltip">${maven.jnlp.description.tooltip}</description>
                     </j:if>
                     <j:if test="${context.getVariable('maven.jnlp.offline.allowed') != null}">
                         <offline-allowed/>
@@ -129,14 +130,14 @@
         <!-- =========================== -->
         <!-- Copy jars in jnlp directory -->
         <!-- =========================== -->
-        <available file="${maven.jnlp.signjar.store}" property="maven.jnlp.store.exists"/>
+        <ant:available file="${maven.jnlp.signjar.store}" property="maven.jnlp.store.exists"/>
         <j:choose>
           <j:when test="${maven.jnlp.store.exists}">
 
             <!-- ================ -->
             <!-- Updates Manifest -->
             <!-- ================ -->
-            <mkdir dir="${maven.jnlp.tmpdir}"/>
+            <ant:mkdir dir="${maven.jnlp.tmpdir}"/>
             
             <jarfile:updateManifest
                 inputJar="${maven.build.dir}/${maven.final.name}.jar"
@@ -164,51 +165,51 @@
             <!-- ========= -->
             <!-- Sign jars -->
             <!-- ========= -->
-            <echo>Found a store...signing jars</echo>
+            <ant:echo>Found a store...signing jars</ant:echo>
 
-            <echo>Signing jar files ...</echo>
-            <signjar
+            <ant:echo>Signing jar files ...</ant:echo>
+            <ant:signjar
                 jar="${maven.jnlp.tmpdir}/${maven.final.name}.jar"
                 signedjar="${maven.jnlp.dir}/${maven.final.name}.jar"
                 alias="${maven.jnlp.signjar.alias}"
                 storepass="${maven.jnlp.signjar.storepass}"
                 keystore="${maven.jnlp.signjar.store}"/>
 
-              <j:forEach var="lib" items="${pom.dependencies}">
-                <j:if test="${lib.getProperty('jnlp.jar')=='true'}">
-                    <signjar
-                        jar="${maven.jnlp.tmpdir}/${lib.artifact}"
-                        signedjar="${maven.jnlp.dir}/${lib.artifact}"
-                        alias="${maven.jnlp.signjar.alias}"
-                        storepass="${maven.jnlp.signjar.storepass}"
-                        keystore="${maven.jnlp.signjar.store}"/>
-                </j:if>
-                <j:if test="${lib.getProperty('jnlp.native.jar')=='true'}">
-                    <signjar
-                        jar="${maven.jnlp.tmpdir}/${lib.artifact}"
-                        signedjar="${maven.jnlp.dir}/${lib.artifact}"
-                        alias="${maven.jnlp.signjar.alias}"
-                        storepass="${maven.jnlp.signjar.storepass}"
-                        keystore="${maven.jnlp.signjar.store}"/>
-                </j:if>
-              </j:forEach>
+            <j:forEach var="lib" items="${pom.dependencies}">
+              <j:if test="${lib.getProperty('jnlp.jar')=='true'}">
+                <ant:signjar
+                  jar="${maven.jnlp.tmpdir}/${lib.artifact}"
+                  signedjar="${maven.jnlp.dir}/${lib.artifact}"
+                  alias="${maven.jnlp.signjar.alias}"
+                  storepass="${maven.jnlp.signjar.storepass}"
+                  keystore="${maven.jnlp.signjar.store}"/>
+              </j:if>
+              <j:if test="${lib.getProperty('jnlp.native.jar')=='true'}">
+                <ant:signjar
+                  jar="${maven.jnlp.tmpdir}/${lib.artifact}"
+                  signedjar="${maven.jnlp.dir}/${lib.artifact}"
+                  alias="${maven.jnlp.signjar.alias}"
+                  storepass="${maven.jnlp.signjar.storepass}"
+                  keystore="${maven.jnlp.signjar.store}"/>
+              </j:if>
+            </j:forEach>
           </j:when>
           <j:otherwise>
-              <copy todir="${maven.jnlp.dir}" flatten="true">
-                <fileset dir="${maven.repo.local}">
-                  <j:forEach var="dep" items="${pom.dependencies}">
-                    <j:if test="${dep.getProperty('jnlp.jar')=='true'}">
-                      <include name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
-                    </j:if>
-                    <j:if test="${dep.getProperty('jnlp.native.jar')=='true'}">
-                      <include name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
-                    </j:if>
-                  </j:forEach>
-                </fileset>
-                <fileset dir="${maven.build.dir}">
-                  <include name="${maven.final.name}.jar"/>
-                </fileset>
-              </copy>
+            <ant:copy todir="${maven.jnlp.dir}" flatten="true">
+              <ant:fileset dir="${maven.repo.local}">
+                <j:forEach var="dep" items="${pom.dependencies}">
+                  <j:if test="${dep.getProperty('jnlp.jar')=='true'}">
+                    <ant:include name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
+                  </j:if>
+                  <j:if test="${dep.getProperty('jnlp.native.jar')=='true'}">
+                    <ant:include name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
+                  </j:if>
+                </j:forEach>
+              </ant:fileset>
+              <ant:fileset dir="${maven.build.dir}">
+                <ant:include name="${maven.final.name}.jar"/>
+              </ant:fileset>
+            </ant:copy>
           </j:otherwise>
         </j:choose>
     </goal>
@@ -219,12 +220,12 @@
     <goal name="jnlp:generate-keystore"
              description="Generate a keystore file">
         
-        <delete file="${maven.jnlp.signjar.store}"/>
-        <genkey alias="${maven.jnlp.signjar.alias}"
+        <ant:delete file="${maven.jnlp.signjar.store}"/>
+        <ant:genkey alias="${maven.jnlp.signjar.alias}"
                    storepass="${maven.jnlp.signjar.storepass}"
                    keystore="${maven.jnlp.signjar.store}"
                    validity="${maven.jnlp.signjar.validity}" >
-            <dname>
+            <ant:dname>
                 <j:if test="${context.getVariable('maven.jnlp.signjar.dname.cn') != null}">
                     <param name="CN" value="${maven.jnlp.signjar.dname.cn}" />
                 </j:if>
@@ -243,8 +244,8 @@
                 <j:if test="${context.getVariable('maven.jnlp.signjar.dname.c') != null}">
                     <param name="C" value="${maven.jnlp.signjar.dname.c}" />
                 </j:if>
-            </dname>
-        </genkey>
+            </ant:dname>
+        </ant:genkey>
     </goal>
 
 </project>

junit-report/plugin.jelly

@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 
 <project 
-  xmlns:j="jelly:core" 
-  xmlns:doc="doc">
+  xmlns:ant="jelly:ant"
+  xmlns:doc="doc"
+  xmlns:j="jelly:core">
   
   <goal name="maven-junit-report-plugin:register">
     <doc:registerReport 
@@ -33,14 +34,14 @@
       <j:set var="testReportsDirectory"
         value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.reportsDirectory')}"/>
 
-      <mkdir dir="${testReportsDirectory}"/>
+      <ant:mkdir dir="${testReportsDirectory}"/>
 
       <!-- Consolidate the reports into a single -->
-      <junitreport todir="${maven.build.dir}">
-        <fileset dir="${testReportsDirectory}">
-          <include name="TEST-*.xml"/>
-        </fileset>
-      </junitreport>
+      <ant:junitreport todir="${maven.build.dir}">
+        <ant:fileset dir="${testReportsDirectory}">
+          <ant:include name="TEST-*.xml"/>
+        </ant:fileset>
+      </ant:junitreport>
 
       <doc:jsl
         input="${maven.build.dir}/TESTS-TestSuites.xml"

junitdoclet/plugin.jelly

@@ -1,4 +1,6 @@
-<project xmlns:j="jelly:core">
+<project 
+  xmlns:ant="jelly:ant"
+  xmlns:j="jelly:core">
   
   <!-- ================================================================== -->
   <!-- J U N I T  D O C L E T                                             -->
@@ -7,33 +9,33 @@
   <goal name="junitdoclet" 
     description="Generate unit tests">
     
-    <mkdir dir="${maven.junitdoclet.outputDirectory}"/>
+    <ant:mkdir dir="${maven.junitdoclet.outputDirectory}"/>
     
-    <path id="junitdoclet.classpath">
-      <path refid="maven.dependency.classpath"/>
-      <pathelement path="${plugin.getDependencyPath('junit-doclet')}"/>
-    </path>
+    <ant:path id="junitdoclet.classpath">
+      <ant:path refid="maven.dependency.classpath"/>
+      <ant:pathelement path="${plugin.getDependencyPath('junit-doclet')}"/>
+    </ant:path>
     
-    <javadoc
+    <ant:javadoc
       packagenames    = "${pom.package}.*"
       sourcepath      = "${pom.build.sourceDirectory}"
       defaultexcludes = "yes"
       doclet          = "com.objectfab.tools.junitdoclet.JUnitDoclet"
       docletpathref   = "junitdoclet.classpath"
       additionalparam = "-d ${maven.junitdoclet.outputDirectory} -buildall">
-      <classpath refid = "junitdoclet.classpath"/>>
-    </javadoc>
+      <ant:classpath refid = "junitdoclet.classpath"/>>
+    </ant:javadoc>
     
     <!-- 
       | JUnitDoclet produces suites but we don't need these because the
       | JUnit plugin picks up the test cases to run.
     -->
     
-    <delete>
-      <fileset dir="${maven.junitdoclet.outputDirectory}">
-        <include name="**/*Suite.java"/>
-      </fileset>
-    </delete>
+    <ant:delete>
+      <ant:fileset dir="${maven.junitdoclet.outputDirectory}">
+        <ant:include name="**/*Suite.java"/>
+      </ant:fileset>
+    </ant:delete>
 
   </goal>
 

jxr/plugin.jelly

@@ -1,11 +1,20 @@
 <?xml version="1.0"?>
 
 <project 
-  xmlns:j="jelly:core"  
+  xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
   xmlns:doc="doc"
-  xmlns:util="jelly:util"
-  xmlns:jxr="jxr">
+  xmlns:j="jelly:core"  
+  xmlns:jxr="jxr"
+  xmlns:util="jelly:util">
+
+  <define:taglib uri="jxr">
+    <define:jellybean
+      name="jxr"
+      className="org.apache.maven.jxr.JxrBean"
+      method="xref"
+      />
+  </define:taglib>
 
   <goal name="maven-jxr-plugin:register">
     <j:if test="${sourcesPresent}">
@@ -29,14 +38,6 @@
     <doc:deregisterReport name="Test Xref"/>
   </goal>
 
-    <define:taglib uri="jxr">
-      <define:jellybean
-        name="jxr"
-        className="org.apache.maven.jxr.JxrBean"
-        method="xref"
-      />
-    </define:taglib>
-
   <!-- ================================================================== -->
   <!-- C R O S S  R E F E R E N C E  S O U R C E S                        -->
   <!-- ================================================================== -->
@@ -48,67 +49,67 @@
 
     <j:if test="${sourcesPresent == 'true'}">
 
-    <mkdir dir="${maven.jxr.destdir}"/>
+      <ant:mkdir dir="${maven.jxr.destdir}"/>
 
-    <!-- If the 'startDir' attribute changes we need to update
-         CodeTransform.java in o.a.m.jxr, this will be fixed. -->
+      <!-- If the 'startDir' attribute changes we need to update
+           CodeTransform.java in o.a.m.jxr, this will be fixed. -->
 
-    <echo>${maven.sourcesPresent}</echo>
+      <ant:echo>${maven.sourcesPresent}</ant:echo>
 
-    <j:set var="javadocDestdir"
-      value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
+      <j:set var="javadocDestdir"
+        value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
 
-    <property
-      name="copyright"
-      value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved."
-    />
+      <ant:property
+        name="copyright"
+        value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved."
+      />
 
-    <property
-      name="title"
-      value="${pom.name} ${pom.currentVersion} Reference"
-    />
+      <ant:property
+        name="title"
+        value="${pom.name} ${pom.currentVersion} Reference"
+      />
 
-    <copy file="${maven.jxr.stylesheet}"
-          tofile="${maven.jxr.destdir}/stylesheet.css"/>
+      <ant:copy file="${maven.jxr.stylesheet}"
+        tofile="${maven.jxr.destdir}/stylesheet.css"/>
         
-    <!-- XXX This is a dirty hack until the semantics of pom.build.sourceDirectory are cleared up -->
-    <j:set var="sourceDir" value="${pom.build.sourceDirectory}"/>  
-    <util:file var="sourceDirFile" name="${sourceDir}"/>
+      <!-- XXX This is a dirty hack until the semantics of pom.build.sourceDirectory are cleared up -->
+      <j:set var="sourceDir" value="${pom.build.sourceDirectory}"/>  
+      <util:file var="sourceDirFile" name="${sourceDir}"/>
     
-    <j:if test="${!sourceDirFile.isAbsolute()}">
-      <j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
-    </j:if>
-    
-    <jxr:jxr
-      sourceDir="${sourceDir}"
-      destDir="${maven.jxr.destdir}"
-      templateDir="${maven.jxr.templateDir}"
-      javadocDir="${javadocDestdir}"
-      windowTitle="${title}"
-      docTitle="${title}"
-      bottom="${copyright}">
-    </jxr:jxr>
-
-    <j:if test="${unitTestSourcesPresent == 'true'}">
-      <mkdir dir="${maven.jxr.destdir.test}"/>
-      <j:set var="testSourceDir" value="${pom.build.unitTestSourceDirectory}"/>  
-      <util:file var="testSourceDirFile" name="${testSourceDir}"/>
-    
-      <j:if test="${!testSourceDirFile.isAbsolute()}">
-      <j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
+      <j:if test="${!sourceDirFile.isAbsolute()}">
+        <j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
       </j:if>
-      
+    
       <jxr:jxr
-        sourceDir="${testSourceDir}"
-        destDir="${maven.jxr.destdir.test}"
+        sourceDir="${sourceDir}"
+        destDir="${maven.jxr.destdir}"
         templateDir="${maven.jxr.templateDir}"
-        javadocDir="${null}"
+        javadocDir="${javadocDestdir}"
         windowTitle="${title}"
         docTitle="${title}"
         bottom="${copyright}">
       </jxr:jxr>
 
-    </j:if>
+      <j:if test="${unitTestSourcesPresent == 'true'}">
+        <ant:mkdir dir="${maven.jxr.destdir.test}"/>
+        <j:set var="testSourceDir" value="${pom.build.unitTestSourceDirectory}"/>  
+        <util:file var="testSourceDirFile" name="${testSourceDir}"/>
+    
+        <j:if test="${!testSourceDirFile.isAbsolute()}">
+          <j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
+        </j:if>
+      
+        <jxr:jxr
+          sourceDir="${testSourceDir}"
+          destDir="${maven.jxr.destdir.test}"
+          templateDir="${maven.jxr.templateDir}"
+          javadocDir="${null}"
+          windowTitle="${title}"
+          docTitle="${title}"
+          bottom="${copyright}">
+        </jxr:jxr>
+
+      </j:if>
 
     </j:if>
     

latex/plugin.jelly

@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 
-<project xmlns:j="jelly:core" xmlns:u="jelly:util">
+<project 
+  xmlns:ant="jelly:ant" 
+  xmlns:j="jelly:core" 
+  xmlns:u="jelly:util">
 
   <j:set var="latexSrcDir" value="${maven.latex.src.dir}"/>
 
@@ -8,7 +11,7 @@
   <goal name="latex:prepare-filesystem"
     description="Prepare the filesystem for latex processing">
     <j:if test="${!latexSrcDir.equals('MAVEN_LATEX_SRC_DIR_NOT_SET')}">
-      <mkdir dir="${maven.build.dir}/docs/pdf/"/>
+      <ant:mkdir dir="${maven.build.dir}/docs/pdf/"/>
     </j:if>
   </goal>
 
@@ -17,20 +20,20 @@
         description="Generate documentation from latex source">
 
     <j:if test="${!latexSrcDir.equals('MAVEN_LATEX_SRC_DIR_NOT_SET')}">
-      <taskdef name="latex" classname="de.prima.shire.anttex.LaTeX"/>
-      <echo>scanning: ${latexSrcDir}</echo>
+      <ant:taskdef name="latex" classname="de.prima.shire.anttex.LaTeX"/>
+      <ant:echo>scanning: ${latexSrcDir}</ant:echo>
 
-      <copy todir="${maven.build.dir}/latex">
-        <fileset dir="${latexSrcDir}" includes="**/*.tex,**/*.bib"/>
-      </copy>
+      <ant:copy todir="${maven.build.dir}/latex">
+        <ant:fileset dir="${latexSrcDir}" includes="**/*.tex,**/*.bib"/>
+      </ant:copy>
 
-      <fileScanner var="latexFiles">
-        <fileset dir="${maven.build.dir}/latex">
-          <patternset>
-            <include name="**/*.tex"/>
-          </patternset>
-        </fileset>
-      </fileScanner>
+      <ant:fileScanner var="latexFiles">
+        <ant:fileset dir="${maven.build.dir}/latex">
+          <ant:patternset>
+            <ant:include name="**/*.tex"/>
+          </ant:patternset>
+        </ant:fileset>
+      </ant:fileScanner>
 
       <j:forEach var="file" items="${latexFiles.iterator()}">
 
@@ -38,8 +41,8 @@
 
         <j:forEach var="doc" items="${docs}"> 
           <j:if test="${doc.equals(file.name)}">
-            <echo>Generating from ${file}</echo>
-            <latex latexfile="${file.path}"
+            <ant:echo>Generating from ${file}</ant:echo>
+            <ant:latex latexfile="${file.path}"
                    pdftex="on"
                    bibtex="on"
                    verbose="on"
@@ -48,9 +51,9 @@
         </j:forEach>
       </j:forEach>
 
-      <copy todir="${maven.build.dir}/docs/pdf/" flatten="true">
-        <fileset dir="${maven.build.dir}/latex" includes="**/*.pdf"/>
-      </copy>
+      <ant:copy todir="${maven.build.dir}/docs/pdf/" flatten="true">
+        <ant:fileset dir="${maven.build.dir}/latex" includes="**/*.pdf"/>
+      </ant:copy>
     </j:if>
   </goal>