[jboss-cvs] JBossAS SVN: r61936 - in trunk/testsuite: src/resources/web/sso and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-03-30 23:14:37 -0400 (Fri, 30 Mar 2007)
New Revision: 61936

Added:
   trunk/testsuite/src/resources/web/sso/clustered-application.xml
Modified:
   trunk/testsuite/imports/sections/web.xml
   trunk/testsuite/src/resources/web/sso/application.xml
Log:
Put proper content in web-sso.ear and web-sso-clustered.ear

Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml	2007-03-30 23:55:06 UTC (rev 61935)
+++ trunk/testsuite/imports/sections/web.xml	2007-03-31 03:14:37 UTC (rev 61936)
@@ -367,16 +367,15 @@
          <classes dir="${build.classes}">
            <include name="org/jboss/test/web/servlets/LogoutServlet.class"/>
            <include name="org/jboss/test/web/util/Util*"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
          </classes>
          <fileset dir="${build.resources}/web/sso/war">
            <include name="**/*.html"/>
            <include name="**/*.jsp"/>
          </fileset>
       </war>
-      <zip destfile="${build.lib}/web-sso.ear">
-         <zipfileset dir="${build.resources}/web/sso" prefix="META-INF">
-            <include name="application.xml"/>
-         </zipfileset>
+      <ear earfile="${build.lib}/web-sso.ear"
+      	   appxml="${build.resources}/web/sso/application.xml">
          <zipfileset dir="${build.resources}/web">
             <include name="users.properties"/>
             <include name="roles.properties"/>
@@ -385,13 +384,10 @@
             fullpath="sso-form-auth1.war"/>
          <zipfileset dir="${build.lib}" includes="sso-form-auth.war"
             fullpath="sso-form-auth2.war"/>
-         <zipfileset dir="${build.lib}" includes="sso-expire.war"/>
          <zipfileset dir="${build.lib}" includes="jbosstest-web-ejbs.jar"/>
-      </zip>
-      <zip destfile="${build.lib}/web-sso-clustered.ear">
-         <zipfileset dir="${build.resources}/web/sso-clustered" prefix="META-INF">
-            <include name="application.xml"/>
-         </zipfileset>
+      </ear>
+      <ear earfile="${build.lib}/web-sso-clustered.ear"
+   	       appxml="${build.resources}/web/sso/clustered-application.xml">
          <zipfileset dir="${build.resources}/web">
             <include name="users.properties"/>
             <include name="roles.properties"/>
@@ -406,7 +402,7 @@
         <zipfileset dir="${build.lib}" includes="sso-form-auth.war"
            fullpath="sso-form-auth5.war"/>
          <zipfileset dir="${build.lib}" includes="jbosstest-web-ejbs.jar"/>
-      </zip>
+      </ear>
 
       <war destfile="${build.lib}/custom-errors.war"
          webxml="${build.resources}/web/custom-errors/web.xml">

Modified: trunk/testsuite/src/resources/web/sso/application.xml
===================================================================
--- trunk/testsuite/src/resources/web/sso/application.xml	2007-03-30 23:55:06 UTC (rev 61935)
+++ trunk/testsuite/src/resources/web/sso/application.xml	2007-03-31 03:14:37 UTC (rev 61936)
@@ -19,12 +19,6 @@
       </web>
    </module>
    <module>
-      <web>
-         <web-uri>sso-expire.war</web-uri>
-         <context-root>/war3</context-root>
-      </web>
-   </module>
-   <module>
       <ejb>jbosstest-web-ejbs.jar</ejb>
    </module>
 </application>

Added: trunk/testsuite/src/resources/web/sso/clustered-application.xml
===================================================================
--- trunk/testsuite/src/resources/web/sso/clustered-application.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/web/sso/clustered-application.xml	2007-03-31 03:14:37 UTC (rev 61936)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>JBossTest Web Single SignOn Tests</display-name>
+
+   <module>
+      <web>
+         <web-uri>sso-form-auth1.war</web-uri>
+         <context-root>/war1</context-root>
+      </web>
+   </module>
+   <module>
+      <web>
+         <web-uri>sso-form-auth2.war</web-uri>
+         <context-root>/war2</context-root>
+      </web>
+   </module>
+   <module>
+      <web>
+         <web-uri>sso-expire.war</web-uri>
+         <context-root>/war3</context-root>
+      </web>
+   </module>
+   <module>
+      <web>
+         <web-uri>sso-form-auth4.war</web-uri>
+         <context-root>/war4</context-root>
+      </web>
+   </module>
+   <module>
+      <web>
+         <web-uri>sso-form-auth5.war</web-uri>
+         <context-root>/war5</context-root>
+      </web>
+   </module>
+   <module>
+      <ejb>jbosstest-web-ejbs.jar</ejb>
+   </module>
+</application>