moved remember-me element into form-login-config since persistent login functionality...

diff --git a/conf/share/securityfilter-config_2_0.dtd b/conf/share/securityfilter-config_2_0.dtd
index c43ea07..163c2a7 100644 (file)
--- a/conf/share/securityfilter-config_2_0.dtd
+++ b/conf/share/securityfilter-config_2_0.dtd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-$Header: /cvsroot/securityfilter/securityfilter/conf/share/securityfilter-config_2_0.dtd,v 1.1 2003/11/25 08:54:35 maxcooper Exp $
-$Revision: 1.1 $
-$Date: 2003/11/25 08:54:35 $
+$Header: /cvsroot/securityfilter/securityfilter/conf/share/securityfilter-config_2_0.dtd,v 1.2 2004/01/26 09:58:58 maxcooper Exp $
+$Revision: 1.2 $
+$Date: 2004/01/26 09:58:58 $
 -->
 
 <!--
@@ -65,7 +65,7 @@ $Date: 2003/11/25 08:54:35 $
 <!--Root element for securityfilter config-->
 <!ELEMENT securityfilter-config (security-constraint*, login-config, security-role*, realm+)>
 <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-<!ELEMENT login-config (auth-method?, realm-name?, form-login-config?, remember-me?)>
+<!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
 <!ELEMENT security-role (description, role-name)>
 <!ELEMENT realm (realm-param*)>
 <!ATTLIST realm
@@ -77,11 +77,7 @@ $Date: 2003/11/25 08:54:35 $
 <!ELEMENT user-data-constraint (description, transport-guarantee)>
 <!ELEMENT auth-method (#PCDATA)>
 <!ELEMENT realm-name (#PCDATA)>
-<!ELEMENT form-login-config (form-login-page, form-error-page, form-default-page, form-logout-page?)>
-<!ELEMENT remember-me (remember-me-param*)>
-<!ATTLIST remember-me
-       className CDATA #REQUIRED
->
+<!ELEMENT form-login-config (form-login-page, form-error-page, form-default-page, form-logout-page?, remember-me?)>
 <!ELEMENT realm-param EMPTY>
 <!ATTLIST realm-param
        name CDATA #REQUIRED
@@ -95,6 +91,10 @@ $Date: 2003/11/25 08:54:35 $
 <!ELEMENT form-error-page (#PCDATA)>
 <!ELEMENT form-default-page (#PCDATA)>
 <!ELEMENT form-logout-page (#PCDATA)>
+<!ELEMENT remember-me (remember-me-param*)>
+<!ATTLIST remember-me
+       className CDATA #REQUIRED
+>
 <!ELEMENT remember-me-param EMPTY>
 <!ATTLIST remember-me-param
        name CDATA #REQUIRED

diff --git a/conf/share/securityfilter-config_2_0.xsd b/conf/share/securityfilter-config_2_0.xsd
index 2215d00..95edbce 100644 (file)
--- a/conf/share/securityfilter-config_2_0.xsd
+++ b/conf/share/securityfilter-config_2_0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Max Cooper (eBuilt, Inc.) -->
 <!-- edited with XML Spy v4.3 U (http://www.xmlspy.com) by arch (arch) -->
-<xs:schema targetNamespace="http://www.securityfilter.org/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.securityfilter.org/namespace" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema targetNamespace="http://www.securityfilter.org/namespace" xmlns="http://www.securityfilter.org/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
        <xs:element name="securityfilter-config">
                <xs:annotation>
                        <xs:documentation>Root element for securityfilter config</xs:documentation>
@@ -67,20 +67,20 @@
                                                                                <xs:element name="form-error-page" type="xs:string"/>
                                                                                <xs:element name="form-default-page" type="xs:string"/>
                                                                                <xs:element name="form-logout-page" type="xs:string" minOccurs="0"/>
-                                                                       </xs:sequence>
-                                                               </xs:complexType>
-                                                       </xs:element>
-                                                       <xs:element name="remember-me" minOccurs="0">
-                                                               <xs:complexType>
-                                                                       <xs:sequence>
-                                                                               <xs:element name="remember-me-param" minOccurs="0" maxOccurs="unbounded">
+                                                                               <xs:element name="remember-me" minOccurs="0">
                                                                                        <xs:complexType>
-                                                                                               <xs:attribute name="name" type="xs:string" use="required"/>
-                                                                                               <xs:attribute name="value" type="xs:string" use="required"/>
+                                                                                               <xs:sequence>
+                                                                                                       <xs:element name="remember-me-param" minOccurs="0" maxOccurs="unbounded">
+                                                                                                               <xs:complexType>
+                                                                                                                       <xs:attribute name="name" type="xs:string" use="required"/>
+                                                                                                                       <xs:attribute name="value" type="xs:string" use="required"/>
+                                                                                                               </xs:complexType>
+                                                                                                       </xs:element>
+                                                                                               </xs:sequence>
+                                                                                               <xs:attribute name="className" type="xs:string" use="required"/>
                                                                                        </xs:complexType>
                                                                                </xs:element>
                                                                        </xs:sequence>
-                                                                       <xs:attribute name="className" type="xs:string" use="required"/>
                                                                </xs:complexType>
                                                        </xs:element>
                                                </xs:sequence>