[Jboss-cvs] JBossAS SVN: r56522 - trunk/testsuite/src/resources/web/sso/war

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-09-02 00:19:23 -0400 (Sat, 02 Sep 2006)
New Revision: 56522

Modified:
   trunk/testsuite/src/resources/web/sso/war/web-form-auth-clustered.xml
   trunk/testsuite/src/resources/web/sso/war/web-form-auth.xml
   trunk/testsuite/src/resources/web/sso/war/web-sso-expire.xml
Log:
Conform to dtd

Modified: trunk/testsuite/src/resources/web/sso/war/web-form-auth-clustered.xml
===================================================================
--- trunk/testsuite/src/resources/web/sso/war/web-form-auth-clustered.xml	2006-09-02 04:18:16 UTC (rev 56521)
+++ trunk/testsuite/src/resources/web/sso/war/web-form-auth-clustered.xml	2006-09-02 04:19:23 UTC (rev 56522)
@@ -28,6 +28,10 @@
       <url-pattern>/EJBServlet</url-pattern>
    </servlet-mapping>
 
+   <session-config>
+      <session-timeout>1</session-timeout>
+   </session-config>
+
    <security-constraint>
       <web-resource-collection>
          <web-resource-name>Restricted</web-resource-name>
@@ -40,9 +44,17 @@
       </auth-constraint>
    </security-constraint>
 
-   <session-config>
-      <session-timeout>1</session-timeout>
-   </session-config>
+   <login-config>
+      <auth-method>FORM</auth-method>
+      <form-login-config>
+         <form-login-page>/login.html</form-login-page>
+         <form-error-page>/error.html</form-error-page>
+      </form-login-config>
+   </login-config>
+
+   <security-role>
+      <role-name>AuthorizedUser</role-name>
+   </security-role>
    
    <ejb-ref>
        <ejb-ref-name>ejb/OptimizedEJB</ejb-ref-name>
@@ -58,17 +70,5 @@
       <local>org.jboss.test.web.interfaces.StatelessSessionLocal</local>
       <ejb-link>jbosstest-web-ejbs.jar#SecuredEJB</ejb-link>
    </ejb-local-ref>
-
-   <login-config>
-      <auth-method>FORM</auth-method>
-      <form-login-config>
-         <form-login-page>/login.html</form-login-page>
-         <form-error-page>/error.html</form-error-page>
-      </form-login-config>
-   </login-config>
-
-   <security-role>
-      <role-name>AuthorizedUser</role-name>
-   </security-role>
 </web-app>
 

Modified: trunk/testsuite/src/resources/web/sso/war/web-form-auth.xml
===================================================================
--- trunk/testsuite/src/resources/web/sso/war/web-form-auth.xml	2006-09-02 04:18:16 UTC (rev 56521)
+++ trunk/testsuite/src/resources/web/sso/war/web-form-auth.xml	2006-09-02 04:19:23 UTC (rev 56522)
@@ -26,6 +26,10 @@
       <url-pattern>/EJBServlet</url-pattern>
    </servlet-mapping>
 
+   <session-config>
+      <session-timeout>1</session-timeout>
+   </session-config>
+
    <security-constraint>
       <web-resource-collection>
          <web-resource-name>Restricted</web-resource-name>
@@ -38,9 +42,17 @@
       </auth-constraint>
    </security-constraint>
 
-   <session-config>
-      <session-timeout>1</session-timeout>
-   </session-config>
+   <login-config>
+      <auth-method>FORM</auth-method>
+      <form-login-config>
+         <form-login-page>/login.html</form-login-page>
+         <form-error-page>/error.html</form-error-page>
+      </form-login-config>
+   </login-config>
+
+   <security-role>
+      <role-name>AuthorizedUser</role-name>
+   </security-role>
    
    <ejb-ref>
        <ejb-ref-name>ejb/OptimizedEJB</ejb-ref-name>
@@ -56,17 +68,5 @@
       <local>org.jboss.test.web.interfaces.StatelessSessionLocal</local>
       <ejb-link>jbosstest-web-ejbs.jar#SecuredEJB</ejb-link>
    </ejb-local-ref>
-
-   <login-config>
-      <auth-method>FORM</auth-method>
-      <form-login-config>
-         <form-login-page>/login.html</form-login-page>
-         <form-error-page>/error.html</form-error-page>
-      </form-login-config>
-   </login-config>
-
-   <security-role>
-      <role-name>AuthorizedUser</role-name>
-   </security-role>
 </web-app>
 

Modified: trunk/testsuite/src/resources/web/sso/war/web-sso-expire.xml
===================================================================
--- trunk/testsuite/src/resources/web/sso/war/web-sso-expire.xml	2006-09-02 04:18:16 UTC (rev 56521)
+++ trunk/testsuite/src/resources/web/sso/war/web-sso-expire.xml	2006-09-02 04:19:23 UTC (rev 56522)
@@ -16,6 +16,10 @@
       <url-pattern>/Logout</url-pattern>
    </servlet-mapping>
 
+   <session-config>
+      <session-timeout>1</session-timeout>
+   </session-config>
+
    <security-constraint>
       <web-resource-collection>
          <web-resource-name>Restricted</web-resource-name>
@@ -28,10 +32,6 @@
       </auth-constraint>
    </security-constraint>
 
-   <session-config>
-      <session-timeout>1</session-timeout>
-   </session-config>
-
    <login-config>
       <auth-method>FORM</auth-method>
       <form-login-config>