Actually I can't succeed to set the maven.compile.src.set dynamically in the maven.xml.

I need to set it manually in the project.properties file :-(


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115398 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2004-05-23 22:05:00 +00:00
parent 31818c816d
commit 2cb42db4fd
3 changed files with 10 additions and 8 deletions

View File

@ -21,7 +21,10 @@
xmlns:assert="assert" xmlns:assert="assert"
xmlns:ant="jelly:ant"> xmlns:ant="jelly:ant">
<goal name="testPlugin" prereqs="test-javadoc,test-javadoc-multi-src,test-javadoc-jar"> <goal name="testPlugin">
<attainGoal name="test-javadoc"/>
<attainGoal name="test-javadoc-multi-src"/>
<attainGoal name="test-javadoc-jar"/>
</goal> </goal>
<goal name="test-javadoc"> <goal name="test-javadoc">
@ -31,14 +34,13 @@
<!-- assert that doc-files are copied - Issue MPJAVADOC-24 --> <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
<!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are generated --> <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3 are generated -->
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
</goal> </goal>
<goal name="test-javadoc-multi-src"> <goal name="test-javadoc-multi-src">
<!--
<delete dir="${maven.build.dir}" failonerror="false"/> <delete dir="${maven.build.dir}" failonerror="false"/>
<ant:path id="maven.javadoc.src.set"> <ant:path id="maven.javadoc.src.set">
<ant:fileset dir="${basedir}/src/main"/> <ant:fileset dir="${basedir}/src/main"/>
@ -47,18 +49,17 @@
<maven:addPath id="maven.compile.src.set" refid="maven.javadoc.src.set"/> <maven:addPath id="maven.compile.src.set" refid="maven.javadoc.src.set"/>
<attainGoal name="maven-javadoc-plugin:report"/> <attainGoal name="maven-javadoc-plugin:report"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
-->
<!-- assert that doc-files are copied - Issue MPJAVADOC-24 --> <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
<!--
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
<!--
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/doc-files/example.txt"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/doc-files/example.txt"/>
--> -->
<!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are generated --> <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are generated -->
<!--
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
<!--
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/Dummy5.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/Dummy5.html"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/Dummy6.html"/> <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/Dummy6.html"/>
--> -->

View File

@ -0,0 +1 @@
#maven.compile.src.set=${basedir}/src/main${path.separator}${basedir}/src/opt

View File

@ -30,7 +30,7 @@
<logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo> <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
</organization> </organization>
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package> <package>org.apache</package>
<logo>http://maven.apache.org/images/maven.jpg</logo> <logo>http://maven.apache.org/images/maven.jpg</logo>
<description>Test for Maven JavaDoc plugin</description> <description>Test for Maven JavaDoc plugin</description>
<shortDescription>Test for Maven JavaDoc plugin</shortDescription> <shortDescription>Test for Maven JavaDoc plugin</shortDescription>