You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2004/04/27 03:24:45 UTC
cvs commit: maven-plugins/javadoc/xdocs changes.xml
dion 2004/04/26 18:24:45
Modified: javadoc project.xml plugin.jelly
javadoc/xdocs changes.xml
Log:
trim absolute paths to basedir in javadoc report
PR: MPJAVADOC-22
Obtained from: fabrizio giustina
Submitted by: fabrizio giustina
Reviewed by: dion gillard
Revision Changes Path
1.30 +1 -1 maven-plugins/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 10 Apr 2004 00:59:23 -0000 1.29
+++ project.xml 27 Apr 2004 01:24:45 -0000 1.30
@@ -94,7 +94,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
+ <version>2.0</version>
</dependency>
</dependencies>
<versions>
1.33 +29 -1 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plugin.jelly 4 Mar 2004 18:35:58 -0000 1.32
+++ plugin.jelly 27 Apr 2004 01:24:45 -0000 1.33
@@ -264,10 +264,38 @@
<ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
<j:set var="genDocs" value="${maven.gen.docs}" />
+
+ <!-- load file in order to remove absolute paths -->
+ <util:file name="${maven.build.dir}/javadoc/report.txt" var="inputFileObject"/>
+ <util:loadText var="inputText" file="${inputFileObject}"/>
+
+ <!-- remove [javadoc] prefix from rows -->
+ <j:invokeStatic var="inputText" className="org.apache.commons.lang.StringUtils" method="replace">
+ <j:arg type="java.lang.String" value="${inputText}" />
+ <j:arg type="java.lang.String" value="[javadoc] " />
+ <j:arg type="java.lang.String" value="" />
+ </j:invokeStatic>
+
+ <!-- trim path to basedir/ -->
+ <j:set var="pathToTrim">${basedir}${file.separator}</j:set>
+ <j:invokeStatic var="inputText" className="org.apache.commons.lang.StringUtils" method="replace">
+ <j:arg type="java.lang.String" value="${inputText}" />
+ <j:arg type="java.lang.String" value="${pathToTrim}" />
+ <j:arg type="java.lang.String" value="" />
+ </j:invokeStatic>
+
+ <!-- trim path to maven home (stylesheet copy) -->
+ <j:set var="pathToTrim">${maven.home}${file.separator}</j:set>
+ <j:invokeStatic var="inputText" className="org.apache.commons.lang.StringUtils" method="replace">
+ <j:arg type="java.lang.String" value="${inputText}" />
+ <j:arg type="java.lang.String" value="${pathToTrim}" />
+ <j:arg type="java.lang.String" value="" />
+ </j:invokeStatic>
+
<doc:text-xdoc
title="Javadoc Report"
section="Javadoc Report"
- inputFile="${maven.build.dir}/javadoc/report.txt"
+ inputText="${inputText}"
output="${genDocs}/javadoc.xml"/>
</j:if>
1.24 +6 -0 maven-plugins/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/changes.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- changes.xml 7 Mar 2004 01:02:10 -0000 1.23
+++ changes.xml 27 Apr 2004 01:24:45 -0000 1.24
@@ -25,6 +25,12 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.5" date="in CVS">
+ <action dev="dion" type="fix" issue="MPJAVADOC-22" due-to="fabrizio giustina">
+ trim absolute paths to basedir in javadoc report, remove [javadoc] banner
+ </action>
+ </release>
+
<release version="1.4" date="2004-03-07">
<action dev="evenisse" type="fix" issue="MPJAVADOC-19">Prevent the plugin from failing when a sourceDirectory exists, but it does not contain Java files.</action>
<action dev="dion" type="fix" issue="MPJAVADOC-6"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org