svn commit: r896595 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml res/tomcat.nsi webapps/ROOT/index.html webapps/ROOT/index.jsp

[rjung]

Author: rjung
Date: Wed Jan  6 18:20:46 2010
New Revision: 896595

URL: http://svn.apache.org/viewvc?rev=896595&view=rev
Log:
Replace a few hard-coded copyright years with
current year applied by ant version filter.
Backport of r895206.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/res/tomcat.nsi
    tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
    tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=896595&r1=896594&r2=896595&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan  6 18:20:46 2010
@@ -110,13 +110,6 @@
   +1: markt, rjung
   -1: 
 
-* Replace a few hard-coded copyright years with
-  current year applied by ant version filter.
-  http://svn.apache.org/viewvc?rev=895203&view=rev
-  http://svn.apache.org/viewvc?rev=895206&view=rev
-  +1: rjung, kkolinko, markt
-  -1: 
-
 * Allow special characters recognized by the Windows command-line shell to
   be present in the names of CATALINA_HOME/_BASE and the current directory
   used to call the Tomcat scripts.

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=896595&r1=896594&r2=896595&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jan  6 18:20:46 2010
@@ -532,6 +532,7 @@
       <fileset dir="webapps">
         <include name="ROOT/**"/>
         <exclude name="ROOT/index.html"/>
+        <exclude name="ROOT/index.jsp"/>
         <include name="examples/**"/>
         <include name="manager/**"/>
         <include name="host-manager/**"/>
@@ -541,6 +542,7 @@
       <filterset refid="version.filters" />
       <fileset dir="webapps">
         <include name="ROOT/index.html"/>
+        <include name="ROOT/index.jsp"/>
       </fileset>
     </copy>
 

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=896595&r1=896594&r2=896595&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Jan  6 18:20:46 2010
@@ -25,7 +25,7 @@
   ;Product information
   VIAddVersionKey ProductName "Apache Tomcat"
   VIAddVersionKey CompanyName "Apache Software Foundation"
-  VIAddVersionKey LegalCopyright "Copyright (c) 1999-2010 The Apache Software 
Foundation"
+  VIAddVersionKey LegalCopyright "Copyright (c) 19...@year@ The Apache 
Software Foundation"
   VIAddVersionKey FileDescription "Apache Tomcat Installer"
   VIAddVersionKey FileVersion "2.0"
   VIAddVersionKey ProductVersion "@VERSION@"

Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?rev=896595&r1=896594&r2=896595&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Wed Jan  6 18:20:46 2010
@@ -201,7 +201,7 @@
             <p id="footer"><img src="tomcat-power.gif" width="77" height="80" 
alt="Powered by Tomcat"/><br/>
            &nbsp;
 
-           Copyright &copy; 1999-2010 Apache Software Foundation<br/>
+           Copyright &copy; 19...@year@ Apache Software Foundation<br/>
             All Rights Reserved
             </p>
         </td>

Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp?rev=896595&r1=896594&r2=896595&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Wed Jan  6 18:20:46 2010
@@ -216,7 +216,7 @@
             <p id="footer"><img src="tomcat-power.gif" width="77" height="80" 
alt="Powered by Tomcat"/><br/>
            &nbsp;
 
-           Copyright &copy; 1999-2010 Apache Software Foundation<br/>
+           Copyright &copy; 19...@year@ Apache Software Foundation<br/>
             All Rights Reserved
             </p>
         </td>



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