Author: aheritier
Date: Thu May 19 16:51:22 2005
New Revision: 171019
URL: http://svn.apache.org/viewcvs?rev=171019&view=rev
Log:
Fix + tests for MPJAVADOC-59
New tests require maven-plugin-plugin 1.6 or more
Added:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/project.properties
(with props)
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/overview.html
(with props)
Modified:
maven/maven-1/plugins/trunk/javadoc/plugin.jelly
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/maven.xml
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven/package.html
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/package.html
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/package.html
maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/javadoc/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/plugin.jelly?rev=171019&r1=171018&r2=171019&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/javadoc/plugin.jelly Thu May 19 16:51:22 2005
@@ -125,6 +125,7 @@
<j:forEach var="dir" items="${sources_dirs}">
<ant:fileset dir="${dir}">
<ant:include name="**/*.java"/>
+ <ant:include name="**/*.html"/>
<ant:include name="**/doc-files/**/*"/>
<!-- handle source modifications -->
<j:forEach var="sm" items="${pom.build.sourceModifications}">
@@ -506,6 +507,7 @@
<j:forEach var="dir" items="${sources_dirs}">
<ant:fileset dir="${dir}">
<ant:include name="**/doc-files/**/*"/>
+ <ant:include name="**/*.html"/>
</ant:fileset>
</j:forEach>
</ant:copy>
Modified: maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/maven.xml?rev=171019&r1=171018&r2=171019&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/maven.xml
(original)
+++ maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/maven.xml Thu
May 19 16:51:22 2005
@@ -41,6 +41,16 @@
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven3/Dummy6.html"/>
<!-- assert that javadoc for classe Dummy4 isn't generated -->
<assert:assertFileNotFound
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy4.html"/>
+ <!-- assert that package.html and overview.html are used - Issue
MPJAVADOC-59 -->
+ <ant:echo>1</ant:echo>
+ <assert:assertFileContains
file="${maven.javadoc.destdir}/org/apache/maven/package-summary.html"
match="package.html file content."/>
+ <ant:echo>2</ant:echo>
+ <assert:assertFileContains
file="${maven.javadoc.destdir}/org/apache/maven2/package-summary.html"
match="package.html file content."/>
+ <ant:echo>3</ant:echo>
+ <assert:assertFileContains
file="${maven.javadoc.destdir}/org/apache/maven3/package-summary.html"
match="package.html file content."/>
+ <ant:echo>4</ant:echo>
+ <assert:assertFileContains
file="${maven.javadoc.destdir}/overview-summary.html" match="overview.html file
content."/>
+ <ant:echo>5</ant:echo>
</goal>
</project>
Added:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/project.properties?rev=171019&view=auto
==============================================================================
---
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/project.properties
(added)
+++
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/project.properties
Thu May 19 16:51:22 2005
@@ -0,0 +1 @@
+maven.javadoc.overview=${pom.build.sourceDirectory}/overview.html
\ No newline at end of file
Propchange:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven/package.html
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven/package.html?rev=171019&r1=171018&r2=171019&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven/package.html
(original)
+++
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven/package.html
Thu May 19 16:51:22 2005
@@ -1,6 +1,7 @@
<html>
<head></head>
<body>
+package.html file content. <br/>
Package documentation. <br/>
<a href="doc-files/example.txt">example.txt</a> in doc-files directory.
</body>
Modified:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/package.html
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/package.html?rev=171019&r1=171018&r2=171019&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/package.html
(original)
+++
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/package.html
Thu May 19 16:51:22 2005
@@ -1,6 +1,7 @@
<html>
<head></head>
<body>
+package.html file content. <br/>
Package documentation. <br/>
<a href="doc-files/example.txt">example.txt</a> in doc-files directory.
</body>
Added:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/overview.html
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/overview.html?rev=171019&view=auto
==============================================================================
---
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/overview.html
(added)
+++
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/overview.html
Thu May 19 16:51:22 2005
@@ -0,0 +1,6 @@
+<html>
+<head></head>
+<body>
+<p>overview.html file content.</p>
+</body>
+</html>
\ No newline at end of file
Propchange:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/main/overview.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/package.html
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/package.html?rev=171019&r1=171018&r2=171019&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/package.html
(original)
+++
maven/maven-1/plugins/trunk/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/package.html
Thu May 19 16:51:22 2005
@@ -1,6 +1,7 @@
<html>
<head></head>
<body>
+package.html file content. <br/>
Package documentation. <br/>
<a href="doc-files/example.txt">example.txt</a> in doc-files directory.
</body>
Modified: maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml?rev=171019&r1=171018&r2=171019&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml Thu May 19 16:51:22
2005
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.8" date="In SVN">
+ <action dev="aheritier" type="fix" issue="MPJAVADOC-59">Files
package.html and overview.html are not copied when source modifications are
used.</action>
<action dev="carlos" type="add" issue="MPJAVADOC-58">Added
maven.javadoc.failonerror property.</action>
<action dev="aheritier" type="add" issue="MPJAVADOC-54" due-to="Dag
Sverre Seljebotn">Added maven.javadoc.header and maven.javadoc.footer
properties.</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
