cvs commit: jakarta-tomcat/src/admin/WEB-INF/scripts watchdog-servlet.xml
larryi 01/07/17 06:36:50
Modified:src/admin/WEB-INF/scripts watchdog-servlet.xml
Log:
Update to use crimson.jar. Also, I only count 4 levels up to tomcat.home,
though it doesn't really matter since this property is likely to be set externally.
Revision ChangesPath
1.6 +2 -2 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml
Index: watchdog-servlet.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- watchdog-servlet.xml 2001/03/14 05:42:38 1.5
+++ watchdog-servlet.xml 2001/07/17 13:36:49 1.6
@@ -1,6 +1,6 @@
project name=Watchdog-moo default=main basedir=.
- property name=tomcat.home value=../../../../../
+ property name=tomcat.home value=../../../../
property name=ant-file
value=${tomcat.home}/webapps/servlet-tests/WEB-INF/servlet-moo.xml/
property name=stests.home
@@ -20,7 +20,7 @@
pathelement
path=${tomcat.home}/lib/container/jaxp.jar /
pathelement
- path=${tomcat.home}/lib/container/parser.jar /
+ path=${tomcat.home}/lib/container/crimson.jar /
/classpath
arg value=-f /
arg value=${stests.home}/WEB-INF/servlet-moo.xml /
cvs commit: jakarta-tomcat/src/admin/WEB-INF/scripts watchdog-servlet.xml
larryi 01/03/13 21:42:39
Modified:src/admin/WEB-INF/scripts watchdog-servlet.xml
Log:
Remove moo.jar and client.jar. The classes from these jars are now
included under WEB-INF/classes for the servlet-tests web application.
Revision ChangesPath
1.5 +0 -4 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml
Index: watchdog-servlet.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- watchdog-servlet.xml 2001/03/10 18:27:16 1.4
+++ watchdog-servlet.xml 2001/03/14 05:42:38 1.5
@@ -16,10 +16,6 @@
pathelement
path="../lib/ant.jar" /
pathelement
- path="${stests.home}/WEB-INF/lib/moo.jar" /
- pathelement
- path="${stests.home}/WEB-INF/lib/client.jar" /
- pathelement
path="${stests.home}/WEB-INF/classes" /
pathelement
path="${tomcat.home}/lib/container/jaxp.jar" /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/WEB-INF/scripts watchdog-servlet.xml
costin 01/03/10 10:27:17
Modified:.build.xml
src/admin/WEB-INF/scripts watchdog-servlet.xml
Log:
Ok, the ugly is in.
Set "work.dir" to ".." if you want to use the previous layout
( with build in a separate dir and clean sources )
Also few changes ( you'll hate me for, but since you'll have to
change the build :-):
- Uniform naming ( ant.home, jsse.home, jaxp.home, etc - for all
binaries distribution we depend on )
- tomcat.home should be the dir where tomcat is installed,
use tomcat.dist and tomcat.build for the build ( a "install" target
may be added to install )
- convenience - "install.dir" points to a dir where you may download and
install various packages ( /usr/share, Program Files - I use
/opt/java )
- JSSE change - we no longer require JSSE to be included in CLASSPATH
to build, but just use the jsse.home
- Print "DETECTED" messages - so we know what we build
- No longer depend on watchdog - the web-based tester will just
include the files from servlet-tests/WEB-INF/classes in the
( separate ) class loader used to run ant ( for testing).
Revision ChangesPath
1.121 +59 -29jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- build.xml 2001/03/10 07:18:50 1.120
+++ build.xml 2001/03/10 18:27:16 1.121
@@ -4,34 +4,65 @@
!-- Compilation properties --
property name="optimize" value="false"/
- property name="debug" value="off"/
+ property name="debug" value="on"/
!-- Directories --
+ !-- work.dir is the place where build places the work
+ files created in the build process, including the
+ build/ and dist/ dirs.
+ Set it to ".." ( -D work.dir=.. ) to get the
+ previous behavior.
+--
+ property name="work.dir" value="." /
+
+ property name="tomcat.build" value="${work.dir}/build/tomcat"/
+ property name="tomcat.dist" value="${work.dir}/dist/tomcat"/
- property name="tomcat.build" value="../build/tomcat"/
- property name="tomcat.home" value="../dist/tomcat"/
- property name="tomcat.dist" value="${tomcat.home}"/
+ !-- Location where various binaries are installed.
+ It can be "c:\Program Files" or /usr/share/java or
+ /opt/java. The default is .. ( assuming jakarta-tomcat
+ is installed in the same directory ).
+
+ Note that this assumes binary packages ( i.e. dists )
+ --
+ property name="install.dir" value=".." /
!-- External packages we depend on --
- !-- Tomcat depends on Ant, Watchdog, Jaxp.
- You need to have the binaries ( in dist/ format )
- available and set xxx.home to the install directory
+ !-- Tomcat depends on:
+ - Ant ( latest binary install in jakarta-ant-1.3 )
+ - Jaxp ( optional, the jar files from ant can be used instead )
+ - Jsse ( optional )
--
- property name="ant.home" value="../jakarta-ant"/
- property name="watchdog.home" value="../build/watchdog"/
- property name="jaxp" value="../jaxp1.0.1"/
- property name="jaxp.home" value="${jaxp}"/
+ !-- set by default if "ant" command is used --
+ property name="ant.home" value="${install.dir}/jakarta-ant-1.3"/
+ property name="jsse.home" value="${install.dir}/jsse1.0.2"/
+ property name="jaxp.home" value="${install.dir}/jaxp1.0.1"/
+ !-- Binaries checked in ( servlet.jar is not likely to change,
+ the 2.2 spec is final --
property name="servlet22.jar" value="bin/servlet22.jar"/
- property name="servlet.jar" value="${servlet22.jar}"/
-
!-- Initialization - guessing config == --
- target name="init"
-available property="jsse.present" classname="javax.net.ssl.SSLServerSocket"/
-available property="jdk12.present" classname="java.security.PrivilegedAction"/
+ target name="detect"
+available property="jsse.present.runtime"
+classname="javax.net.ssl.SSLServerSocket"/
+available property="jsse.present"
+file="${jsse.home}/lib/jsse.jar"/
+available property="jdk12.present"
+classname="java.security.PrivilegedAction"/
+ /target
+
+ target name="msg.jdk12" if="jdk12.present"
+echo message="Detected JDK1.2" /
+ /target
+
+ target name="msg.jsse" if="jsse.present"
+echo message="Detected JSSE"/
+ /target
+
+ target name="init" depends="detect,msg.jdk12,msg.jsse"
/target
!-- Copy static files --
@@ -83,13 +114,13 @@
file="${jaxp.home}/parser.jar"/
copy tofile="${tomcat.build}/lib/container/jaxp.jar"
cvs commit: jakarta-tomcat/src/admin/WEB-INF/scripts watchdog-servlet.xml
larryi 01/03/05 09:32:21 Modified:src/admin/WEB-INF/scripts watchdog-servlet.xml Log: Update for Jaxp's new location. Revision ChangesPath 1.3 +2 -2 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml Index: watchdog-servlet.xml === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- watchdog-servlet.xml 2001/02/13 05:34:02 1.2 +++ watchdog-servlet.xml 2001/03/05 17:32:20 1.3 @@ -19,9 +19,9 @@ pathelement path="../lib/client.jar" / pathelement - path="../../../../lib/jaxp.jar" / + path="../../../../lib/container/jaxp.jar" / pathelement - path="../../../../lib/parser.jar" / + path="../../../../lib/container/parser.jar" / /classpath arg value="-f" / arg value="webapps/servlet-tests/WEB-INF/servlet-moo.xml" / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/WEB-INF/scripts watchdog-servlet.xml
costin 01/02/12 21:36:22 Modified:src/admin/WEB-INF/scripts watchdog-servlet.xml Log: Another small build fix - this time running watchdog's servlet tests was failing ( moo not included in classpath ) Revision ChangesPath 1.2 +4 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml Index: watchdog-servlet.xml === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- watchdog-servlet.xml 2001/01/22 16:42:09 1.1 +++ watchdog-servlet.xml 2001/02/13 05:34:02 1.2 @@ -15,6 +15,10 @@ pathelement path="../lib/ant.jar" / pathelement + path="../lib/moo.jar" / + pathelement + path="../lib/client.jar" / + pathelement path="../../../../lib/jaxp.jar" / pathelement path="../../../../lib/parser.jar" / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
