Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace maven.javadoc.copyright by maven.javadoc.bottom

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115987 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier
2004-08-21 14:37:41 +00:00
parent 53f5a1c051
commit 4d925ecea5
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
javadoc/plugin.jelly
View File

@@ -56,7 +56,7 @@ maven.compile.src.set = [${context.getAntProject().getReferences().g
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 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
<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 -->

2
javadoc/plugin.properties
View File

@@ -22,7 +22,7 @@
#maven.javadoc.additionalparam
maven.javadoc.author = true
maven.javadoc.copyright = Copyright &copy; ${year} ${pom.organization.name}. All Rights Reserved.
maven.javadoc.bottom = Copyright &copy; ${year} ${pom.organization.name}. All Rights Reserved.
#maven.javadoc.customtags =
maven.javadoc.debug = false
maven.javadoc.destdir = ${maven.docs.dest}/apidocs

2
javadoc/src/plugin-test/test04/project.properties
View File

@@ -1,2 +1,2 @@
#Test another copyright
maven.javadoc.copyright=another copyright
maven.javadoc.bottom=another copyright

2
javadoc/src/plugin-test/test05/project.properties
View File

@@ -1,2 +1,2 @@
#Test to remove the copyrigth
maven.javadoc.copyright=
maven.javadoc.bottom=

2
javadoc/xdocs/changes.xml
View File

@@ -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>

20
javadoc/xdocs/properties.xml
View File

@@ -50,6 +50,16 @@ maven.javadoc.additionalparam=-charset utf-8
The default value is <code>true</code>.
</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>
@@ -311,16 +321,6 @@ maven.javadoc.offlineLinks=http://java.sun.com/j2se/1.4.2/docs/api/#/opt/java-ap
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>
</section>
<section name="Other Settings">