Fix and tests if maven.javadoc.copyright is empty

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115986 13f79535-47bb-0310-9956-ffa450edef68

javadoc/plugin.jelly

@@ -56,6 +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.debug               = [${maven.javadoc.debug}]
 maven.javadoc.destdir             = [${maven.javadoc.destdir}]
 maven.javadoc.doclet              = [${maven.javadoc.doclet}]
@@ -247,11 +248,6 @@ internal.javadoc.working.dir      = [${internal.javadoc.working.dir}]
       </j:choose>
       </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 -->
       <j:set var="online" value="${maven.javadoc.mode.online}"/>
       <j:if test="${empty(online)}">
@@ -298,7 +294,6 @@ internal.javadoc.working.dir      = [${internal.javadoc.working.dir}]
         use="${maven.javadoc.use}"
         windowtitle="${maven.javadoc.windowtitle}"
         doctitle="${maven.javadoc.windowtitle}"
-        bottom="${copyright}"
         stylesheetfile="${maven.javadoc.stylesheet}"
         additionalparam="${maven.javadoc.additionalparam}"
         useexternalfile="${maven.javadoc.useexternalfile}"
@@ -321,6 +316,10 @@ 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>
+
         <!-- Process/Parse links -->
         <!-- This code allows to specify a packagelistLoc even when in online mode -->
         <j:forEach var="link" items="${links}">

javadoc/plugin.properties

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

javadoc/project.xml

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

javadoc/src/plugin-test/test04/project.properties

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

javadoc/src/plugin-test/test05/project.properties

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