[jboss-cvs] JBossAS SVN: r60214 - branches/Branch_4_2/testsuite/imports/sections.

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

Author: bstansberry at jboss.com
Date: 2007-02-02 16:18:23 -0500 (Fri, 02 Feb 2007)
New Revision: 60214

Modified:
   branches/Branch_4_2/testsuite/imports/sections/cluster.xml
Log:
Test both marker-interface-based and annotation-based FIELD repl

Modified: branches/Branch_4_2/testsuite/imports/sections/cluster.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/cluster.xml	2007-02-02 20:56:28 UTC (rev 60213)
+++ branches/Branch_4_2/testsuite/imports/sections/cluster.xml	2007-02-02 21:18:23 UTC (rev 60214)
@@ -171,16 +171,15 @@
       <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC"
          classpathref="jboss.aop.classpath"/>
 
-      <!-- fix build with jdk-1.5 -->
       <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
          <classpath refid="thirdparty.classpath"/>
          <classpath refid="jboss.tomcat.classpath"/>
          <classpath path="${build.classes}"/>
          <src path="${source.java}"/>
-         <include name="org/jboss/test/cluster/web/aop/Student.java"/>
-         <include name="org/jboss/test/cluster/web/aop/Person.java"/>
-         <include name="org/jboss/test/cluster/web/aop/Address.java"/>
-         <include name="org/jboss/test/cluster/web/aop/Course.java"/>
+         <include name="org/jboss/test/cluster/web/aop/deprec/Student.java"/>
+         <include name="org/jboss/test/cluster/web/aop/deprec/Person.java"/>
+         <include name="org/jboss/test/cluster/web/aop/deprec/Address.java"/>
+         <include name="org/jboss/test/cluster/web/aop/deprec/Course.java"/>
       </annotationc>
 
       <aopc compilerclasspathref="aop.task.classpath" verbose="true">
@@ -189,7 +188,9 @@
          <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"/>
+      	 <!-- aopc seems to pick up jboss-web-cluster.aop's file, 
+      	      from jboss.tomcat.classpath and fails if we add another -->
+         <!--aoppath path="${source.resources}/cluster/http/jboss-aop.xml"/-->
       </aopc>
       
 
@@ -215,6 +216,11 @@
             <include name="*.jsp"/>
             <include name="*.html"/>
          </fileset>
+
+        <fileset dir="${build.resources}/cluster/http/http-field/base">
+           <include name="*.jsp"/>
+           <include name="*.html"/>
+        </fileset>
       </war>
 
       <!-- build http-field.war -->
@@ -239,7 +245,41 @@
             <include name="*.jsp"/>
             <include name="*.html"/>
          </fileset>
+
+        <fileset dir="${build.resources}/cluster/http/http-field/base">
+           <include name="*.jsp"/>
+           <include name="*.html"/>
+        </fileset>
       </war>
+
+    <!-- build http-field-deprec.war -->
+    <copy
+       tofile="${build.resources}/cluster/http/http-field/WEB-INF/jboss-web.xml"
+       file="${build.resources}/cluster/http/http-field/jboss-web-field.xml"
+       overwrite="true"/>
+
+    <war warfile="${build.lib}/http-field-deprec.war"
+       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"/>
+       </webinf>
+       <classes dir="${build.classes}">
+          <include name="org/jboss/test/cluster/web/aop/deprec/*.class"/>
+          <include name="org/jboss/test/cluster/web/CacheHelper.class"/>
+          <include
+             name="org/jboss/test/cluster/web/BindingListener.class"/>
+       </classes>
+
+       <fileset dir="${build.resources}/cluster/http/http-field">
+          <include name="*.jsp"/>
+          <include name="*.html"/>
+       </fileset>
+
+        <fileset dir="${build.resources}/cluster/http/http-field/deprec">
+           <include name="*.jsp"/>
+           <include name="*.html"/>
+        </fileset>
+    </war>
     
     <!-- build http-cross-ctx-first.jar -->
     <war warfile="${build.lib}/http-cross-ctx-first.war"