Author: markt
Date: Mon Apr 18 14:00:33 2011
New Revision: 1094580
URL: http://svn.apache.org/viewvc?rev=1094580&view=rev
Log:
Fix timestamp when using version.[sh|bat]
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1094580&r1=1094579&r2=1094580&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Apr 18 14:00:33 2011
@@ -139,15 +139,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix timestamp when using version.[sh|bat]
- The problem is that version.bat in 6.0.32 displays
- "Server built: February 2 2011 2003" instead of "Feb 2 2011 20:03"
- because of the default format of DSTAMP, TSTAMP and TODAY properties.
- See http://ant.apache.org/manual/Tasks/tstamp.html
- http://people.apache.org/~markt/patches/2011-03-14-serverinfo-tc6.patch
- +1: markt, kkolinko, kfujino
- -1:
-
* Remove unnecessary whitespace from MIME mapping entries in default web.xml
http://svn.apache.org/viewvc?rev=1081334&view=rev
+1: markt, kkolinko, kfujino
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1094580&r1=1094579&r2=1094580&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Mon Apr 18 14:00:33 2011
@@ -37,9 +37,7 @@
<!-- Project Properties -->
<property name="project" value="apache-tomcat" />
<property name="name" value="Apache Tomcat" />
- <tstamp>
- <format property="year" pattern="yyyy" locale="en"/>
- </tstamp>
+
<property name="version.major" value="6" />
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
@@ -102,6 +100,7 @@
<!-- Version info filter set -->
<tstamp>
+ <format property="year" pattern="yyyy" locale="en"/>
<format property="TODAY" pattern="MMM d yyyy" locale="en"/>
<format property="TSTAMP" pattern="hh:mm:ss"/>
</tstamp>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1094580&r1=1094579&r2=1094580&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Apr 18 14:00:33 2011
@@ -81,6 +81,9 @@
<bug>50855</bug>: Fix NPE on AuthenticatorBase.register() when debug
logging is enabled. (markt)
</fix>
+ <fix>
+ Correctly format the timestamp reported by version.[sh|bat]. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
