brett 2004/04/07 17:34:44
Modified: ant plugin.jelly project.xml
ant/src/plugin-resources/templates build.jelly
ant/xdocs changes.xml
Log:
replace use of "target" directoriy with appropriate variables
Revision Changes Path
1.10 +3 -1 maven-plugins/ant/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ant/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 4 Mar 2004 17:59:03 -0000 1.9
+++ plugin.jelly 8 Apr 2004 00:34:44 -0000 1.10
@@ -17,9 +17,11 @@
*/
-->
-
+<!-- Note the need to declare "test" as a namespace because it is used in the
template -->
<project
xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven"
+ xmlns:test="test"
xmlns:j="jelly:core">
<!-- ================================================================== -->
<!-- A N T B U I L D G E N E R A T O R -->
1.31 +0 -3 maven-plugins/ant/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/project.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- project.xml 28 Mar 2004 23:02:04 -0000 1.30
+++ project.xml 8 Apr 2004 00:34:44 -0000 1.31
@@ -63,9 +63,6 @@
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>20030211.142705</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
</dependencies>
</project>
1.8 +10 -8 maven-plugins/ant/src/plugin-resources/templates/build.jelly
Index: build.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ant/src/plugin-resources/templates/build.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.jelly 4 Mar 2004 17:59:03 -0000 1.7
+++ build.jelly 8 Apr 2004 00:34:44 -0000 1.8
@@ -21,6 +21,7 @@
xmlns:u="jelly:util"
xmlns:x="jelly:xml"
xmlns:maven="jelly:maven"
+ xmlns:test="test"
xmlns="dummy">
<ant:tstamp />
@@ -34,7 +35,6 @@
<maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${pom.build.unitTestSourceDirectory}" separator="/"/>
</j:if>
-
<x:comment>
build.xml generated by maven from project.xml version ${pom.currentVersion}
on date ${TODAY}, time ${TSTAMP}
@@ -42,13 +42,15 @@
<project name="${pom.artifactId}" default="jar" basedir=".">
- <property name="defaulttargetdir" value="target"/>
- <property name="libdir" value="target/lib" />
- <property name="classesdir" value="target/classes"/>
+ <property name="defaulttargetdir" value="${maven.build.dir}"/>
+ <property name="libdir" value="${maven.build.dir}/lib" />
+ <property name="classesdir" value="${maven.build.dest}" />
<j:if test="${unitTestSourcesPresent == 'true'}">
- <property name="testclassesdir" value="target/test-classes"/>
- <property name="testreportdir" value="target/test-reports"/>
+ <maven:pluginVar plugin="maven-test-plugin" property="maven.test.dest"
var="testclassesdir" />
+ <property name="testclassesdir" value="${testclassesdir}" />
+ <maven:pluginVar plugin="maven-test-plugin"
property="maven.test.reportDirectory" var="testreportdir" />
+ <property name="testreportdir" value="${testreportdir}" />
</j:if>
<property name="distdir" value="dist"/>
@@ -146,7 +148,7 @@
description="o Create the jar">
<jar
- jarfile="target/$${final.name}.jar"
+ jarfile="$${defaulttargetdir}/$${final.name}.jar"
basedir="$${classesdir}"
excludes="**/package.html"
/>
@@ -305,7 +307,7 @@
<fileset dir="$${libdir}">
<include name="*.jar"/>
</fileset>
- <pathelement location="target/$${final.name}.jar"/>
+ <pathelement location="$${defaulttargetdir}/$${final.name}.jar"/>
</classpath>
</javadoc>
1.17 +1 -0 maven-plugins/ant/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changes.xml 28 Mar 2004 23:02:48 -0000 1.16
+++ changes.xml 8 Apr 2004 00:34:44 -0000 1.17
@@ -26,6 +26,7 @@
<body>
<release version="1.7" date="in CVS">
<action dev="dion" type="fix" issue="MPANT-11">Change plugin tests to use
'assert' tags</action>
+ <action dev="brett" type="fix">Replace use of 'target' directory with
appropriate variables</action>
</release>
<release version="1.6" date="2004-03-07">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
