remm 2003/09/29 03:27:40
Modified: . build.properties.default build.xml tomcat.nsi
Log:
- Set -Dsun.io.useCanonCaches=false for Windows. This decreases
startup performance significantly, but is needed for now (since Sun doesn't
seem to be willing to fix the bug in a timely fashion).
- Update after procrun move.
Revision Changes Path
1.109 +1 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- build.properties.default 23 Sep 2003 18:41:11 -0000 1.108
+++ build.properties.default 29 Sep 2003 10:27:40 -0000 1.109
@@ -73,9 +73,6 @@
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
commons-daemon.loc=jakarta-commons/daemon
commons-daemon.cvs.loc=jakarta-commons/daemon
-commons-daemon.procrun.home=${commons-daemon.lib}/bin
-commons-daemon.procrun.exe=${commons-daemon.procrun.home}/tomcat.exe
-commons-daemon.procrunw.exe=${commons-daemon.procrun.home}/tomcatw.exe
commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
1.161 +4 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- build.xml 28 Sep 2003 12:23:27 -0000 1.160
+++ build.xml 29 Sep 2003 10:27:40 -0000 1.161
@@ -1266,8 +1266,10 @@
<fileset dir="resources" />
</copy>
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
- <copy file="${commons-daemon.procrun.exe}"
tofile="${tomcat.dist}/bin/tomcat.exe" />
- <copy file="${commons-daemon.procrunw.exe}"
tofile="${tomcat.dist}/bin/tomcatw.exe" />
+ <copy file="${jtc.home}/procrun/bin/tomcat.exe"
+ tofile="${tomcat.dist}/bin/tomcat.exe" />
+ <copy file="${jtc.home}/procrun/bin/tomcatw.exe"
+ tofile="${tomcat.dist}/bin/tomcatw.exe" />
<filter token="VERSION" value="${version}"/>
<copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true"/>
1.35 +3 -3 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tomcat.nsi 16 Jun 2003 21:15:40 -0000 1.34
+++ tomcat.nsi 29 Sep 2003 10:27:40 -0000 1.35
@@ -130,7 +130,7 @@
Call configure
- ExecWait '"$INSTDIR\bin\tomcatw.exe" //IS//Tomcat5 --DisplayName "Apache Tomcat"
--Description "Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/";
--Install "$INSTDIR\bin\tomcat.exe" --ImagePath "$INSTDIR\bin\bootstrap.jar"
--StartupClass org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions -Xrs
--Startup manual'
+ ExecWait '"$INSTDIR\bin\tomcatw.exe" //IS//Tomcat5 --Group Tomcat --DisplayName
"Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server -
http://jakarta.apache.org/tomcat/"; --Install "$INSTDIR\bin\tomcat.exe" --ImagePath
"$INSTDIR\bin\bootstrap.jar" --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions -Xrs
--Startup manual'
SectionEnd
@@ -222,7 +222,7 @@
Section -post
- ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --JavaOptions
-Dcatalina.home="\"$INSTDIR\""#-Djava.endorsed.dirs="\"$INSTDIR\common\endorsed\""#-Xrs
--StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log"
--WorkingPath "$INSTDIR"'
+ ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --JavaOptions
-Dcatalina.home="\"$INSTDIR\""#-Djava.endorsed.dirs="\"$INSTDIR\common\endorsed\""#-Dsun.io.useCanonCaches=false#-Xrs
--StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log"
--WorkingPath "$INSTDIR"'
WriteUninstaller "$INSTDIR\Uninstall.exe"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
