[jboss-cvs] JBossAS SVN: r58591 - trunk/testsuite/imports/sections

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

Author: bstansberry at jboss.com
Date: 2006-11-18 06:47:49 -0500 (Sat, 18 Nov 2006)
New Revision: 58591

Modified:
   trunk/testsuite/imports/sections/cluster.xml
Log:
Use -beans.xml for configs
Include CacheHelper in all wars

Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml	2006-11-18 11:46:59 UTC (rev 58590)
+++ trunk/testsuite/imports/sections/cluster.xml	2006-11-18 11:47:49 UTC (rev 58591)
@@ -31,7 +31,7 @@
 
     <jar destfile="${build.lib}/partitionstatetransfer.sar">
        <metainf dir="${build.resources}/cluster/partition">
-          <include name="jboss-service.xml"/>
+          <include name="jboss-beans.xml"/>
        </metainf>
        <fileset dir="${build.classes}">
           <include name="org/jboss/test/cluster/partition/*"/>
@@ -47,7 +47,7 @@
          <classes dir="${build.classes}">
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
          </classes>
       </war>
 
@@ -61,6 +61,9 @@
          <fileset dir="${build.resources}/cluster/http/http-jk">
             <include name="*.jsp"/>
          </fileset>
+        <classes dir="${build.classes}">
+           <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+        </classes>
       </war>
 
       <!-- build http-scoped.jar -->
@@ -76,7 +79,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/Person.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -100,7 +103,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/Person.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -124,7 +127,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/Person.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -148,7 +151,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/Person.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -198,7 +201,7 @@
          <classpath refid="jboss.tomcat.classpath"/>
          <src path="${build.classes}"/>
          <include name="org/jboss/test/cluster/web/aop/**"/>
-         <aoppath path="${source.resources}/cluster/http/jboss-aop.xml"/>
+         <!--aoppath path="${source.resources}/cluster/http/pojocache-aop.xml"/-->
       </aopc>
       
       <!-- build http-scoped-field.war -->
@@ -214,7 +217,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/aop/*.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -238,7 +241,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/aop/*.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -262,7 +265,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/aop/jdk5/*.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -286,7 +289,7 @@
          </webinf>
          <classes dir="${build.classes}">
             <include name="org/jboss/test/cluster/web/aop/jdk5/*.class"/>
-            <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+            <include name="org/jboss/test/cluster/web/CacheHelper*"/>
             <include
                name="org/jboss/test/cluster/web/BindingListener.class"/>
          </classes>
@@ -306,7 +309,7 @@
        </webinf>
         <classes dir="${build.classes}">
            <include name="org/jboss/test/cluster/web/Person.class"/>
-           <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+           <include name="org/jboss/test/cluster/web/CacheHelper*"/>
            <include
               name="org/jboss/test/cluster/web/BindingListener.class"/>
         </classes>
@@ -324,7 +327,7 @@
        </webinf>
         <classes dir="${build.classes}">
            <include name="org/jboss/test/cluster/web/Person.class"/>
-           <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+           <include name="org/jboss/test/cluster/web/CacheHelper*"/>
            <include
               name="org/jboss/test/cluster/web/BindingListener.class"/>
         </classes>
@@ -342,7 +345,7 @@
        </webinf>
         <classes dir="${build.classes}">
            <include name="org/jboss/test/cluster/web/Person.class"/>
-           <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+           <include name="org/jboss/test/cluster/web/CacheHelper*"/>
            <include
               name="org/jboss/test/cluster/web/BindingListener.class"/>
         </classes>