aheritier 2004/05/18 13:55:52
Modified: javadoc plugin.jelly
javadoc/src/plugin-test .cvsignore maven.xml
Added: javadoc/src/plugin-test/src/main/org/apache/maven
package.html
javadoc/src/plugin-test/src/main/org/apache/maven/doc-files
example.txt
Log:
MPJAVADOC-24 fix with test
Revision Changes Path
1.36 +3 -2 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- plugin.jelly 10 May 2004 22:26:34 -0000 1.35
+++ plugin.jelly 18 May 2004 20:55:51 -0000 1.36
@@ -172,11 +172,12 @@
bottom="${copyright}"
stylesheetfile="${maven.javadoc.stylesheet}"
additionalparam="${maven.javadoc.additionalparam}"
- useexternalfile="${maven.javadoc.useexternalfile}">
+ useexternalfile="${maven.javadoc.useexternalfile}"
+ sourcepath="${pom.build.sourceDirectory}">
<!-- sourceSet is set by the javadoc:check-needed function -->
<ant:fileset refid="sourceSet" />
-
+
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
<ant:setProperty name="source" value="${maven.javadoc.source}" />
</j:if>
1.2 +3 -1 maven-plugins/javadoc/src/plugin-test/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 May 2004 02:09:29 -0000 1.1
+++ .cvsignore 18 May 2004 20:55:51 -0000 1.2
@@ -1,3 +1,5 @@
gump.xml
*.log
-target
\ No newline at end of file
+targetdist
+dist
+target
1.3 +3 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 7 May 2004 02:22:12 -0000 1.2
+++ maven.xml 18 May 2004 20:55:51 -0000 1.3
@@ -23,9 +23,11 @@
</goal>
<goal name="test-javadoc">
- <delete dir="${maven.build.dir}/docs/apidocs" failonerror="false"/>
+ <delete dir="${maven.build.dir}" failonerror="false"/>
<attainGoal name="maven-javadoc-plugin:report"/>
<assert:assertFileExists file="${maven.build.dir}/docs/apidocs/index.html"/>
+ <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
+ <assert:assertFileExists
file="${maven.build.dir}/docs/apidocs/org/apache/maven/doc-files/example.txt"/>
</goal>
<goal name="test-javadoc-jar">
1.1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven/package.html
Index: package.html
===================================================================
<html>
<head></head>
<body>Package documentation.<br/> <a href="doc-files/example.txt">Example</a></body>
</html>
1.1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven/doc-files/example.txt
Index: example.txt
===================================================================
This an example
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
