tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r676383 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/confinstall/tomcat-users_1.xml res/tomcat.nsi webapps/docs/changelog.xml
Date Sun, 13 Jul 2008 18:03:08 GMT
Author: markt
Date: Sun Jul 13 11:03:07 2008
New Revision: 676383

URL: http://svn.apache.org/viewvc?rev=676383&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332
Use correct encoding (current windows code page) when creating tomcat-users.xml

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml
    tomcat/tc6.0.x/trunk/res/tomcat.nsi
    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=676383&r1=676382&r2=676383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jul 13 11:03:07 2008
@@ -48,13 +48,6 @@
   +1: fhanik
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332
-  Don't assume UTF-8 and use the correct encoding when generating
-  tomcat-users.xml from the Windows installer.
-  http://svn.apache.org/viewvc?rev=674335&view=rev
-  +1: markt, fhanik, jfclere, remm
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285
   Need to look for annotations in class hierarchy
   http://people.apache.org/~markt/patches/2008-07-09-bug45285.patch

Modified: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml?rev=676383&r1=676382&r2=676383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml (original)
+++ tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml Sun Jul 13 11:03:07 2008
@@ -1,4 +1,3 @@
-<?xml version='1.0' encoding='utf-8'?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=676383&r1=676382&r2=676383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Sun Jul 13 11:03:07 2008
@@ -595,6 +595,9 @@
   
   Delete "$INSTDIR\conf\tomcat-users.xml"
   FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
+  ; File will be written using current windows codepage
+  System::Call 'Kernel32::GetACP() i .r18'
+  FileWrite $R9 "<?xml version='1.0' encoding='cp$R8'?>$\r$\n"
 
   Push "$TEMP\confinstall\tomcat-users_1.xml"
   Call copyFile

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=676383&r1=676382&r2=676383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jul 13 11:03:07 2008
@@ -48,6 +48,15 @@
       </update>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <update>
+        <bug>45332</bug>: Specify the correct encoding (the current Windows code
+        page) rather than assuming UTF-8 when creating tomcat-users.xml with the
+        Windows installer. (markt)
+      </update>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 6.0.17 (remm)">
   <subsection name="General">



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


Mime
View raw message