You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/01/27 00:00:00 UTC
cvs commit: jakarta-tomcat/src/shell test-tomcat.sh tomcat.sh env.tomcat
costin 00/01/26 15:00:00
Modified: . build.xml
src/etc test-tomcat.xml
src/share/org/apache/tomcat/task GTest.java
src/shell tomcat.sh
Added: src/shell test-tomcat.sh
Removed: src/shell env.tomcat
Log:
Fix to add the golden files and a test script to the
main tomcat build.
Revision Changes Path
1.22 +5 -1 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2000/01/26 20:12:29 1.21
+++ build.xml 2000/01/26 22:59:58 1.22
@@ -17,7 +17,10 @@
<copydir src="src/shell" dest="${tomcat.build}/bin" />
<copydir src="src/etc" dest="${tomcat.build}/conf"/>
<copydir src="src/doc" dest="${tomcat.build}/doc"/>
- <copydir src="src/share/javax" dest="${tomcat.home}/src/javax"/>
+ <copydir src="src/share/javax" dest="${tomcat.build}/src/javax"/>
+ <mkdir dir="${tomcat.build}/lib/test"/>
+ <mkdir dir="${tomcat.build}/lib/test/Golden"/>
+ <copydir src="src/tests/share/tests/jsp/Golden" dest="${tomcat.build}/lib/test/Golden"/>
<!-- include ant, it is used for testing and will be used for
configuration and few other tasks -->
@@ -35,6 +38,7 @@
<chmod perm="+x" src="${tomcat.build}/bin/ant"/>
<chmod perm="+x" src="${tomcat.build}/bin/startup.sh"/>
<chmod perm="+x" src="${tomcat.build}/bin/shutdown.sh"/>
+ <chmod perm="+x" src="${tomcat.build}/bin/test-tomcat.sh"/>
</target>
<!-- ==================== Build tomcat ==================== -->
1.2 +3 -4 jakarta-tomcat/src/etc/test-tomcat.xml
Index: test-tomcat.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/test-tomcat.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test-tomcat.xml 2000/01/26 20:12:29 1.1
+++ test-tomcat.xml 2000/01/26 22:59:59 1.2
@@ -1,12 +1,11 @@
-<project name="TestRun" default="main" basedir="." init="init">
+<project name="TestRun" default="main" init="init">
<target name="init">
<property name="host" value="localhost" />
<property name="port" value="8080" />
- <property name="gdir" value="jsp/Golden" />
+ <property name="gdir" value="${tomcat.home}/lib/test/Golden" />
- <taskdef name="test" class="tests.Test" />
- <taskdef name="gtest" class="tests.GTest" />
+ <taskdef name="gtest" class="org.apache.tomcat.task.GTest" />
</target>
<!-- ==================== File tests ==================== -->
1.2 +2 -1 jakarta-tomcat/src/share/org/apache/tomcat/task/GTest.java
Index: GTest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/GTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GTest.java 2000/01/26 20:12:30 1.1
+++ GTest.java 2000/01/26 22:59:59 1.2
@@ -277,7 +277,8 @@
StringBuffer expResult = new StringBuffer("NONE");
try {
- InputStream in = this.getClass().getResourceAsStream(goldenFile);
+ // InputStream in = this.getClass().getResourceAsStream(goldenFile);
+ InputStream in = new FileInputStream( goldenFile );
return readBody ( in );
} catch (Exception ex) {
System.out.println("\tGolden file not found: " + goldenFile);
1.8 +2 -1 jakarta-tomcat/src/shell/tomcat.sh
Index: tomcat.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tomcat.sh 2000/01/26 20:12:31 1.7
+++ tomcat.sh 2000/01/26 22:59:59 1.8
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: tomcat.sh,v 1.7 2000/01/26 20:12:31 costin Exp $
+# $Id: tomcat.sh,v 1.8 2000/01/26 22:59:59 costin Exp $
# Shell script to start and stop the server
@@ -124,6 +124,7 @@
echo " start - start tomcat in the background"
echo " run - start tomcat in the foreground"
echo " stop - stop tomcat"
+ echo " env - set CLASSPATH and TOMCAT_HOME env. variables"
exit 0
fi
1.1 jakarta-tomcat/src/shell/test-tomcat.sh
Index: test-tomcat.sh
===================================================================
#!/bin/sh
# set tomcat env
. bin/tomcat.sh env
ant -Dtomcat.home $TOMCAT_HOME -f conf/test-tomcat.xml client