costin 01/01/31 20:43:48
Modified: src/admin/WEB-INF ant.tld web.xml
src/admin/WEB-INF/classes/tadm AntTag.java
src/admin/test test.jsp watchdog-jsp.jsp
watchdog-servlet.jsp
Log:
- removed unused attribute from <ant:ant>
- fixed the auth-constraing ( the role in admin-users.xml is tomcat_admin )
- update watchdog-servlet.jsp and watchdog-jsp.jsp to use <ant:ant>
( all 3 tests are working fine now - and passing. I found the problem with
watchdog jsp failures - it seems that one of the watchdog taglibs is
using a static variable that is initialized at compile time - so if
the .jsp is not re-compiled the test will fail. The only workaround is
to do a "rm -rf work/DEFAULT/jsp-test/jsp/tagext )
Revision Changes Path
1.2 +1 -9 jakarta-tomcat/src/admin/WEB-INF/ant.tld
Index: ant.tld
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/ant.tld,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.tld 2001/01/29 06:46:18 1.1
+++ ant.tld 2001/02/01 04:43:48 1.2
@@ -22,11 +22,8 @@
<info>Run ant</info>
<attribute>
<name>testFile</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>testApp</name>
<required>false</required>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>target</name>
@@ -35,11 +32,6 @@
</attribute>
<attribute>
<name>debug</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>outputType</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
1.7 +1 -1 jakarta-tomcat/src/admin/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/web.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- web.xml 2001/01/29 06:46:18 1.6
+++ web.xml 2001/02/01 04:43:48 1.7
@@ -24,7 +24,7 @@
<http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>admin</role-name>
+ <role-name>tomcat_admin</role-name>
</auth-constraint>
</security-constraint>
1.2 +3 -21 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTag.java
Index: AntTag.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AntTag.java 2001/01/29 06:46:18 1.1
+++ AntTag.java 2001/02/01 04:43:48 1.2
@@ -54,41 +54,23 @@
//-------------------- Properties --------------------
- String testFileName;
- String target;
- String testApp;
- String debug;
- String outputType="html";
-
/** Set the name of the test.xml, relative to the base dir.
* For example, /WEB-INF/test-tomcat.xml
*/
public void setTestFile( String s ) {
- testFileName=s;
+ args.put("ant.file", s);
}
/** Set the target - a subset of tests to be run
*/
public void setTarget( String s ) {
- // System.out.println("Setting target " + s );
- target=s;
+ addTarget(s);
}
- /** The application containing the test file
- * ( if not set assume the test file is local to /admin app.
- */
- public void setTestApp( String s ) {
- testApp=s;
- }
-
public void setDebug( String s ) {
- debug=s;
+ args.setProperty( "debug", s);
}
- public void setOutputType( String s ) {
- outputType=s;
- }
-
// -------------------- Implementation methods --------------------
private void runTest() throws JspException {
1.10 +1 -5 jakarta-tomcat/src/admin/test/test.jsp
Index: test.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- test.jsp 2001/01/29 06:46:19 1.9
+++ test.jsp 2001/02/01 04:43:48 1.10
@@ -28,17 +28,13 @@
<!-- trozo 1 -->
<ant:gtest />
-<ant:ant testFile="WEB-INF/test-tomcat.xml"
- testApp="/test" >
+<ant:ant>
<ant:target param="target" />
<ant:property name="ant.file"
location="/WEB-INF/test-tomcat.xml"
webApp="/test" />
<ant:property name="gdir"
- location="/Golden"
- webApp="/test" />
- <ant:property name="wgdir"
location="/Golden"
webApp="/test" />
<ant:property name="debug" param="debug" />
1.2 +20 -6 jakarta-tomcat/src/admin/test/watchdog-jsp.jsp
Index: watchdog-jsp.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-jsp.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- watchdog-jsp.jsp 2001/01/22 16:42:11 1.1
+++ watchdog-jsp.jsp 2001/02/01 04:43:48 1.2
@@ -2,20 +2,34 @@
<%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"
prefix="adm" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/ant-1.0"
+ prefix="ant" %>
This page will show the result of executing the sanity test suite.
You can see the context log <a href="/jsp-tests/context_log.txt">here</a>
+<ant:gtest />
+
<adm:admin ctxPath="/jsp-tests"
action="setLogger"
value="webapps/jsp-tests/context_log.txt" />
-
-<adm:gtest testFile="WEB-INF/jsp-gtest.xml"
- testApp="/jsp-tests"
- target='main'
- debug='<%= request.getParameter("debug") %>'
- outputType='html' />
+<pre>
+<ant:ant>
+ <ant:target name="main" />
+ <ant:property name="ant.file"
+ location="/WEB-INF/jsp-gtest.xml"
+ webApp="/jsp-tests" />
+ <ant:property name="wgdir"
+ location="/Golden"
+ webApp="/jsp-tests" />
+ <ant:property name="debug" param="debug" />
+ <ant:property name="outputType" value="html" />
+ <ant:property name="port" param="port" />
+ <ant:property name="http.protocol" param="server.proto" />
+ <ant:property name="host" param="host" />
+</ant:ant>
+</pre>
<% // Test completed, display the results ( outType=none means
// Gtest doesn't generate any output ( but we have to wait untill
1.2 +16 -3 jakarta-tomcat/src/admin/test/watchdog-servlet.jsp
Index: watchdog-servlet.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-servlet.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- watchdog-servlet.jsp 2001/01/22 16:42:11 1.1
+++ watchdog-servlet.jsp 2001/02/01 04:43:48 1.2
@@ -2,6 +2,8 @@
<%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"
prefix="adm" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/ant-1.0"
+ prefix="ant" %>
This page will show the result of executing the sanity test suite.
You can see the context log <a href="/servlet-tests/context_log.txt">here</a>
@@ -10,7 +12,18 @@
action="setLogger"
value="webapps/servlet-tests/context_log.txt" />
+<ant:gtest />
-<adm:gtest testFile="WEB-INF/scripts/watchdog-servlet.xml"
- testApp="/admin"
- target='main' />
+<pre>
+<ant:ant>
+ <ant:target name="main" />
+ <ant:property name="ant.file"
+ location="/WEB-INF/scripts/watchdog-servlet.xml"
+ webApp="/admin" />
+ <ant:property name="debug" param="debug" />
+ <ant:property name="outputType" value="html" />
+ <ant:property name="port" param="port" />
+ <ant:property name="http.protocol" param="server.proto" />
+ <ant:property name="host" param="host" />
+</ant:ant>
+</pre>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
