Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace use of "target" directoriy with appropriate variables

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114984 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2004-04-08 00:34:44 +00:00
parent 7d1bf06e08
commit 27b5cb6380
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ant/plugin.jelly
View File

@ -17,9 +17,11 @@
*/ */
--> -->
<!-- Note the need to declare "test" as a namespace because it is used in the template -->
<project <project
xmlns:ant="jelly:ant" xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:test="test"
xmlns:j="jelly:core"> xmlns:j="jelly:core">
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- A N T B U I L D G E N E R A T O R --> <!-- A N T B U I L D G E N E R A T O R -->

3
ant/project.xml
View File

@ -63,9 +63,6 @@
<groupId>commons-jelly</groupId> <groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId> <artifactId>commons-jelly-tags-xml</artifactId>
<version>20030211.142705</version> <version>20030211.142705</version>
<properties>
<classloader>root.maven</classloader>
</properties>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

18
ant/src/plugin-resources/templates/build.jelly
View File

@ -21,6 +21,7 @@
xmlns:u="jelly:util" xmlns:u="jelly:util"
xmlns:x="jelly:xml" xmlns:x="jelly:xml"
xmlns:maven="jelly:maven" xmlns:maven="jelly:maven"
xmlns:test="test"
xmlns="dummy"> xmlns="dummy">
<ant:tstamp /> <ant:tstamp />
@ -34,7 +35,6 @@
<maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" separator="/"/> <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" separator="/"/>
</j:if> </j:if>
<x:comment> <x:comment>
build.xml generated by maven from project.xml version ${pom.currentVersion} build.xml generated by maven from project.xml version ${pom.currentVersion}
on date ${TODAY}, time ${TSTAMP} on date ${TODAY}, time ${TSTAMP}
@ -42,13 +42,15 @@
<project name="${pom.artifactId}" default="jar" basedir="."> <project name="${pom.artifactId}" default="jar" basedir=".">
<property name="defaulttargetdir" value="target"/> <property name="defaulttargetdir" value="${maven.build.dir}"/>
<property name="libdir" value="target/lib" /> <property name="libdir" value="${maven.build.dir}/lib" />
<property name="classesdir" value="target/classes"/> <property name="classesdir" value="${maven.build.dest}" />
<j:if test="${unitTestSourcesPresent == 'true'}"> <j:if test="${unitTestSourcesPresent == 'true'}">
<property name="testclassesdir" value="target/test-classes"/> <maven:pluginVar plugin="maven-test-plugin" property="maven.test.dest" var="testclassesdir" />
<property name="testreportdir" value="target/test-reports"/> <property name="testclassesdir" value="${testclassesdir}" />
<maven:pluginVar plugin="maven-test-plugin" property="maven.test.reportDirectory" var="testreportdir" />
<property name="testreportdir" value="${testreportdir}" />
</j:if> </j:if>
<property name="distdir" value="dist"/> <property name="distdir" value="dist"/>
@ -146,7 +148,7 @@
description="o Create the jar"> description="o Create the jar">
<jar <jar
jarfile="target/$${final.name}.jar" jarfile="$${defaulttargetdir}/$${final.name}.jar"
basedir="$${classesdir}" basedir="$${classesdir}"
excludes="**/package.html" excludes="**/package.html"
/> />
@ -305,7 +307,7 @@
<fileset dir="$${libdir}"> <fileset dir="$${libdir}">
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
<pathelement location="target/$${final.name}.jar"/> <pathelement location="$${defaulttargetdir}/$${final.name}.jar"/>
</classpath> </classpath>
</javadoc> </javadoc>

1
ant/xdocs/changes.xml
View File

@ -26,6 +26,7 @@
<body> <body>
<release version="1.7" date="in CVS"> <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="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>
<release version="1.6" date="2004-03-07"> <release version="1.6" date="2004-03-07">