brett 2003/08/20 05:37:18
Modified: src/plugins-build/eclipse/src/plugin-resources/templates
classpath.jelly
src/test/touchstone-build maven.xml
src/java/org/apache/maven/jelly/tags/maven
MavenTagLibrary.java
src/plugins-build/jdee plugin.jelly
src/plugins-build/jdiff plugin.jelly
Log:
Change Maven tags to match Jelly convention (keep old versions too for now)
Revision Changes Path
1.4 +5 -5
maven/src/plugins-build/eclipse/src/plugin-resources/templates/classpath.jelly
Index: classpath.jelly
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/eclipse/src/plugin-resources/templates/classpath.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- classpath.jelly 19 Aug 2003 04:45:07 -0000 1.3
+++ classpath.jelly 20 Aug 2003 12:37:18 -0000 1.4
@@ -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>
1.40 +10 -10 maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- maven.xml 19 Aug 2003 04:45:37 -0000 1.39
+++ maven.xml 20 Aug 2003 12:37:18 -0000 1.40
@@ -353,45 +353,45 @@
</goal>
<!--
- | Test the make-absolute-path tag
+ | Test the makeAbsolutePath tag
|-->
<goal name="test-make-absolute-path">
- <maven:make-absolute-path var="testVar" basedir="${basedir}" path="project.xml"
/>
+ <maven:makeAbsolutePath var="testVar" basedir="${basedir}" path="project.xml" />
<u:file var="testVar2" name="${basedir}/project.xml" />
<j:if test="${testVar != testVar2.canonicalPath}">
<ant:fail>
- make-absolute-path:
+ makeAbsolutePath:
testVar = '${testVar}'; should be: '${testVar2}'
</ant:fail>
</j:if>
- <maven:make-absolute-path var="testVar" basedir="${basedir}" path="src/main" />
+ <maven:makeAbsolutePath var="testVar" basedir="${basedir}" path="src/main" />
<u:file var="testVar2" name="${basedir}/src/main"/>
<j:if test="${testVar != testVar2.canonicalPath}">
<ant:fail>
- make-absolute-path:
+ makeAbsolutePath:
testVar = '${testVar}'; should be: '${testVar2}'
</ant:fail>
</j:if>
</goal>
<!--
- | Test the make-relative-path tag
+ | Test the makeRelativePath tag
|-->
<goal name="test-make-relative-path">
- <maven:make-relative-path var="testVar" basedir="${basedir}"
path="${basedir}/project.xml" />
+ <maven:makeRelativePath var="testVar" basedir="${basedir}"
path="${basedir}/project.xml" />
<j:if test="${testVar != 'project.xml'}">
<ant:fail>
- make-relative-path:
+ makeRelativePath:
testVar = '${testVar}'; should be: 'project.xml'
</ant:fail>
</j:if>
- <maven:make-relative-path var="testVar" basedir="${basedir}"
path="${basedir}/src/main" />
+ <maven:makeRelativePath var="testVar" basedir="${basedir}"
path="${basedir}/src/main" />
<j:set var="testVar2" value="src${file.separator}main"/>
<j:if test="${testVar != testVar2}">
<ant:fail>
- make-relative-path:
+ makeRelativePath:
testVar = '${testVar}'; should be: '${testVar2}'
</ant:fail>
</j:if>
1.11 +8 -3
maven/src/java/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java
Index: MavenTagLibrary.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MavenTagLibrary.java 19 Aug 2003 04:25:39 -0000 1.10
+++ MavenTagLibrary.java 20 Aug 2003 12:37:18 -0000 1.11
@@ -62,6 +62,7 @@
* MavenSession tag library for use in Jelly scripts.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id$
*/
public class MavenTagLibrary
@@ -75,13 +76,17 @@
{
registerTag( "snapshot", SnapshotSignature.class );
registerTag( "addPath", AddPathTag.class );
- registerTag( "make-absolute-path", MakeAbsolutePathTag.class );
- registerTag( "make-relative-path", MakeRelativePathTag.class );
registerTag( "maven", MavenTag.class );
registerTag( "pom", PomTag.class );
registerTag( "reactor", ReactorTag.class );
registerTag( "concat", ConcatTag.class );
registerTag( "input", InputTag.class );
+ registerTag( "makeAbsolutePath", MakeAbsolutePathTag.class );
+ registerTag( "makeRelativePath", MakeRelativePathTag.class );
+ registerTag( "userCheck", UserCheck.class);
+ registerTag( "paramCheck", ParamCheck.class);
+ registerTag( "copyResources", CopyResources.class);
+ // Remove the following deprecated forms
registerTag( "user-check", UserCheck.class);
registerTag( "param-check", ParamCheck.class);
registerTag( "copy-resources", CopyResources.class);
1.4 +2 -2 maven/src/plugins-build/jdee/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdee/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 19 Aug 2003 04:45:05 -0000 1.3
+++ plugin.jelly 20 Aug 2003 12:37:18 -0000 1.4
@@ -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 -->
1.7 +3 -3 maven/src/plugins-build/jdiff/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdiff/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 19 Aug 2003 04:45:06 -0000 1.6
+++ plugin.jelly 20 Aug 2003 12:37:18 -0000 1.7
@@ -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}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
