From b25b57141467eb3c971fedfea227b7b0609cd53b Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 20 Aug 2003 12:37:18 +0000
Subject: [PATCH] Change Maven tags to match Jelly convention (keep old
 versions too for now)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113861 13f79535-47bb-0310-9956-ffa450edef68
---
 eclipse/src/plugin-resources/templates/classpath.jelly | 10 +++++-----
 jdee/plugin.jelly                                      |  4 ++--
 jdiff/plugin.jelly                                     |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index 3077036c..f8a47439 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -9,13 +9,13 @@
 
 <classpath>            
   <j:if test="${sourcesPresent}">
-    <maven:make-relative-path var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}"/>
+    <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}"/>
     <classpathentry kind="src" path="${srcDir}"/>
   </j:if>
   
   <j:if test="${unitTestSourcesPresent}">
     <ant:echo>Contains JUnit tests</ant:echo>
-    <maven:make-relative-path var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}"/>
+    <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}"/>
       
     <!-- Eclipse supports an output directory per input directory -->
     <j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
@@ -24,7 +24,7 @@
              value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.dest')}"/>      
     </j:if>
 
-    <maven:make-relative-path var="testOutputDir" basedir="${basedir}" path="${testOutputDir}" />
+    <maven:makeRelativePath var="testOutputDir" basedir="${basedir}" path="${testOutputDir}" />
       
     <ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
     <classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
@@ -65,7 +65,7 @@
 
     <j:if test="${cactusSourcePresent == 'true'}">
       <ant:echo>Contains Cactus Tests!</ant:echo>
-      <maven:make-relative-path var="testSrcDir" basedir="${basedir}" path="${cactusSrcDir}" />
+      <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${cactusSrcDir}" />
       <classpathentry kind="src" path="${testSrcDir}"/>
     
       <j:set var="depVersion">${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()}</j:set>
@@ -95,7 +95,7 @@
     <j:if test="${empty outputDir}">
       <j:set var="outputDir" value="${maven.build.dest}"/>      
     </j:if>
-    <maven:make-relative-path var="outputDir" basedir="${basedir}" path="${outputDir}" />
+    <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" />
     <classpathentry kind="output" path="${outputDir}"/>
     <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
   </classpath>
diff --git a/jdee/plugin.jelly b/jdee/plugin.jelly
index 8763cd25..08c068a7 100644
--- a/jdee/plugin.jelly
+++ b/jdee/plugin.jelly
@@ -29,7 +29,7 @@
  (quote (jde-project-name "${pom.artifactId}"))
  (quote (jde-project-file-name "${maven.jdee.project.file}"))
       <j:if test="${sourcesPresent}">
-        <maven:make-relative-path var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
+        <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
  (quote (jde-sourcepath (quote ("./${srcDir}"))))
 		<j:whitespace />
       </j:if>
@@ -47,7 +47,7 @@
 	  </j:if>
 (quote (jde-global-classpath (quote ("./target/classes"
       <j:if test="${unitTestSourcesPresent}">
-        <maven:make-relative-path var="srcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" />
+        <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" />
 "./${srcDir}" 	<j:whitespace />
       </j:if>
 	  <!-- now iterate through all dependencies -->
diff --git a/jdiff/plugin.jelly b/jdiff/plugin.jelly
index 4b42c712..2e7e5e18 100644
--- a/jdiff/plugin.jelly
+++ b/jdiff/plugin.jelly
@@ -31,7 +31,7 @@
       <ant:equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
     </ant:condition>
 
-    <maven:make-relative-path var="relativeSrcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
+    <maven:makeRelativePath var="relativeSrcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
     <j:choose>
   
       <j:when test="${maven.jdiff.new.current}">  
@@ -42,7 +42,7 @@
         <ant:property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>  
         <ant:mkdir dir="${maven.jdiff.new.dir}"/>
 
-        <maven:make-relative-path var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
+        <maven:makeRelativePath var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
         <ant:cvs
           cvsRoot="${pom.repository.cvsRoot}"
           package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"
@@ -66,7 +66,7 @@
           value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>  
         <ant:mkdir dir="${maven.jdiff.old.dir}"/>
 
-        <maven:make-relative-path var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
+        <maven:makeRelativePath var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
         <ant:cvs
           cvsRoot="${pom.repository.cvsRoot}"
           package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"