tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r892762 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/config.ini res/tomcat.nsi webapps/docs/changelog.xml
Date Mon, 21 Dec 2009 11:09:32 GMT
Author: markt
Date: Mon Dec 21 11:09:31 2009
New Revision: 892762

URL: http://svn.apache.org/viewvc?rev=892762&view=rev
Log: (empty)

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/res/config.ini
    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=892762&r1=892761&r2=892762&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 11:09:31 2009
@@ -261,11 +261,6 @@
   +1: kkolinko
   -1:
 
-* Further improvements to Windows installer password handling
-  http://people.apache.org/~markt/patches/2009-12-21-windows-installer.patch
-  +1: kkolinko, markt, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
   Implement fail-safe EOL conversion for source distributions
   Based on a patch provided by sebb

Modified: tomcat/tc6.0.x/trunk/res/config.ini
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/config.ini?rev=892762&r1=892761&r2=892762&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/config.ini (original)
+++ tomcat/tc6.0.x/trunk/res/config.ini Mon Dec 21 11:09:31 2009
@@ -20,7 +20,7 @@
 
 [Field 3]
 Type=Label
-text=Administrator Login
+text=Tomcat Administrator Login (optional)
 left=0
 right=300
 top=30
@@ -29,14 +29,13 @@
 [Field 4]
 Type=Label
 Text=User Name
-left=0
+left=10
 right=150
 top=50
 bottom=65
 
 [Field 5]
 Type=Text
-State=admin
 left=150
 right=250
 top=50
@@ -45,7 +44,7 @@
 [Field 6]
 Type=Label
 Text=Password
-left=0
+left=10
 right=150
 top=70
 bottom=85

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=892762&r1=892761&r2=892762&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Mon Dec 21 11:09:31 2009
@@ -94,14 +94,14 @@
     ;Descriptions
     LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container."
     LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container core."
-    LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the
computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP."
+    LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the
computer is started."
     LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat native .dll
for better performance and scalability in production environments."
 ;    LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat source code."
     LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat."
-    LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle. This
include documentation on the servlet container and its configuration options, on the Jasper
JSP page compiler, as well as on the native webserver connectors."
+    LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle. This
includes documentation on the servlet container and its configuration options, on the Jasper
JSP page compiler, as well as on the native webserver connectors."
     LangString DESC_SecManager ${LANG_ENGLISH} "Install the Tomcat Manager administrative
web application."
     LangString DESC_SecHostManager ${LANG_ENGLISH} "Install the Tomcat Host Manager administrative
web application."
-    LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP example web
applications."
+    LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP examples web
application."
     LangString DESC_SecAdmin ${LANG_ENGLISH} "Installs the administration web application.";
 ;    LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web applications
(WebDAV, balancer, etc)."
 
@@ -187,7 +187,7 @@
   Pop $0
   StrCmp $0 "0" InstallOk
     MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
-      "Failed to install Tomcat6 service.$\r$\nCheck your settings and permissions$\r$\nIgnore
and continue anyway (not recommended)?" \
+      "Failed to install Tomcat@VERSION_MAJOR@ service.$\r$\nCheck your settings and permissions.$\r$\nIgnore
and continue anyway (not recommended)?" \
        /SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
   Quit
   InstallOk:
@@ -432,6 +432,9 @@
   !insertmacro MUI_INSTALLOPTIONS_READ $0 "config.ini" "Field 7" "HWND"
   !insertmacro MUI_INSTALLOPTIONS_WRITE "config.ini" "Field 7" "Flags" "DISABLED"
   EnableWindow $0 0
+  ; Clear the values
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "config.ini" "Field 5" "State" ""
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "config.ini" "Field 7" "State" ""
 
 Display:
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "config.ini"
@@ -647,12 +650,9 @@
   !insertmacro MUI_INSTALLOPTIONS_READ $R2 "config.ini" "Field 7" "State"
 
   IfSilent 0 +2
-  StrCpy $R4 'port="8080"'
+  StrCpy $R0 '8080'
 
-  IfSilent +2 0
   StrCpy $R4 'port="$R0"'
-
-  IfSilent 0 +2
   StrCpy $R5 ''
 
   IfSilent Silent 0

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=892762&r1=892761&r2=892762&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Dec 21 11:09:31 2009
@@ -611,8 +611,8 @@
         correct binary on 64-bit machines. (markt)
       </fix>
       <update>
-        Update Windows Installer to use NSIS 2.45. They say that this version provides
-        support for the upcoming Microsoft Windows 7. (kkolinko)
+        Update Windows Installer to use NSIS 2.45. They say that this version
+        provides support for the upcoming Microsoft Windows 7. (kkolinko)
       </update>
       <fix>
         Don't add blank lines to end of files when fixing line-endings for
@@ -667,6 +667,10 @@
         manager or host-manager web applications are selected for installation.
         (markt)
       </fix>
+      <update>
+        Further improvements to the administrative user name and password
+        handling in the Windows installer. (kkolinko)
+      </update>
     </changelog>
   </subsection>
 </section>



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


Mime
View raw message