aheritier 2004/05/23 15:05:00
Modified: javadoc/src/plugin-test maven.xml project.xml
Added: javadoc/src/plugin-test project.properties
Log:
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 :-(
Revision Changes Path
1.6 +8 -7 maven-plugins/javadoc/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 22 May 2004 00:12:57 -0000 1.5
+++ maven.xml 23 May 2004 22:05:00 -0000 1.6
@@ -21,7 +21,10 @@
xmlns:assert="assert"
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 name="test-javadoc">
@@ -31,14 +34,13 @@
<!-- 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/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/Dummy2.html"/>
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
</goal>
<goal name="test-javadoc-multi-src">
- <!--
<delete dir="${maven.build.dir}" failonerror="false"/>
<ant:path id="maven.javadoc.src.set">
<ant:fileset dir="${basedir}/src/main"/>
@@ -47,18 +49,17 @@
<maven:addPath id="maven.compile.src.set" refid="maven.javadoc.src.set"/>
<attainGoal name="maven-javadoc-plugin:report"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
- -->
<!-- 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/maven2/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/Dummy2.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/Dummy6.html"/>
-->
1.3 +1 -1 maven-plugins/javadoc/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 19 May 2004 23:20:33 -0000 1.2
+++ project.xml 23 May 2004 22:05:00 -0000 1.3
@@ -30,7 +30,7 @@
<logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
</organization>
<inceptionYear>2001</inceptionYear>
- <package>org.apache.maven</package>
+ <package>org.apache</package>
<logo>http://maven.apache.org/images/maven.jpg</logo>
<description>Test for Maven JavaDoc plugin</description>
<shortDescription>Test for Maven JavaDoc plugin</shortDescription>
1.1 maven-plugins/javadoc/src/plugin-test/project.properties
Index: project.properties
===================================================================
#maven.compile.src.set=${basedir}/src/main${path.separator}${basedir}/src/opt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
