tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r699260 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt res/tomcat.nsi webapps/docs/changelog.xml
Date Fri, 26 Sep 2008 10:39:43 GMT
Author: markt
Date: Fri Sep 26 03:39:42 2008
New Revision: 699260

URL: http://svn.apache.org/viewvc?rev=699260&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45852
Add special handing to the Windows installer for a charset that doesn't follow the standard
naming convention.

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/res/tomcat.nsi
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 03:39:42 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698012,698227,698236
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698012,698227,698236,698613

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=699260&r1=699259&r2=699260&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 26 03:39:42 2008
@@ -172,13 +172,6 @@
   +1: markt, remm (but you should stop adding features at some point)
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45852
-  Add special handing to the Windows installer for a charset that doesn't follow
-  the standard naming convention
-  http://svn.apache.org/viewvc?rev=698613&view=rev
-  +1: markt, mturk, remm (arg, hack)
-  -1: 
-
 * Update tc-native to lastest version:
   http://people.apache.org/~jfclere/patches/patch.new-tcnative
   +1: jclere, markt, remm

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=699260&r1=699259&r2=699260&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Fri Sep 26 03:39:42 2008
@@ -590,8 +590,11 @@
   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"
-
+  StrCmp $R8 "932" 0 +3
+    ; Special case where Java uses non-standard name for character set
+    FileWrite $R9 "<?xml version='1.0' encoding='ms$R8'?>$\r$\n"
+    Goto +2
+    FileWrite $R9 "<?xml version='1.0' encoding='cp$R8'?>$\r$\n"
   Push "$TEMP\confinstall\tomcat-users_1.xml"
   Call copyFile
   FileWrite $R9 $R5

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=699260&r1=699259&r2=699260&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 26 03:39:42 2008
@@ -151,6 +151,10 @@
   <subsection name="Other">
     <changelog>
       <fix>
+        <bug>45852</bug>: Add special handling for cp932 (aka ms932) when
+        creating tomcat-users.xml with Windows installer. (markt)
+      </fix>
+      <fix>
         <bug>45879</bug>: Move NOTICE file from documentation webapp to the
         installation directory. (markt)
       </fix>



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


Mime
View raw message