aheritier 2004/08/21 07:37:42
Modified: javadoc plugin.jelly plugin.properties
javadoc/src/plugin-test/test04 project.properties
javadoc/src/plugin-test/test05 project.properties
javadoc/xdocs changes.xml properties.xml
Log:
Replace maven.javadoc.copyright by maven.javadoc.bottom
Revision Changes Path
1.55 +3 -3 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- plugin.jelly 21 Aug 2004 14:27:16 -0000 1.54
+++ plugin.jelly 21 Aug 2004 14:37:41 -0000 1.55
@@ -56,7 +56,7 @@
maven.javadoc.additionalparam = [${maven.javadoc.additionalparam}]
maven.javadoc.author = [${maven.javadoc.author}]
maven.javadoc.customtags = [${maven.javadoc.customtags}]
-maven.javadoc.copyright = [${maven.javadoc.copyright}]
+maven.javadoc.bottom = [${maven.javadoc.bottom}]
maven.javadoc.debug = [${maven.javadoc.debug}]
maven.javadoc.destdir = [${maven.javadoc.destdir}]
maven.javadoc.doclet = [${maven.javadoc.doclet}]
@@ -316,8 +316,8 @@
<ant:setProperty name="excludepackagenames"
value="${maven.javadoc.excludepackagenames}" />
</j:if>
- <j:if test="${context.getVariable('maven.javadoc.copyright') != null and
!context.getVariable('maven.javadoc.copyright').equals('')}">
- <ant:setProperty name="bottom" value="${maven.javadoc.copyright}" />
+ <j:if test="${context.getVariable('maven.javadoc.bottom') != null and
!context.getVariable('maven.javadoc.bottom').equals('')}">
+ <ant:setProperty name="bottom" value="${maven.javadoc.bottom}" />
</j:if>
<!-- Process/Parse links -->
1.17 +1 -1 maven-plugins/javadoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.properties 21 Aug 2004 14:27:16 -0000 1.16
+++ plugin.properties 21 Aug 2004 14:37:41 -0000 1.17
@@ -22,7 +22,7 @@
#maven.javadoc.additionalparam
maven.javadoc.author = true
-maven.javadoc.copyright = Copyright © ${year}
${pom.organization.name}. All Rights Reserved.
+maven.javadoc.bottom = Copyright © ${year}
${pom.organization.name}. All Rights Reserved.
#maven.javadoc.customtags =
maven.javadoc.debug = false
maven.javadoc.destdir = ${maven.docs.dest}/apidocs
1.2 +1 -1 maven-plugins/javadoc/src/plugin-test/test04/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/test04/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 21 Aug 2004 14:27:17 -0000 1.1
+++ project.properties 21 Aug 2004 14:37:41 -0000 1.2
@@ -1,2 +1,2 @@
#Test another copyright
-maven.javadoc.copyright=another copyright
\ No newline at end of file
+maven.javadoc.bottom=another copyright
\ No newline at end of file
1.3 +1 -1 maven-plugins/javadoc/src/plugin-test/test05/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/test05/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 21 Aug 2004 14:27:17 -0000 1.2
+++ project.properties 21 Aug 2004 14:37:41 -0000 1.3
@@ -1,2 +1,2 @@
#Test to remove the copyrigth
-maven.javadoc.copyright=
\ No newline at end of file
+maven.javadoc.bottom=
\ No newline at end of file
1.46 +1 -1 maven-plugins/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/changes.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- changes.xml 13 Aug 2004 20:16:53 -0000 1.45
+++ changes.xml 21 Aug 2004 14:37:41 -0000 1.46
@@ -26,7 +26,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="In CVS">
- <action dev="carlos" type="add" issue="MPJAVADOC-39">Added
maven.javadoc.copyright property</action>
+ <action dev="carlos" type="add" issue="MPJAVADOC-39">Added
maven.javadoc.bottom property</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-37">Default javadoc scope
(package) can't be replaced by private or public.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-36">Javadoc fails if
pom.package isn't specified.</action>
</release>
1.21 +10 -10 maven-plugins/javadoc/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/properties.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- properties.xml 13 Aug 2004 20:16:53 -0000 1.20
+++ properties.xml 21 Aug 2004 14:37:41 -0000 1.21
@@ -51,6 +51,16 @@
</td>
</tr>
<tr>
+ <td>maven.javadoc.bottom</td>
+ <td>Yes</td>
+ <td>
+ Specifies the text to be placed at the bottom of each output file. The
default value is
+ <source>Copyright ${year} ${pom.organization.name}. All Rights
Reserved.</source>
+ <code>${pom.organization.name}</code>
+ expand to value obtained from the project descriptor.
+ </td>
+ </tr>
+ <tr>
<td>maven.javadoc.customtags</td>
<td>Yes</td>
<td>
@@ -309,16 +319,6 @@
<code>${pom.name} ${pom.currentVersion} API</code>.
<code>${pom.name}</code> and <code>${maven.currentVersion}</code>
expand to values obtained from the project descriptor.
- </td>
- </tr>
- <tr>
- <td>maven.javadoc.copyright</td>
- <td>Yes</td>
- <td>
- Specifies the copyright notice. The default value is
- <source>Copyright ${year} ${pom.organization.name}. All Rights
Reserved.</source>
- <code>${pom.organization.name}</code>
- expand to value obtained from the project descriptor.
</td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
