From 05bd4d39f26b2dfce434ca1c89c82397a8d7ff82 Mon Sep 17 00:00:00 2001
From: mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 4 Aug 2010 08:26:18 +0000
Subject: [PATCH] Add default --PidFile (new with daemon 1.0.3)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@982157 13f79535-47bb-0310-9956-ffa450edef68
---
 res/tomcat.nsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 49bd25087..9a51494d2 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -322,7 +322,8 @@ SectionEnd
 
 Section -post
   nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@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\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@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" --StdOutput auto --StdError auto'
+  nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@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\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@VERSION_MAJOR@ --StdOutput auto --StdError auto --PidFile tomcat@VERSION_MAJOR@.pid'
 
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
-- 
2.11.0