You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/10/26 15:18:48 UTC

svn commit: r1634332 - in /tomcat/tc7.0.x/trunk: ./ build.xml modules/jdbc-pool/build.xml webapps/docs/changelog.xml

Author: kkolinko
Date: Sun Oct 26 14:18:47 2014
New Revision: 1634332

URL: http://svn.apache.org/r1634332
Log:
Suppress timestamp comment in generated Javadoc. Such as
<!-- Generated by javadoc (version 1.7.0_65) on Wed Oct 22 09:10:36 EST 2014 -->

Those comments result in one changed line per each HTML file,
which makes the diff between different versions of documentation unnecessary huge.

Documentation:
http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#standard

Merged r1633500 r1634327 from tomcat/trunk.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/build.xml
    tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1633500,1634327

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1634332&r1=1634331&r2=1634332&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sun Oct 26 14:18:47 2014
@@ -1837,7 +1837,7 @@ Apache Tomcat ${version} native binaries
       header="&lt;b&gt;Servlet 3.0 - Apache Tomcat ${version}&lt;/b&gt;"
       bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
       encoding="ISO-8859-1"
-      additionalparam="-breakiterator"
+      additionalparam="-breakiterator -notimestamp"
       maxmemory="256m"
       executable="${java.7.home}/bin/javadoc">
       <classpath>
@@ -1855,7 +1855,7 @@ Apache Tomcat ${version} native binaries
       header="&lt;b&gt;JSP 2.2 - Apache Tomcat ${version}&lt;/b&gt;"
       bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
       encoding="ISO-8859-1"
-      additionalparam="-breakiterator"
+      additionalparam="-breakiterator -notimestamp"
       maxmemory="256m"
       executable="${java.7.home}/bin/javadoc">
       <classpath>
@@ -1873,7 +1873,7 @@ Apache Tomcat ${version} native binaries
       header="&lt;b&gt;EL 2.2 - Apache Tomcat ${version}&lt;/b&gt;"
       bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
       encoding="ISO-8859-1"
-      additionalparam="-breakiterator"
+      additionalparam="-breakiterator -notimestamp"
       maxmemory="256m"
       executable="${java.7.home}/bin/javadoc">
       <classpath>
@@ -1891,7 +1891,7 @@ Apache Tomcat ${version} native binaries
       header="&lt;b&gt;WebSocket 1.1 - Apache Tomcat ${version}&lt;/b&gt;"
       bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
       encoding="ISO-8859-1"
-      additionalparam="-breakiterator"
+      additionalparam="-breakiterator -notimestamp"
       maxmemory="256m"
       executable="${java.7.home}/bin/javadoc">
       <classpath>
@@ -1908,7 +1908,7 @@ Apache Tomcat ${version} native binaries
       header="&lt;b&gt;Apache Tomcat ${version}&lt;/b&gt;"
       bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
       encoding="ISO-8859-1"
-      additionalparam="-breakiterator"
+      additionalparam="-breakiterator -notimestamp"
       maxmemory="256m"
       executable="${java.7.home}/bin/javadoc">
       <classpath>

Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml?rev=1634332&r1=1634331&r2=1634332&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml Sun Oct 26 14:18:47 2014
@@ -123,9 +123,15 @@
     </xslt>
     <move tofile="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html"
           file="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/jdbc-pool.html"/>
-    <javadoc sourcepath="${basedir}/src/main/java" destdir="${tomcat.api}" verbose="false"
-             link="http://java.sun.com/javase/6/docs/api/">
+    <javadoc
+        destdir="${tomcat.api}"
+        bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
+        encoding="ISO-8859-1"
+        additionalparam="-breakiterator -notimestamp"
+        verbose="false">
       <classpath refid="tomcat.jdbc.classpath"/>
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <sourcepath location="${basedir}/src/main/java"/>
     </javadoc>
     <!-- connection pool API  file-->
     <jar jarfile="${tomcat-jdbc-api.jar}" update="true">

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1634332&r1=1634331&r2=1634332&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Oct 26 14:18:47 2014
@@ -185,6 +185,9 @@
         In examples web application move Async and Comet examples from JSP
         to Servlet examples page. (kkolinko)
       </update>
+      <update>
+        Suppress timestamp comments in Javadoc. (kkolinko)
+      </update>
     </changelog>
   </subsection>
   <subsection name="jdbc-pool">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org