From e025f09af772681a0a806aa3593dcd8ae3b3bc26 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 29 Mar 2003 12:40:46 +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@113220 13f79535-47bb-0310-9956-ffa450edef68
---
 j2ee/plugin.jelly   | 28 ++++++++++++++------------
 jalopy/plugin.jelly | 49 +++++++++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/j2ee/plugin.jelly b/j2ee/plugin.jelly
index 9e5a37b1..68f6d188 100644
--- a/j2ee/plugin.jelly
+++ b/j2ee/plugin.jelly
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 
-<project xmlns:define="jelly:define" 
-         xmlns:j="jelly:core" 
-         xmlns:license="license" 
-         xmlns:log="jelly:log"
-         xmlns:util="jelly:util">
+<project 
+  xmlns:ant="jelly:ant" 
+  xmlns:define="jelly:define" 
+  xmlns:j="jelly:core" 
+  xmlns:license="license" 
+  xmlns:log="jelly:log"
+  xmlns:util="jelly:util">
 
   <!-- ================================================================ -->
   <!-- D E F A U L T  G O A L                                           -->
@@ -18,14 +20,14 @@
   <goal name="j2ee:validate-war"
     description="Check that a war file is valid">
 
-    <taskdef name="warvalidator" classname="org.apache.maven.j2ee.WarValidator">
-      <classpath>
-        <pathelement path="${plugin.resources}" />
-        <pathelement path="${plugin.getDependencyPath('ant')}"/>
-        <pathelement path="${plugin.getDependencyPath('dom4j')}"/>
-        <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-      </classpath>
-    </taskdef>
+    <ant:taskdef name="warvalidator" classname="org.apache.maven.j2ee.WarValidator">
+      <ant:classpath>
+        <ant:pathelement path="${plugin.resources}" />
+        <ant:pathelement path="${plugin.getDependencyPath('ant')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+      </ant:classpath>
+    </ant:taskdef>
     
     <j:set var="warBuildDir"
       value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
diff --git a/jalopy/plugin.jelly b/jalopy/plugin.jelly
index 2ef1a18e..2c5b37cf 100644
--- a/jalopy/plugin.jelly
+++ b/jalopy/plugin.jelly
@@ -1,4 +1,5 @@
-<project>
+<project
+  xmlns:ant="jelly:ant">
 
   <!--==================================================================-->
   <!-- J A L O P Y (source code formatter)                              -->
@@ -10,42 +11,42 @@
 
   <goal name="jalopy:taskdef"
     description="Define the jalopy task to Ant and Jelly">
-    <taskdef name="jalopy"
-             classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
-      <classpath>
-        <pathelement path="${plugin.getDependencyPath('jalopy')}"/>
-        <pathelement path="${plugin.getDependencyPath('jalopy-ant')}"/>
-        <pathelement path="${plugin.getDependencyPath('aelfred')}"/>
-        <pathelement path="${plugin.getDependencyPath('jaxp')}"/>
-        <pathelement path="${plugin.getDependencyPath('jdom')}"/>
-        <pathelement path="${plugin.getDependencyPath('log4j')}"/>
-        <pathelement path="${plugin.getDependencyPath('oro')}"/>
-        <pathelement path="${plugin.getDependencyPath('sax')}"/>
-        <pathelement path="${plugin.getDependencyPath('textarea')}"/>
-      </classpath>
-    </taskdef>
+    <ant:taskdef name="jalopy"
+      classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+      <ant:classpath>
+        <ant:pathelement path="${plugin.getDependencyPath('jalopy')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('jalopy-ant')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('aelfred')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('jaxp')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('jdom')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('log4j')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('oro')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('sax')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('textarea')}"/>
+      </ant:classpath>
+    </ant:taskdef>
   </goal>
 
   <goal name="jalopy:format"
         description="Format all sources with code convention conformance"
         prereqs="jalopy:taskdef, java:compile">
 
-    <path id="project.classpath">
-      <path refid="maven.dependency.classpath"/>
-      <pathelement path="${maven.build.dest}"/>
-    </path>
+    <ant:path id="project.classpath">
+      <ant:path refid="maven.dependency.classpath"/>
+      <ant:pathelement path="${maven.build.dest}"/>
+    </ant:path>
    
-    <jalopy fileformat="${maven.jalopy.fileFormat}"
+    <ant:jalopy fileformat="${maven.jalopy.fileFormat}"
             style="${maven.jalopy.style}"
             history="${maven.jalopy.history}"
             loglevel="${maven.jalopy.logLevel}"
             failonerror="${maven.jalopy.failOnError}"
             threads="${maven.jalopy.nbThread}"
             classpathref="project.classpath">
-      <fileset dir="${pom.build.sourceDirectory}" >
-        <include name="${maven.jalopy.filesetInclude}" />
-      </fileset>
-    </jalopy>
+      <ant:fileset dir="${pom.build.sourceDirectory}" >
+        <ant:include name="${maven.jalopy.filesetInclude}" />
+      </ant:fileset>
+    </ant:jalopy>
   </goal>
 
 </project>