You are viewing a plain text version of this content. The canonical link for it is here.
Posted to watchdog-dev@jakarta.apache.org by ar...@locus.apache.org on 2000/02/18 23:43:48 UTC
cvs commit: jakarta-watchdog/src/conf jsp.xml
arun 00/02/18 14:43:48
Modified: . build.xml
src/conf jsp.xml
Log:
Transitioning to non-moo framework.
- made changes so that watchdog tests can be launched from tomcat.
Revision Changes Path
1.26 +22 -5 jakarta-watchdog/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 2000/02/18 03:00:03 1.25
+++ build.xml 2000/02/18 22:43:47 1.26
@@ -36,6 +36,7 @@
dest="${tomcat.home}/lib/moo.jar" />
<copyfile src="${watchdog.dist}/lib/client.jar"
dest="${tomcat.home}/lib/client.jar" />
+
</target>
<target name="prepare">
@@ -44,7 +45,8 @@
<mkdir dir="${watchdog.build}/clients"/>
<mkdir dir="${watchdog.build}/conf" />
<mkdir dir="${watchdog.build}/lib" />
-
+ <mkdir dir="${watchdog.build}/lib/jsp-golden"/>
+
<mkdir dir="${watchdog.build}/webapps/servlet-tests/WEB-INF/classes"/>
<mkdir dir="${watchdog.build}/webapps/servlet-tests/WEB-INF/lib"/>
<mkdir dir="${watchdog.build}/webapps/jsp-tests/WEB-INF/lib"/>
@@ -57,8 +59,8 @@
<copyfile src="../jakarta-ant/lib/xml.jar"
dest="${watchdog.build}/lib/xml.jar"/>
- <mkdir dir="${watchdog.dist}/lib/jsp-golden"/>
- <copydir src="src/clients/org/apache/jcheck/jsp/client" dest="${watchdog.dist}/lib/jsp-golden"/>
+ <copydir src="src/clients/org/apache/jcheck/jsp/client"
+ dest="${watchdog.build}/lib/jsp-golden"/>
<copydir src="src/bin" dest="${watchdog.build}"/>
<copydir src="src/conf" dest="${watchdog.build}/conf" />
@@ -97,6 +99,17 @@
<javac srcdir="src/clients" destdir="${watchdog.build}/clients"
classpath="${watchdog-classpath}"
deprecation="off" />
+
+ <jar jarfile="${watchdog.build}/lib/client.jar"
+ basedir="${watchdog.build}/clients"
+ items="org" />
+
+ <copydir src="${watchdog.build}/webapps/servlet-tests"
+ dest="${tomcat.build}/webapps/servlet-tests" />
+ <copydir src="${watchdog.build}/webapps/jsp-tests"
+ dest="${tomcat.build}/webapps/jsp-tests" />
+
+
</target>
<target name="dist" depends="main">
@@ -108,12 +121,16 @@
<mkdir dir="${watchdog.dist}/conf" />
<mkdir dir="${watchdog.dist}/lib" />
<mkdir dir="${watchdog.dist}/webapps" />
-
+ <mkdir dir="${watchdog.dist}/lib/jsp-golden"/>
+
<copyfile src="../jakarta-tools/moo.jar"
dest="${watchdog.dist}/lib/moo.jar"/>
<copyfile src="../jakarta-ant/lib/xml.jar"
dest="${watchdog.dist}/lib/xml.jar"/>
+
+ <copydir src="src/clients/org/apache/jcheck/jsp/client"
+ dest="${watchdog.dist}/lib/jsp-golden"/>
<copydir src="src/bin" dest="${watchdog.dist}"/>
<copydir src="src/conf" dest="${watchdog.dist}/conf" />
@@ -133,7 +150,7 @@
<jar jarfile="${watchdog.dist}/webapps/jsp-tests.war"
basedir="${watchdog.build}/webapps/jsp-tests"
- items="WEB-INF,jsp,golden-files" />
+ items="WEB-INF,jsp" />
<!-- build EAR -->
1.2 +0 -5 jakarta-watchdog/src/conf/jsp.xml
Index: jsp.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog/src/conf/jsp.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jsp.xml 2000/02/18 02:36:02 1.1
+++ jsp.xml 2000/02/18 22:43:47 1.2
@@ -100,11 +100,6 @@
<gtest request="GET /jsp-tests/jsp/core_syntax/beantests/useBean/negativeNoBody.jsp HTTP/1.0"
returnCode="HTTP/1.0 500"
/>
- <!-- org.apache.jcheck.jsp.client.core_syntax.beantests.setProperty.negativePropSyntax
- =core_syntax/beantests/setProperty/negativePropSyntax -->
- <gtest request="GET /jsp-tests/jsp/core_syntax/beantests/setProperty/negativePropSyntax HTTP/1.0"
- returnCode="HTTP/1.0 500"
- />
<!-- org.apache.jcheck.jsp.client.core_syntax.beantests.setProperty.positiveSetPropParam
=core_syntax/beantests/setProperty/positiveSetPropParam.jsp -->
<gtest request="GET /jsp-tests/jsp/core_syntax/beantests/setProperty/positiveSetPropParam.jsp?Name=MANGO HTTP/1.0"