tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp test.jsp
Date Wed, 07 Feb 2001 06:42:48 GMT
costin      01/02/06 22:42:48

  Modified:    src/admin/WEB-INF/classes/tadm TomcatAdmin.java
               src/admin/test sanity-form.jsp test.jsp
  Log:
  Fix the test.jsp to allow multiple checks per request.
  
  Revision  Changes    Path
  1.9       +8 -5      jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java
  
  Index: TomcatAdmin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TomcatAdmin.java	2001/02/03 07:48:28	1.8
  +++ TomcatAdmin.java	2001/02/07 06:42:48	1.9
  @@ -24,7 +24,7 @@
       String action;
       String host;
       String value;
  -    PageContext pageContext;
  +    //    PageContext pageContext;
       
       public TomcatAdmin() {}
   
  @@ -70,9 +70,9 @@
   	return EVAL_PAGE;
       }
       
  -    public void setPageContext(PageContext pctx ) {
  -	this.pageContext=pctx;
  -    }
  +//     public void setPageContext(PageContext pctx ) {
  +// 	this.pageContext=pctx;
  +//     }
   
       public void setParent( Tag parent ) {
   	super.setParent( parent);
  @@ -84,7 +84,10 @@
       private void init(HttpServletRequest request) {
   	Request realRequest = (Request)
   	    request.getAttribute( Request.ATTRIB_REAL_REQUEST);
  -	cm = realRequest.getContext().getContextManager();
  +	if( cm==null )
  +	    pageContext.getServletContext().log("Untrusted Application");
  +	else
  +	    cm = realRequest.getContext().getContextManager();
       }
   
       public ContextManager getContextManager(HttpServletRequest request ) {
  
  
  
  1.2       +1 -0      jakarta-tomcat/src/admin/test/sanity-form.jsp
  
  Index: sanity-form.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/sanity-form.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sanity-form.jsp	2001/01/29 06:46:19	1.1
  +++ sanity-form.jsp	2001/02/07 06:42:48	1.2
  @@ -2,6 +2,7 @@
   Target:
   <select name="target" > 
     <option>file</option>
  +  <option>params</option>
     <option>dispatch</option>
     <option>get</option>
     <option>requestMap</option>
  
  
  
  1.11      +3 -3      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- test.jsp	2001/02/01 04:43:48	1.10
  +++ test.jsp	2001/02/07 06:42:48	1.11
  @@ -63,7 +63,7 @@
   <font color='red'> FAIL </font></a> ( <%= failures.getDescription()
%> )
       <%= failures.getHttpClient().getRequestLine() %>
   <br>
  -TEST: <%= failures.getMatcher().getTestDescription() %>
  +TEST: <%= failures.getMatchDescription() %>
   <br>
   <b>Request: </b>
   <pre>
  @@ -74,7 +74,7 @@
   <br>
   <b>Message: </b>
   <pre>
  -  <%= failures.getMatcher().getMessage() %>
  +  <%= failures.getFailureMessage() %>
   </pre>
   
   <% // use a tag %>
  @@ -106,7 +106,7 @@
   OK</a> ( <%= success.getDescription() %> ) 
       <%= success.getHttpClient().getRequestLine() %>
   <br>
  -TEST: <%= success.getMatcher().getTestDescription() %>
  +TEST: <%= success.getMatchDescription() %>
   <br>
   </adm:iterate>
   </body>
  
  
  

Mime
View raw message