[jboss-cvs] JBossAS SVN: r65162 - trunk/testsuite/imports/sections.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 6 11:20:36 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-09-06 11:20:35 -0400 (Thu, 06 Sep 2007)
New Revision: 65162
Modified:
trunk/testsuite/imports/sections/cluster.xml
Log:
Use special-purpose wars for session passivation tests
Get rid of unused "jdk5" wars
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2007-09-06 15:20:29 UTC (rev 65161)
+++ trunk/testsuite/imports/sections/cluster.xml 2007-09-06 15:20:35 UTC (rev 65162)
@@ -148,6 +148,7 @@
webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
<webinf dir="${build.resources}/cluster/http/http-scoped/WEB-INF">
<include name="jboss-web.xml"/>
+ <include name="context.xml"/>
</webinf>
<classes dir="${build.classes}">
<include name="org/jboss/test/cluster/web/Person.class"/>
@@ -174,6 +175,7 @@
webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
<webinf dir="${build.resources}/cluster/http/http-scoped/WEB-INF">
<include name="jboss-web.xml"/>
+ <include name="context.xml"/>
</webinf>
<classes dir="${build.classes}">
<include name="org/jboss/test/cluster/web/Person.class"/>
@@ -296,6 +298,7 @@
webxml="${build.resources}/cluster/http/http-field/WEB-INF/web.xml">
<webinf dir="${build.resources}/cluster/http/http-field/WEB-INF">
<include name="jboss-web.xml"/>
+ <include name="context.xml"/>
</webinf>
<classes dir="${build.classes}">
<include name="org/jboss/test/cluster/web/aop/*.class"/>
@@ -337,58 +340,6 @@
<include name="*.html"/>
</fileset>
</war>
-
- <!-- build http-scoped-field-jdk5.war -->
- <copy
- tofile="${build.resources}/cluster/http/http-field-jdk5/WEB-INF/jboss-web.xml"
- file="${build.resources}/cluster/http/http-field-jdk5/jboss-web-field-scoped.xml"
- overwrite="true"/>
-
- <war warfile="${build.lib}/http-scoped-field-jdk5.war"
- webxml="${build.resources}/cluster/http/http-field-jdk5/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-field-jdk5/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/aop/jdk5/*.class"/>
- <include name="org/jboss/test/cluster/web/CacheHelper*"/>
- <include
- name="org/jboss/test/cluster/web/BindingListener.class"/>
- <include
- name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
- </classes>
-
- <fileset dir="${build.resources}/cluster/http/http-field-jdk5">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <!-- build http-field-jdk5.war -->
- <copy
- tofile="${build.resources}/cluster/http/http-field-jdk5/WEB-INF/jboss-web.xml"
- file="${build.resources}/cluster/http/http-field-jdk5/jboss-web-field.xml"
- overwrite="true"/>
-
- <war warfile="${build.lib}/http-field-jdk5.war"
- webxml="${build.resources}/cluster/http/http-field-jdk5/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-field-jdk5/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/aop/jdk5/*.class"/>
- <include name="org/jboss/test/cluster/web/CacheHelper*"/>
- <include
- name="org/jboss/test/cluster/web/BindingListener.class"/>
- <include
- name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
- </classes>
-
- <fileset dir="${build.resources}/cluster/http/http-field-jdk5">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
<!-- build http-cross-ctx-first.jar -->
<war warfile="${build.lib}/http-cross-ctx-first.war"
@@ -458,6 +409,68 @@
<include name="http-cross-ctx-third.war"/>
</fileset>
</ear>
+
+ <!-- Session passivation test wars -->
+
+ <war warfile="${build.lib}/http-session-pass.war"
+ webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/cluster/http/passivation/SESSION">
+ <include name="*"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/Person.class"/>
+ <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+ <include
+ name="org/jboss/test/cluster/web/BindingListener.class"/>
+ <include
+ name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
+ </classes>
+
+ <fileset dir="${build.resources}/cluster/http/http-scoped">
+ <include name="*.jsp"/>
+ <include name="*.html"/>
+ </fileset>
+ </war>
+
+ <war warfile="${build.lib}/http-attr-pass.war"
+ webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/cluster/http/passivation/ATTRIBUTE">
+ <include name="*"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/Person.class"/>
+ <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+ <include
+ name="org/jboss/test/cluster/web/BindingListener.class"/>
+ <include
+ name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
+ </classes>
+
+ <fileset dir="${build.resources}/cluster/http/http-scoped">
+ <include name="*.jsp"/>
+ <include name="*.html"/>
+ </fileset>
+ </war>
+
+ <war warfile="${build.lib}/http-field-pass.war"
+ webxml="${build.resources}/cluster/http/http-field/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/cluster/http/passivation/FIELD">
+ <include name="*"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/aop/*.class"/>
+ <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+ <include
+ name="org/jboss/test/cluster/web/BindingListener.class"/>
+ <include
+ name="org/jboss/test/cluster/web/DeserializationSensor.class"/>
+ </classes>
+
+ <fileset dir="${build.resources}/cluster/http/http-field">
+ <include name="*.jsp"/>
+ <include name="*.html"/>
+ </fileset>
+ </war>
<!-- Cache config file for standalone http tests -->
<copy
More information about the jboss-cvs-commits
mailing list