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 rl...@apache.org on 2002/01/29 00:23:22 UTC

cvs commit: jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF web.xml

rlubke      02/01/28 15:23:21

  Modified:    src/server/jsp-tests/WEB-INF web.xml
  Log:
   - Support changes for new/modified tests
  
  Revision  Changes    Path
  1.5       +34 -36    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- web.xml	12 Dec 2001 13:11:47 -0000	1.4
  +++ web.xml	28 Jan 2002 23:23:21 -0000	1.5
  @@ -5,60 +5,58 @@
       "http://java.sun.com/dtd/web-app_2_3.dtd">
   
   <web-app>
  +    <context-param>
  +        <param-name>contextParam1</param-name>
  +        <param-value>bilbo</param-value>
  +    </context-param>
  +    <servlet>
  +        <servlet-name>CheckConfig</servlet-name>
  +        <display-name>CheckConfig</display-name>
  +        <jsp-file>/jsp/core_syntax/implicitobjects/checkConfig.jsp</jsp-file>
  +        <init-param>
  +            <param-name>configParam1</param-name>
  +            <param-value>hobbit</param-value>
  +        </init-param>
  +        <init-param>
  +            <param-name>configParam2</param-name>
  +            <param-value>gollum</param-value>
  +        </init-param>
  +        <load-on-startup>0</load-on-startup>
  +    </servlet>
  +    <servlet-mapping>
  +        <servlet-name>CheckConfig</servlet-name>
  +        <url-pattern>/CheckConfig</url-pattern>
  +    </servlet-mapping>
       <taglib>
  -        <taglib-uri>
  -	   http://java.apache.org/tomcat/examples-taglib
  -        </taglib-uri>
  -        <taglib-location>
  -           /WEB-INF/tlds/example-taglib.tld
  -        </taglib-location>
  +        <taglib-uri>http://java.apache.org/tomcat/examples-taglib</taglib-uri>
  +        <taglib-location>/WEB-INF/tlds/example-taglib.tld</taglib-location>
       </taglib>
   
       <taglib>
  -        <taglib-uri>
  -	   /TestLib.tld
  -        </taglib-uri>
  -        <taglib-location>
  -           /WEB-INF/tlds/TestLib.tld
  -        </taglib-location>
  +        <taglib-uri>/TestLib.tld</taglib-uri>
  +        <taglib-location>/WEB-INF/tlds/TestLib.tld</taglib-location>
       </taglib>
   
   <!-- These are only for testing if the Tld resource path is calculated properly
   -->
       <taglib>
  -        <taglib-uri>
  -	  http://java.apache.org/tlds/tld-absolute
  -        </taglib-uri>
  -        <taglib-location>
  -           /WEB-INF/tlds/tld_uri.tld
  -        </taglib-location>
  +        <taglib-uri>http://java.apache.org/tlds/tld-absolute</taglib-uri>
  +        <taglib-location>/WEB-INF/tlds/example-taglib.tld</taglib-location>
       </taglib>
   
       <taglib>
  -        <taglib-uri>
  -	  /tld_root_relative
  -        </taglib-uri>
  -        <taglib-location>
  -           /WEB-INF/tlds/tld_uri.tld
  -        </taglib-location>
  +        <taglib-uri>http://java.apache.org/tlds/tld-absolute-jar</taglib-uri>
  +        <taglib-location>/WEB-INF/lib/tld_resource.jar</taglib-location>
       </taglib>
   
       <taglib>
  -        <taglib-uri>
  -	  tld_nonroot_relative
  -        </taglib-uri>
  -        <taglib-location>
  -           /WEB-INF/tlds/tld_uri.tld
  -        </taglib-location>
  +        <taglib-uri>/tld_relative</taglib-uri>
  +        <taglib-location>/WEB-INF/tlds/example-taglib.tld</taglib-location>
       </taglib>
   
       <taglib>
  -        <taglib-uri>
  -	  tld_jar
  -        </taglib-uri>
  -        <taglib-location>
  -           /WEB-INF/lib/tld_resource.jar
  -        </taglib-location>
  +        <taglib-uri>/tld_jar</taglib-uri>
  +        <taglib-location>/WEB-INF/lib/tld_resource.jar</taglib-location>
       </taglib>
   
   </web-app>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>