You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/04/04 17:12:15 UTC

cvs commit: jakarta-tomcat/src/examples/WEB-INF web.xml

craigmcc    00/04/04 08:12:15

  Modified:    src/examples/WEB-INF web.xml
  Log:
  Correct order of <security-constraint> and <login-config> elements
  per the DTD.
  PR:172
  Submitted by:	Larry.Isaacs@sas.com
  
  Revision  Changes    Path
  1.7       +9 -9      jakarta-tomcat/src/examples/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/web.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- web.xml	2000/04/03 22:23:40	1.6
  +++ web.xml	2000/04/04 15:12:15	1.7
  @@ -61,15 +61,6 @@
           </taglib-location>
       </taglib>
   
  -    <login-config>
  -      <auth-method>FORM</auth-method>
  -      <realm-name>examples</realm-name>
  -      <form-login-config>
  -        <form-login-page>/jsp/security/login/login.jsp</form-login-page>
  -        <form-error-page>/jsp/security/login/error.jsp</form-error-page>
  -      </form-login-config>
  -    </login-config>
  -
       <security-constraint>
         <web-resource-collection>
            <web-resource-name>a</web-resource-name>
  @@ -95,5 +86,14 @@
            <transport-guarantee>CONFIDENTIAL</transport-guarantee>
         </user-data-constraint -->
       </security-constraint>
  +
  +    <login-config>
  +      <auth-method>FORM</auth-method>
  +      <realm-name>examples</realm-name>
  +      <form-login-config>
  +        <form-login-page>/jsp/security/login/login.jsp</form-login-page>
  +        <form-error-page>/jsp/security/login/error.jsp</form-error-page>
  +      </form-login-config>
  +    </login-config>
   
   </web-app>