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

Fix and tests if maven.javadoc.copyright is empty

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115986 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2004-08-21 14:27:17 +00:00
parent badcd1bd04
commit 53f5a1c051
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
javadoc/plugin.jelly
View File

@ -56,6 +56,7 @@ maven.compile.src.set = [${context.getAntProject().getReferences().g
maven.javadoc.additionalparam = [${maven.javadoc.additionalparam}] maven.javadoc.additionalparam = [${maven.javadoc.additionalparam}]
maven.javadoc.author = [${maven.javadoc.author}] maven.javadoc.author = [${maven.javadoc.author}]
maven.javadoc.customtags = [${maven.javadoc.customtags}] maven.javadoc.customtags = [${maven.javadoc.customtags}]
maven.javadoc.copyright = [${maven.javadoc.copyright}]
maven.javadoc.debug = [${maven.javadoc.debug}] maven.javadoc.debug = [${maven.javadoc.debug}]
maven.javadoc.destdir = [${maven.javadoc.destdir}] maven.javadoc.destdir = [${maven.javadoc.destdir}]
maven.javadoc.doclet = [${maven.javadoc.doclet}] maven.javadoc.doclet = [${maven.javadoc.doclet}]
@ -247,11 +248,6 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
</j:choose> </j:choose>
</ant:tstamp> </ant:tstamp>
<maven:property var="copyrightNotice" name="maven.javadoc.copyright"
defaultValue="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved."/>
<ant:property name="copyright" value="${copyrightNotice}" />
<!-- calculate online/offline mode --> <!-- calculate online/offline mode -->
<j:set var="online" value="${maven.javadoc.mode.online}"/> <j:set var="online" value="${maven.javadoc.mode.online}"/>
<j:if test="${empty(online)}"> <j:if test="${empty(online)}">
@ -298,7 +294,6 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
use="${maven.javadoc.use}" use="${maven.javadoc.use}"
windowtitle="${maven.javadoc.windowtitle}" windowtitle="${maven.javadoc.windowtitle}"
doctitle="${maven.javadoc.windowtitle}" doctitle="${maven.javadoc.windowtitle}"
bottom="${copyright}"
stylesheetfile="${maven.javadoc.stylesheet}" stylesheetfile="${maven.javadoc.stylesheet}"
additionalparam="${maven.javadoc.additionalparam}" additionalparam="${maven.javadoc.additionalparam}"
useexternalfile="${maven.javadoc.useexternalfile}" useexternalfile="${maven.javadoc.useexternalfile}"
@ -321,6 +316,10 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
<ant:setProperty name="excludepackagenames" value="${maven.javadoc.excludepackagenames}" /> <ant:setProperty name="excludepackagenames" value="${maven.javadoc.excludepackagenames}" />
</j:if> </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>
<!-- Process/Parse links --> <!-- Process/Parse links -->
<!-- This code allows to specify a packagelistLoc even when in online mode --> <!-- This code allows to specify a packagelistLoc even when in online mode -->
<j:forEach var="link" items="${links}"> <j:forEach var="link" items="${links}">

23
javadoc/plugin.properties
View File

@ -22,7 +22,8 @@
#maven.javadoc.additionalparam #maven.javadoc.additionalparam
maven.javadoc.author = true maven.javadoc.author = true
#maven.javadoc.customtags maven.javadoc.copyright = Copyright &copy; ${year} ${pom.organization.name}. All Rights Reserved.
#maven.javadoc.customtags =
maven.javadoc.debug = false maven.javadoc.debug = false
maven.javadoc.destdir = ${maven.docs.dest}/apidocs maven.javadoc.destdir = ${maven.docs.dest}/apidocs
@ -35,18 +36,18 @@ maven.javadoc.links =
#specify an alternate locale #specify an alternate locale
#maven.javadoc.locale = en_US #maven.javadoc.locale = en_US
#maven.javadoc.maxmemory #maven.javadoc.maxmemory =
#maven.javadoc.mode.online #maven.javadoc.mode.online =
#maven.javadoc.offlineLinks #maven.javadoc.offlineLinks =
#maven.javadoc.overview #maven.javadoc.overview =
#maven.javadoc.package = true #maven.javadoc.package = true
#maven.javadoc.private = false #maven.javadoc.private = false
#maven.javadoc.public = false #maven.javadoc.public = false
#maven.javadoc.source #maven.javadoc.source =
maven.javadoc.stylesheet = ${plugin.resources}/stylesheet.css maven.javadoc.stylesheet = ${plugin.resources}/stylesheet.css
#maven.javadoc.tagletpath #maven.javadoc.tagletpath =
#maven.javadoc.taglets #maven.javadoc.taglets =
maven.javadoc.use = true maven.javadoc.use = true
maven.javadoc.useexternalfile = yes maven.javadoc.useexternalfile = yes
maven.javadoc.version = true maven.javadoc.version = true

4
javadoc/project.xml
View File

@ -72,10 +72,10 @@
</roles> </roles>
</developer> </developer>
<developer> <developer>
<name>Stéphane Mor</name> <name>Stephane Mor</name>
<id>smor</id> <id>smor</id>
<email>stephanemor@yahoo.fr</email> <email>stephanemor@yahoo.fr</email>
<organization>Hasgard Systèmes et Réseaux</organization> <organization>Hasgard Systemes et Reseaux</organization>
<roles> <roles>
<role>Java Developer</role> <role>Java Developer</role>
</roles> </roles>

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

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

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

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