aheritier 2004/08/21 07:27:17
Modified: javadoc plugin.jelly plugin.properties project.xml
javadoc/src/plugin-test/test05 project.properties
Added: javadoc/src/plugin-test/test04 project.properties
Log:
Fix and tests if maven.javadoc.copyright is empty
Revision Changes Path
1.54 +5 -6 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- plugin.jelly 13 Aug 2004 20:16:53 -0000 1.53
+++ plugin.jelly 21 Aug 2004 14:27:16 -0000 1.54
@@ -56,6 +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.debug = [${maven.javadoc.debug}]
maven.javadoc.destdir = [${maven.javadoc.destdir}]
maven.javadoc.doclet = [${maven.javadoc.doclet}]
@@ -247,11 +248,6 @@
</j:choose>
</ant:tstamp>
- <maven:property var="copyrightNotice" name="maven.javadoc.copyright"
- defaultValue="Copyright &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 @@
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}"
@@ -319,6 +314,10 @@
<j:if test="${context.getVariable('maven.javadoc.excludepackagenames') !=
null}">
<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 -->
1.16 +12 -11 maven-plugins/javadoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.properties 29 Jul 2004 22:57:30 -0000 1.15
+++ plugin.properties 21 Aug 2004 14:27:16 -0000 1.16
@@ -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 @@
#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
1.44 +2 -2 maven-plugins/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/project.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- project.xml 29 Jul 2004 22:59:24 -0000 1.43
+++ project.xml 21 Aug 2004 14:27:17 -0000 1.44
@@ -72,10 +72,10 @@
</roles>
</developer>
<developer>
- <name>Stéphane Mor</name>
+ <name>Stephane Mor</name>
<id>smor</id>
<email>[EMAIL PROTECTED]</email>
- <organization>Hasgard Systèmes et Réseaux</organization>
+ <organization>Hasgard Systemes et Reseaux</organization>
<roles>
<role>Java Developer</role>
</roles>
1.1 maven-plugins/javadoc/src/plugin-test/test04/project.properties
Index: project.properties
===================================================================
#Test another copyright
maven.javadoc.copyright=another copyright
1.2 +2 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 13 Aug 2004 20:16:53 -0000 1.1
+++ project.properties 21 Aug 2004 14:27:17 -0000 1.2
@@ -1 +1,2 @@
-maven.javadoc.copyright=another copyright
\ No newline at end of file
+#Test to remove the copyrigth
+maven.javadoc.copyright=
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
