You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/24 18:43:41 UTC
svn commit: r1139381 - in /tomcat/trunk: build.xml
res/confinstall/server_2.xml res/confinstall/server_3.xml res/tomcat.nsi
webapps/docs/changelog.xml
Author: markt
Date: Fri Jun 24 16:43:40 2011
New Revision: 1139381
URL: http://svn.apache.org/viewvc?rev=1139381&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
Provide the ability to specify the AJP port and service name when installing Tomcat using the Windows installer. This permits multiple instances of the same Tomcat version to be installed side-by-side.
Added:
tomcat/trunk/res/confinstall/server_3.xml
- copied, changed from r1138949, tomcat/trunk/res/confinstall/server_2.xml
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/confinstall/server_2.xml
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1139381&r1=1139380&r2=1139381&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun 24 16:43:40 2011
@@ -438,6 +438,7 @@
<exclude name="modules/**"/>
<exclude name="**/*.mdl"/>
<exclude name="**/*_2.xml"/>
+ <exclude name="**/*_3.xml"/>
<exclude name="res/checkstyle/header-al2.txt"/>
<!-- Exclude auto-generated files -->
<exclude name="java/org/apache/el/parser/ELParser*.java" />
Modified: tomcat/trunk/res/confinstall/server_2.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/confinstall/server_2.xml?rev=1139381&r1=1139380&r2=1139381&view=diff
==============================================================================
--- tomcat/trunk/res/confinstall/server_2.xml (original)
+++ tomcat/trunk/res/confinstall/server_2.xml Fri Jun 24 16:43:40 2011
@@ -19,55 +19,4 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host).
- Documentation at /docs/config/engine.html -->
-
- <!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
- -->
- <Engine name="Catalina" defaultHost="localhost">
-
- <!--For clustering, please take a look at documentation at:
- /docs/cluster-howto.html (simple how to)
- /docs/config/cluster.html (reference documentation) -->
- <!--
- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
- -->
-
- <!-- Use the LockOutRealm to prevent attempts to guess user passwords
- via a brute-force attack -->
- <Realm className="org.apache.catalina.realm.LockOutRealm">
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
- </Realm>
-
- <Host name="localhost" appBase="webapps"
- unpackWARs="true" autoDeploy="true">
-
- <!-- SingleSignOn valve, share authentication between web applications
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
- -->
-
- <!-- Access log processes all example.
- Documentation at: /docs/config/valve.html
- Note: The pattern used is equivalent to using pattern="common" -->
- <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
- prefix="localhost_access_log." suffix=".txt"
- pattern="%h %l %u %t "%r" %s %b" resolveHosts="false"/>
-
- </Host>
- </Engine>
- </Service>
-</Server>
+ <Connector
\ No newline at end of file
Copied: tomcat/trunk/res/confinstall/server_3.xml (from r1138949, tomcat/trunk/res/confinstall/server_2.xml)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/confinstall/server_3.xml?p2=tomcat/trunk/res/confinstall/server_3.xml&p1=tomcat/trunk/res/confinstall/server_2.xml&r1=1138949&r2=1139381&rev=1139381&view=diff
==============================================================================
--- tomcat/trunk/res/confinstall/server_2.xml (original)
+++ tomcat/trunk/res/confinstall/server_3.xml Fri Jun 24 16:43:40 2011
@@ -1,25 +1,4 @@
- protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- <!-- A "Connector" using the shared thread pool-->
- <!--
- <Connector executor="tomcatThreadPool"
- port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- -->
- <!-- Define a SSL HTTP/1.1 Connector on port 8443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
- <!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
- -->
-
- <!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+ protocol="AJP/1.3" redirectPort="8443" />
<!-- An Engine represents the entry point (within Catalina) that processes
Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1139381&r1=1139380&r2=1139381&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Fri Jun 24 16:43:40 2011
@@ -45,7 +45,8 @@ Var JavaExe
Var JvmDll
Var Arch
Var ResetInstDir
-Var TomcatPort
+Var TomcatPortHttp
+Var TomcatPortAjp
Var TomcatMenuEntriesEnable
Var TomcatShortcutAllUsers
Var TomcatServiceName
@@ -58,7 +59,9 @@ Var TomcatAdminRoles
; Variables that store handles of dialog controls
Var CtlJavaHome
-Var CtlTomcatPort
+Var CtlTomcatPortHttp
+Var CtlTomcatPortAjp
+Var CtlTomcatServiceName
Var CtlTomcatShortcutAllUsers
Var CtlTomcatAdminUsername
Var CtlTomcatAdminPassword
@@ -93,12 +96,15 @@ Var ServiceInstallLog
LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path selection."
LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path selection"
+ LangString TEXT_INSTDIR_NOT_EMPTY ${LANG_ENGLISH} "The specified installation directory is not empty. Do you wish to continue?"
LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java SE 6.0 or later JRE installed on your system."
- LangString TEXT_CONF_LABEL_PORT ${LANG_ENGLISH} "HTTP/1.1 Connector Port"
+ LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector Port"
+ LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
+ LangString TEXT_CONF_LABEL_SERVICE_NAME ${LANG_ENGLISH} "Windows Service Name"
LangString TEXT_CONF_LABEL_SHORTCUT_ALL_USERS ${LANG_ENGLISH} "Create shortcuts for all users"
LangString TEXT_CONF_LABEL_ADMIN ${LANG_ENGLISH} "Tomcat Administrator Login (optional)"
LangString TEXT_CONF_LABEL_ADMINUSERNAME ${LANG_ENGLISH} "User Name"
@@ -113,6 +119,7 @@ Var ServiceInstallLog
!insertmacro MUI_PAGE_COMPONENTS
Page custom pageConfiguration pageConfigurationLeave "$(TEXT_CONF_PAGETITLE)"
Page custom pageChooseJVM pageChooseJVMLeave "$(TEXT_JVM_PAGETITLE)"
+ !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageDirectoryLeave
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
Page custom CheckUserType
@@ -145,13 +152,11 @@ Var ServiceInstallLog
InstType Minimum
InstType Full
- ; Main registry key
- InstallDirRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@" ""
-
ReserveFile "${NSISDIR}\Plugins\System.dll"
ReserveFile "${NSISDIR}\Plugins\nsDialogs.dll"
ReserveFile confinstall\server_1.xml
ReserveFile confinstall\server_2.xml
+ ReserveFile confinstall\server_3.xml
ReserveFile confinstall\tomcat-users_1.xml
ReserveFile confinstall\tomcat-users_2.xml
@@ -210,11 +215,11 @@ Section "Core" SecTomcatCore
FileSeek $ServiceInstallLog 0 END
InstallRetry:
- FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR@" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
+ FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR@ $TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
FileWrite $ServiceInstallLog "$\r$\n"
ClearErrors
DetailPrint "Installing $TomcatServiceName service"
- nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR@" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
+ nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName" //IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR@ $TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
Pop $0
Pop $1
StrCmp $0 "0" InstallOk
@@ -326,9 +331,9 @@ Section -post
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --StdOutput auto --StdError auto'
${If} $TomcatShortcutAllUsers == "1"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@" '"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@$TomcatServiceName" '"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
${Else}
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@" '"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@$TomcatServiceName" '"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
${EndIf}
${If} $TomcatMenuEntriesEnable == "1"
@@ -337,11 +342,11 @@ Section -post
WriteUninstaller "$INSTDIR\Uninstall.exe"
- WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@" "InstallPath" $INSTDIR
- WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@" "Version" @VERSION@
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@" \
- "DisplayName" "Apache Tomcat @VERSION_MAJOR_MINOR@ (remove only)"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@" \
+ WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName" "InstallPath" $INSTDIR
+ WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName" "Version" @VERSION@
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" \
+ "DisplayName" "Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName (remove only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" \
"UninstallString" "$\"$INSTDIR\Uninstall.exe$\" -ServiceName=$TomcatServiceName"
SectionEnd
@@ -363,7 +368,8 @@ Function .onInit
;Initialize default values
StrCpy $JavaHome ""
- StrCpy $TomcatPort "8080"
+ StrCpy $TomcatPortHttp "8080"
+ StrCpy $TomcatPortAjp "8009"
StrCpy $TomcatMenuEntriesEnable "0"
StrCpy $TomcatShortcutAllUsers "0"
StrCpy $TomcatServiceName "Tomcat@VERSION_MAJOR@"
@@ -453,49 +459,75 @@ Function pageComponentsLeave
${EndIf}
FunctionEnd
+Function pageDirectoryLeave
+ ${DirState} "$INSTDIR" $0
+ ${If} $0 == 1 ;folder is full. (other values: 0: empty, -1: not found)
+ ;query selection
+ MessageBox MB_OKCANCEL|MB_ICONQUESTION "$(TEXT_INSTDIR_NOT_EMPTY)" /SD IDOK IDCANCEL notok
+ Goto ok
+ notok:
+ Abort
+ ok:
+ ${EndIf}
+FunctionEnd
+
Function pageConfiguration
!insertmacro MUI_HEADER_TEXT "$(TEXT_CONF_TITLE)" "$(TEXT_CONF_SUBTITLE)"
nsDialogs::Create 1018
Pop $R0
- ${NSD_CreateLabel} 0 5u 100u 15u "$(TEXT_CONF_LABEL_PORT)"
+ ${NSD_CreateLabel} 0 2 100u 14u "$(TEXT_CONF_LABEL_PORT_HTTP)"
+ Pop $R0
+
+ ${NSD_CreateText} 150u 0 50u 12u "$TomcatPortHttp"
+ Pop $CtlTomcatPortHttp
+ ${NSD_SetTextLimit} $CtlTomcatPortHttp 5
+
+ ${NSD_CreateLabel} 0 20u 100u 14u "$(TEXT_CONF_LABEL_PORT_AJP)"
+ Pop $R0
+
+ ${NSD_CreateText} 150u 18u 50u 12u "$TomcatPortAjp"
+ Pop $CtlTomcatPortAjp
+ ${NSD_SetTextLimit} $CtlTomcatPortAjp 5
+
+ ${NSD_CreateLabel} 0 41u 140u 14u "$(TEXT_CONF_LABEL_SERVICE_NAME)"
Pop $R0
- ${NSD_CreateText} 150u 5u 50u 13u "$TomcatPort"
- Pop $CtlTomcatPort
- ${NSD_SetTextLimit} $CtlTomcatPort 5
+ ${NSD_CreateText} 150u 39u 140u 12u "$TomcatServiceName"
+ Pop $CtlTomcatServiceName
${If} $TomcatMenuEntriesEnable == "1"
- ${NSD_CreateLabel} 0 30u 140u 15u "$(TEXT_CONF_LABEL_SHORTCUT_ALL_USERS)"
+ ${NSD_CreateLabel} 0 59u 100u 14u "$(TEXT_CONF_LABEL_SHORTCUT_ALL_USERS)"
Pop $R0
- ${NSD_CreateCheckBox} 150u 30u 10u 10u "$TomcatShortcutAllUsers"
+ ${NSD_CreateCheckBox} 150u 58u 10u 10u "$TomcatShortcutAllUsers"
Pop $CtlTomcatShortcutAllUsers
${EndIf}
${If} $TomcatAdminEnable == "1"
- ${NSD_CreateLabel} 0 55u 100% 15u "$(TEXT_CONF_LABEL_ADMIN)"
+ ${NSD_CreateLabel} 0 77u 140u 14u "$(TEXT_CONF_LABEL_ADMIN)"
Pop $R0
- ${NSD_CreateLabel} 10u 75u 140u 15u "$(TEXT_CONF_LABEL_ADMINUSERNAME)"
+ ${NSD_CreateLabel} 10u 92u 140u 14u "$(TEXT_CONF_LABEL_ADMINUSERNAME)"
Pop $R0
- ${NSD_CreateText} 150u 75u 110u 13u "$TomcatAdminUsername"
+ ${NSD_CreateText} 150u 90u 110u 12u "$TomcatAdminUsername"
Pop $CtlTomcatAdminUsername
- ${NSD_CreateLabel} 10u 95u 140u 15u "$(TEXT_CONF_LABEL_ADMINPASSWORD)"
+ ${NSD_CreateLabel} 10u 110u 140u 12u "$(TEXT_CONF_LABEL_ADMINPASSWORD)"
Pop $R0
- ${NSD_CreatePassword} 150u 95u 110u 13u "$TomcatAdminPassword"
+ ${NSD_CreatePassword} 150u 108u 110u 12u "$TomcatAdminPassword"
Pop $CtlTomcatAdminPassword
- ${NSD_CreateLabel} 10u 115u 140u 15u "$(TEXT_CONF_LABEL_ADMINROLES)"
+ ${NSD_CreateLabel} 10u 128u 140u 14u "$(TEXT_CONF_LABEL_ADMINROLES)"
Pop $R0
- ${NSD_CreateText} 150u 115u 110u 13u "$TomcatAdminRoles"
+ ${NSD_CreateText} 150u 126u 110u 12u "$TomcatAdminRoles"
Pop $CtlTomcatAdminRoles
${EndIf}
- ${NSD_SetFocus} $CtlTomcatPort
+ ${NSD_SetFocus} $CtlTomcatPortHttp
nsDialogs::Show
FunctionEnd
Function pageConfigurationLeave
- ${NSD_GetText} $CtlTomcatPort $TomcatPort
+ ${NSD_GetText} $CtlTomcatPortHttp $TomcatPortHttp
+ ${NSD_GetText} $CtlTomcatServiceName $TomcatServiceName
${If} $TomcatMenuEntriesEnable == "1"
${NSD_GetState} $CtlTomcatShortcutAllUsers $TomcatShortcutAllUsers
${EndIf}
@@ -650,9 +682,9 @@ DonePEHeader:
; The default varies depending on 32-bit or 64-bit
${If} "$INSTDIR" == ""
${If} $Arch == "x86"
- StrCpy $INSTDIR "$PROGRAMFILES32\Apache Software Foundation\Tomcat @VERSION_MAJOR_MINOR@"
+ StrCpy $INSTDIR "$PROGRAMFILES32\Apache Software Foundation\Tomcat @VERSION_MAJOR_MINOR@\$TomcatServiceName"
${Else}
- StrCpy $INSTDIR "$PROGRAMFILES64\Apache Software Foundation\Tomcat @VERSION_MAJOR_MINOR@"
+ StrCpy $INSTDIR "$PROGRAMFILES64\Apache Software Foundation\Tomcat @VERSION_MAJOR_MINOR@\$TomcatServiceName"
${EndIf}
${EndIf}
@@ -769,7 +801,8 @@ FunctionEnd
; Writes server.xml and tomcat-users.xml
;
Function configure
- StrCpy $R4 'port="$TomcatPort"'
+ StrCpy $R4 'port="$TomcatPortHttp"'
+ StrCpy $R6 'port="$TomcatPortAjp"'
StrCpy $R5 ''
${If} $TomcatAdminEnable == "1"
@@ -790,7 +823,7 @@ Function configure
DetailPrint 'Admin user added: "$TomcatAdminUsername"'
${EndIf}
- DetailPrint 'HTTP/1.1 Connector configured on port "$TomcatPort"'
+ DetailPrint 'HTTP/1.1 Connector configured on port "$TomcatPortHttp"'
; Extract these fragments to $PLUGINSDIR. That is a temporary directory,
; that is automatically deleted when the installer exits.
@@ -798,6 +831,7 @@ Function configure
SetOutPath $PLUGINSDIR
File confinstall\server_1.xml
File confinstall\server_2.xml
+ File confinstall\server_3.xml
File confinstall\tomcat-users_1.xml
File confinstall\tomcat-users_2.xml
@@ -811,6 +845,9 @@ Function configure
FileWrite $R9 $R4
Push "$PLUGINSDIR\server_2.xml"
Call copyFile
+ FileWrite $R9 $R6
+ Push "$PLUGINSDIR\server_3.xml"
+ Call copyFile
FileClose $R9
DetailPrint "server.xml written"
@@ -838,6 +875,7 @@ Function configure
Delete "$PLUGINSDIR\server_1.xml"
Delete "$PLUGINSDIR\server_2.xml"
+ Delete "$PLUGINSDIR\server_3.xml"
Delete "$PLUGINSDIR\tomcat-users_1.xml"
Delete "$PLUGINSDIR\tomcat-users_2.xml"
FunctionEnd
@@ -893,41 +931,41 @@ Function createShortcuts
SetShellVarContext all
${EndIf}
- SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
+ SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Tomcat Home Page.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat Home Page.lnk" \
"http://tomcat.apache.org/"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Welcome.lnk" \
- "http://127.0.0.1:$TomcatPort/"
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Welcome.lnk" \
+ "http://127.0.0.1:$TomcatPortHttp/"
${If} ${SectionIsSelected} ${SecManager}
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Tomcat Manager.lnk" \
- "http://127.0.0.1:$TomcatPort/manager/html"
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat Manager.lnk" \
+ "http://127.0.0.1:$TomcatPortHttp/manager/html"
${EndIf}
${If} ${SectionIsSelected} ${SecHostManager}
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Tomcat Host Manager.lnk" \
- "http://127.0.0.1:$TomcatPort/host-manager/html"
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat Host Manager.lnk" \
+ "http://127.0.0.1:$TomcatPortHttp/host-manager/html"
${EndIf}
${If} ${SectionIsSelected} ${SecDocs}
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Tomcat Documentation.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat Documentation.lnk" \
"$INSTDIR\webapps\docs\index.html"
${EndIf}
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Uninstall Tomcat @VERSION_MAJOR_MINOR@.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Uninstall Tomcat @VERSION_MAJOR_MINOR@.lnk" \
"$INSTDIR\Uninstall.exe" "-ServiceName=$TomcatServiceName"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Tomcat @VERSION_MAJOR_MINOR@ Program Directory.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat @VERSION_MAJOR_MINOR@ Program Directory.lnk" \
"$INSTDIR"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Monitor Tomcat.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Monitor Tomcat.lnk" \
"$INSTDIR\bin\$TomcatServiceManagerFileName" \
'//MS//$TomcatServiceName' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Configure Tomcat.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Configure Tomcat.lnk" \
"$INSTDIR\bin\$TomcatServiceManagerFileName" \
'//ES//$TomcatServiceName' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
@@ -965,21 +1003,21 @@ Section Uninstall
; Don't know if 32-bit or 64-bit registry was used so, for now, remove both
SetRegView 32
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@"
- DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@"
- DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
+ DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@ $TomcatServiceName"
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@$TomcatServiceName"
SetRegView 64
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@"
- DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@"
- DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
+ DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName"
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@$TomcatServiceName"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@"
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@$TomcatServiceName"
; Don't know if short-cuts were created for all users, one user or not at all so, for now, remove both
SetShellVarContext all
- RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
+ RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
SetShellVarContext current
- RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
+ RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
Delete "$INSTDIR\tomcat.ico"
Delete "$INSTDIR\LICENSE"
@@ -999,7 +1037,7 @@ Section Uninstall
; if $INSTDIR was removed, skip these next ones
IfFileExists "$INSTDIR" 0 Removed
MessageBox MB_YESNO|MB_ICONQUESTION \
- "Remove all files in your Tomcat @VERSION_MAJOR_MINOR@ directory? (If you have anything \
+ "Remove all files in your Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName directory? (If you have anything \
you created that you want to keep, click No)" IDNO Removed
; these would be skipped if the user hits no
RMDir /r "$INSTDIR\webapps"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1139381&r1=1139380&r2=1139381&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 24 16:43:40 2011
@@ -227,11 +227,17 @@
<bug>33262</bug>: Install monitor to auto-start for current user only
rather than all users to be consistent with menu item creation. (markt)
</fix>
- <fix>
+ <add>
<bug>40510</bug>: Provide an option to install shortcuts for the current
user or all users. Also ensure registry is correctly cleaned on
uninstall for 64-bit platforms. (markt)
- </fix>
+ </add>
+ <add>
+ <bug>50949</bug>: Provide the ability to specify the AJP port and
+ service name when installing Tomcat using the Windows installer. This
+ permits multiple instances of the same Tomcat version to be installed
+ side-by-side. (markt)
+ </add>
<update>
Clean up shell and batch scripts (improve consistency,
clarify comments, add <code>configtest</code> command support for
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org