remm 02/02/18 01:01:05
Modified: . build.xml tomcat.nsi
Log:
- Add missing support for the new 'endorsed' directory in the various dist targets.
Revision Changes Path
1.62 +4 -0 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- build.xml 15 Feb 2002 17:50:43 -0000 1.61
+++ build.xml 18 Feb 2002 09:01:05 -0000 1.62
@@ -112,6 +112,7 @@
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/common"/>
<mkdir dir="${tomcat.dist}/common/classes"/>
+ <mkdir dir="${tomcat.dist}/common/endorsed"/>
<mkdir dir="${tomcat.dist}/common/lib"/>
<mkdir dir="${tomcat.dist}/conf"/>
<mkdir dir="${tomcat.dist}/logs"/>
@@ -147,6 +148,9 @@
</copy>
<copy todir="${tomcat.dist}/common/classes">
<fileset dir="${tomcat.build}/common/classes" />
+ </copy>
+ <copy todir="${tomcat.dist}/common/endorsed">
+ <fileset dir="${tomcat.build}/common/endorsed" />
</copy>
<copy todir="${tomcat.dist}/common/lib">
<fileset dir="${tomcat.build}/common/lib" />
1.30 +2 -2 jakarta-tomcat-4.0/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tomcat.nsi 7 Feb 2002 20:52:06 -0000 1.29
+++ tomcat.nsi 18 Feb 2002 09:01:05 -0000 1.30
@@ -1,6 +1,6 @@
; Tomcat 4 script for Nullsoft Installer
-; $Id: tomcat.nsi,v 1.29 2002/02/07 20:52:06 remm Exp $
+; $Id: tomcat.nsi,v 1.30 2002/02/18 09:01:05 remm Exp $
Name "apache-tomcat-4.1"
Caption "Apache Tomcat 4.1"
@@ -71,7 +71,7 @@
SetOutPath $INSTDIR\bin
File /oname=tomcat.exe bin\tomcat.exe
- ExecWait '"$INSTDIR\bin\tomcat.exe" -install "Apache Tomcat 4.1" "$2"
-Djava.class.path="$INSTDIR\bin\bootstrap.jar" -Dcatalina.home="$INSTDIR" -start
org.apache.catalina.startup.BootstrapService -params start -stop
org.apache.catalina.startup.BootstrapService -params stop -out
"$INSTDIR\logs\stdout.log" -err "$INSTDIR\logs\stderr.log"'
+ ExecWait '"$INSTDIR\bin\tomcat.exe" -install "Apache Tomcat 4.1" "$2"
-Djava.class.path="$INSTDIR\bin\bootstrap.jar" -Dcatalina.home="$INSTDIR"
-Djava.endorsed.dirs="$INSTDIR\common\endorsed" -start
org.apache.catalina.startup.BootstrapService -params start -stop
org.apache.catalina.startup.BootstrapService -params stop -out
"$INSTDIR\logs\stdout.log" -err "$INSTDIR\logs\stderr.log"'
ClearErrors
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
