Author: markt
Date: Thu Nov 25 10:05:02 2010
New Revision: 1038975
URL: http://svn.apache.org/viewvc?rev=1038975&view=rev
Log:
Don't use pid file. It is not removed on service stop and prevents the next
service start.
https://issues.apache.org/jira/browse/DAEMON-188 has been raised for this issue.
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1038975&r1=1038974&r2=1038975&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Nov 25 10:05:02 2010
@@ -307,7 +307,7 @@ Section -post
FileWrite $ServiceInstallLog "$\r$\n"
FileWrite $ServiceInstallLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
FileWrite $ServiceInstallLog "$\r$\n"
- FileWrite $ServiceInstallLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --StdOutput auto --StdError auto --PidFile
tom...@[email protected]'
+ FileWrite $ServiceInstallLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --StdOutput auto --StdError auto'
FileWrite $ServiceInstallLog "$\r$\n"
FileClose $ServiceInstallLog
${EndIf}
@@ -315,7 +315,7 @@ Section -post
DetailPrint "Configuring tom...@version_major@ service"
nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --Classpath
"$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass
org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
--StartMode jvm --StopMode jvm'
nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
- nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --StdOutput auto --StdError auto --PidFile
tom...@[email protected]'
+ nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --StdOutput auto --StdError auto'
WriteUninstaller "$INSTDIR\Uninstall.exe"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
