[jboss-cvs] JBossAS SVN: r102871 - in trunk/testsuite: imports/config and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Mar 24 08:10:42 EDT 2010


Author: bstansberry at jboss.com
Date: 2010-03-24 08:10:40 -0400 (Wed, 24 Mar 2010)
New Revision: 102871

Removed:
   trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/BasicFieldGranularityClassloaderLeakTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NoReplicableWarFieldGranularityClassloaderLeakTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NonFieldGranularityReplicableClassloaderLeakTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/field/test/
   trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/
   trunk/testsuite/src/resources/cluster/classloader/leak/war/field/WEB-INF/
   trunk/testsuite/src/resources/cluster/classloader/leak/war/field/noreplicable/WEB-INF/
   trunk/testsuite/src/resources/cluster/http/http-field/
   trunk/testsuite/src/resources/cluster/http/passivation/FIELD/
Modified:
   trunk/testsuite/imports/config/tests-clustering.xml
   trunk/testsuite/imports/sections/cluster.xml
   trunk/testsuite/imports/server-config.xml
Log:
[JBAS-7560] Remove FIELD granularity web session replication

Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml	2010-03-24 11:01:23 UTC (rev 102870)
+++ trunk/testsuite/imports/config/tests-clustering.xml	2010-03-24 12:10:40 UTC (rev 102871)
@@ -10,9 +10,6 @@
   <!--
   |  Define the Pattern Sets Here
   --> 
-  <patternset id="apache_tomcat.cluster.includes">
-    <include name="org/jboss/test/cluster/apache_tomcat/*TestCase.class"/>
-  </patternset>
   <patternset id="cluster.defaultcfg.non.http.includes">
     <include name="org/jboss/test/cluster/defaultcfg/test/*TestCase.class"/>
     <include name="org/jboss/test/cluster/defaultcfg/ejb2/test/*TestCase.class"/>
@@ -24,9 +21,6 @@
     
     <include name="org/jboss/test/cluster/multicfg/test/*TestCase.class"/>
     <include name="org/jboss/test/cluster/multicfg/ejb2/test/*TestCase.class"/>
-    <!-- Exclude invalid JBC integration tests
-    <include name="org/jboss/test/cluster/defaultcfg/cache/test/*TestCase.class"/>
-    -->
   </patternset>
   <patternset id="cluster.defaultcfg.http.includes">
     <include name="org/jboss/test/cluster/defaultcfg/web/test/*TestCase.class"/>
@@ -34,10 +28,6 @@
     <!-- Problem tests -->
     <exclude name="org/jboss/test/cluster/multicfg/web/test/*ConcurrentTestCase.class"/>
   </patternset>
-  <patternset id="cluster.defaultcfg.http.field.includes">
-    <include name="org/jboss/test/cluster/defaultcfg/web/field/test/*TestCase.class"/>
-    <include name="org/jboss/test/cluster/multicfg/web/field/test/*TestCase.class"/>
-  </patternset>
   <patternset id="cluster.defaultcfg.http.jk.includes">
     <include name="org/jboss/test/cluster/defaultcfg/web/jk/test/*TestCase.class"/>
   </patternset>
@@ -50,9 +40,6 @@
     <!-- Problem tests -->
     <exclude name="org/jboss/test/cluster/multicfg/web/test/*ConcurrentTestCase.class"/>
   </patternset>
-  <patternset id="cluster.multicfg.http.field.includes">
-    <include name="org/jboss/test/cluster/multicfg/web/field/test/*TestCase.class"/>
-  </patternset>
   <patternset id="cluster.multicfg.http.jk.includes">
     <include name="org/jboss/test/cluster/multicfg/web/jk/test/*TestCase.class"/>
   </patternset>
@@ -78,30 +65,7 @@
   <!--
     | Targets
   -->
-
-   <target name="tests-apache-tomcat-clustering"
-      description="Execute clustering tests requiring an apache load balanced two TC nodes.">
-      <echo message="Will read config info from local.propeties file in testsuite dir"/>
-      <!-- Definition of apache is in imports/server-config.xml -->
-      <apache location="${apache.location}" action-type="start"/>
-      <create-cluster-node conf="node0"/>
-      <server:start name="node0" />
-      <create-cluster-node conf="node1"/>
-      <server:start name="node1"/>
-      <echo message="Nodes have started, waiting for cluster to stablize..."/>
-
-      <!-- Need a custom condition that queries for the node membership == 2 -->
-      <echo message="Going to call target tests-clustering-unit"/>
-
-      <antcall target="tests-clustering-unit" inheritRefs="true">
-         <param name="cluster.includes.refid" value="apache_tomcat.cluster.includes"/>
-         <param name="jboss-junit-configuration" value="Tomcat Clustering"/>
-      </antcall>
-      <server:stop name="node0"/>
-      <server:stop name="node1"/>
-      <apache location="${apache.location}" action-type="stop"/>
-   </target>
-
+	
   <!-- 
       Run the clustering tests with different JGroups stacks (UDP/TCP/TCP_NIO).
       The full set of tests are run with UDP; with the other stacks tests that 
@@ -139,7 +103,6 @@
      <param name="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
      <param name="cluster.non.http.includes" value="cluster.multicfg.non.http.includes"/>
      <param name="cluster.http.includes" value="cluster.multicfg.http.includes"/>
-     <param name="cluster.http.field.includes" value="cluster.multicfg.http.field.includes"/>
      <param name="cluster.http.jk.includes" value="cluster.multicfg.http.jk.includes"/>
    </antcall>
   
@@ -153,7 +116,6 @@
     <property name="jboss-junit-configuration" value="udp"/>
     <property name="cluster.non.http.includes" value="cluster.defaultcfg.non.http.includes"/>
     <property name="cluster.http.includes" value="cluster.defaultcfg.http.includes"/>
-    <property name="cluster.http.field.includes" value="cluster.defaultcfg.http.field.includes"/>
     <property name="cluster.http.jk.includes" value="cluster.defaultcfg.http.jk.includes"/>
 
     <antcall target="tests-clustering-configure" inheritRefs="true"/>
@@ -180,18 +142,6 @@
       <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
     </antcall>
 
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (ASYNC, no BR)"/>
-
-  	<antcall target="tests-clustering-unit" inheritRefs="true">
-      <param name="cluster.includes.refid" value="${cluster.http.field.includes}"/>
-      <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
-    	<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
-    </antcall>
-
-
     <server:stop name="cluster-${jboss-junit-configuration}-0"/>
     <server:stop name="cluster-${jboss-junit-configuration}-1"/>
 
@@ -220,17 +170,6 @@
       <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
     </antcall>
 
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (SYNC, no BR)"/>
-
-    <antcall target="tests-clustering-unit" inheritRefs="true">
-      <param name="cluster.includes.refid" value="${cluster.http.field.includes}"/>
-      <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.web.cache.config" value="sync-field-granularity-session-cache"/>
-      <param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
-    </antcall>
-
    <server:stop name="cluster-${jboss-junit-configuration}-SYNC-0"/>
    <server:stop name="cluster-${jboss-junit-configuration}-SYNC-1"/>
 
@@ -254,18 +193,6 @@
       <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-BR-1"/>
     </antcall>
 
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, BR)"/>
-
-    <antcall target="tests-clustering-unit" inheritRefs="true">
-      <param name="cluster.includes.refid" value="${cluster.http.field.includes}"/>
-      <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-field-granularity-session-cache"/>
-      <param name="jbosstest.cluster.web.cache.br" value="true"/>
-      <param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-BR-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-BR-1"/>
-    </antcall>
-
     <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
     <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
 
@@ -276,11 +203,6 @@
     <create-cluster-node conf="cluster-${jboss-junit-configuration}-1"/>
   </target>
 
-  <target name="tests-clustering-field-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-0"/>
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-1"/>
-  </target>
-
   <target name="tests-clustering-sync-configure" unless="${tests.clustering.skip.startup}">
     <create-cluster-node conf="cluster-${jboss-junit-configuration}-SYNC-0"/>
     <create-cluster-node conf="cluster-${jboss-junit-configuration}-SYNC-1"/>
@@ -290,15 +212,6 @@
     <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-1"/>
   </target>
 
-  <target name="tests-clustering-field-sync-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for JK"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
-  </target>
-
   <target name="tests-clustering-br-configure" unless="${tests.clustering.skip.startup}">
     <create-cluster-node conf="cluster-${jboss-junit-configuration}-BR-0"/>
     <create-cluster-node conf="cluster-${jboss-junit-configuration}-BR-1"/>
@@ -308,15 +221,6 @@
     <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-BR-1"/>
   </target>
 
-  <target name="tests-clustering-field-br-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-BR-0"/>
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-BR-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for JK"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-0"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-1"/>
-  </target> 
-
   <target name="tests-clustered-classloader-leak" depends="init">
 
 	 <mkdir dir="${build.reports}"/>
@@ -521,25 +425,8 @@
         <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
       </antcall>
       
-   </target>  
+   </target> 
 
-   <target name="one-cluster-test-nostart-field" if="test">
-
-      <property name="jboss-junit-configuration" value="udp"/>
-
-      <echo message="Going to call target tests-clustering-unit for ${test}"/>
-
-      <antcall target="tests-clustering-unit" inheritRefs="true">
-        <param name="cluster.includes.refid" value="one.test.includes"/>
-        <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-        <param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
-        <param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-        <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
-        <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
-      </antcall>
-      
-   </target>
-
    <target name="one-cluster-test" if="test" depends="init">
 
     <property name="jboss-junit-configuration" value="udp"/>
@@ -563,30 +450,6 @@
     <server:stop name="cluster-${jboss-junit-configuration}-1"/>
    </target>
 
-   <target name="one-cluster-test-field" if="test" depends="init">
-
-    <property name="jboss-junit-configuration" value="udp"/>
-
-    <antcall target="tests-clustering-field-configure" inheritRefs="true"/>
-
-    <server:start name="cluster-field-${jboss-junit-configuration}-0"/>
-    <server:start name="cluster-field-${jboss-junit-configuration}-1"/>
-
-    <echo message="Going to call target tests-clustering-unit for ${test}"/>
-
-    <antcall target="tests-clustering-unit" inheritRefs="true">
-      <param name="cluster.includes.refid" value="one.test.includes"/>
-      <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
-      <param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
-    </antcall>
-
-    <server:stop name="cluster-field-${jboss-junit-configuration}-0"/>
-    <server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
-   </target>
-
    <target name="one-cluster-test-br" if="test" depends="init">
 
     <property name="jboss-junit-configuration" value="udp"/>
@@ -611,31 +474,6 @@
     <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
    </target>
 
-   <target name="one-cluster-test-field-br" if="test" depends="init">
-
-    <property name="jboss-junit-configuration" value="udp"/>
-
-    <antcall target="tests-clustering-field-br-configure" inheritRefs="true"/>
-
-    <server:start name="cluster-field-${jboss-junit-configuration}-BR-0"/>
-    <server:start name="cluster-field-${jboss-junit-configuration}-BR-1"/>
-
-    <echo message="Going to call target tests-clustering-unit for ${test}"/>
-
-    <antcall target="tests-clustering-unit" inheritRefs="true">
-      <param name="cluster.includes.refid" value="one.test.includes"/>
-      <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-field-granularity-session-cache"/>
-      <param name="jbosstest.cluster.web.cache.br" value="true"/>
-      <param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-BR-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-BR-1"/>
-    </antcall>
-
-    <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
-    <server:stop name="cluster-field-${jboss-junit-configuration}-BR-1"/>
-   </target>
-
   <!-- Runs only the non-http tests -->
   <target name="tests-clustering-non-http" depends="init">
 
@@ -704,53 +542,4 @@
    <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
   </target>
 
-  <!-- Runs only the basic field tests (ASYNC, no BR) -->
-  <target name="tests-clustering-field" depends="init">
-
-   <property name="jboss-junit-configuration" value="udp"/>
-
-   <antcall target="tests-clustering-field-configure" inheritRefs="true"/>
-
-   <server:start name="cluster-field-${jboss-junit-configuration}-0"/>
-  	<server:start name="cluster-field-${jboss-junit-configuration}-1"/>
-
-  	<antcall target="tests-clustering-unit" inheritRefs="true">
-  	  <param name="cluster.includes.refid" value="cluster.defaultcfg.http.field.includes"/>
-  	  <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-     <param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
-     <param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-  	  <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
-  	  <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
-  	</antcall>
-
-  	<server:stop name="cluster-field-${jboss-junit-configuration}-0"/>
-  	<server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
-  	
-  </target>
-
-  <!-- Runs only the basic field tests (SYNC, with BR) -->
-  <target name="tests-clustering-field-br" depends="init">
-
-   <property name="jboss-junit-configuration" value="udp"/>
-
-   <antcall target="tests-clustering-field-br-configure" inheritRefs="true"/>
-
-   <server:start name="cluster-field-${jboss-junit-configuration}-BR-0"/>
-   <server:start name="cluster-field-${jboss-junit-configuration}-BR-1"/>
-
-   <antcall target="tests-clustering-unit" inheritRefs="true">
-     <param name="cluster.includes.refid" value="cluster.defaultcfg.http.field.includes"/>
-     <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
-     <param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-field-granularity-session-cache"/>
-     <param name="jbosstest.cluster.web.cache.br" value="true"/>
-     <param name="jbosstest.cluster.web.cache.pojo" value="true"/>
-     <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-BR-0"/>
-     <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-BR-1"/>
-   </antcall>
-
-   <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
-   <server:stop name="cluster-field-${jboss-junit-configuration}-BR-1"/>
-	   
-  </target>
-
 </project>

Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml	2010-03-24 11:01:23 UTC (rev 102870)
+++ trunk/testsuite/imports/sections/cluster.xml	2010-03-24 12:10:40 UTC (rev 102871)
@@ -290,100 +290,6 @@
             <include name="*.html"/>
          </fileset>
       </war>
-      
-      
-      <!-- pre-compile the aop classes. We are using 1.4 annotation so annoc and aopc are required -->
-      <taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
-         classpathref="org.jboss.aop.classpath"/>
-      <path id="aop.task.classpath">
-         <fileset refid="javassist:javassist:jar"/>
-         <fileset refid="qdox:qdox:jar"/>
-         <fileset refid="trove:trove:jar"/>
-         <path refid="org.jboss.aop.classpath"/>
-         <fileset refid="org.jboss:jboss-common-core:jar"/>
-         <fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
-         <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
-         <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
-         <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
-         <fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
-      </path>
-   	
-      <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC"
-         classpathref="org.jboss.aop.classpath"/>
-      <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
-         <classpath refid="thirdparty.classpath"/>
-         <classpath refid="org.jboss.jbossas.tomcat.classpath"/>
-         <classpath path="${build.classes}"/>
-         <src path="${source.java}"/>
-         <include name="org/jboss/test/cluster/web/aop/**"/>
-         <!--
-         <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"/>
-         -->
-      </annotationc>
-      
-      <aopc compilerclasspathref="aop.task.classpath" verbose="true">
-         <classpath refid="thirdparty.classpath"/>
-         <!--
-         <classpath refid="jboss.aspects.classpath"/>
-         -->
-         <classpath path="${build.classes}"/>
-         <classpath refid="org.jboss.jbossas.tomcat.classpath"/>
-         <src path="${build.classes}"/>
-         <include name="org/jboss/test/cluster/**/web/aop/*"/>
-         <!--aoppath The needed aop.xml file is picked up from the 
-                     jbossweb-cluster.aop jar via org.jboss.jbossas.tomcat.classpath -->
-      </aopc>
-      
-      <!-- build http-scoped-field.war -->
-      <copy
-         tofile="${build.resources}/cluster/http/http-field/WEB-INF/jboss-web.xml"
-         file="${build.resources}/cluster/http/http-field/jboss-web-field-scoped.xml"
-         overwrite="true"/>
-      
-      <war warfile="${build.lib}/http-scoped-field.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"/>
-            <include name="context.xml"/>
-         </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>
-      
-      <!-- build http-field.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.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/*.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>
     
     <!-- build http-cross-ctx-first.jar -->
     <war warfile="${build.lib}/http-cross-ctx-first.war"
@@ -485,26 +391,6 @@
             <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>
 
       <!-- Build clustered classloader leak test archives -->
          
@@ -539,27 +425,6 @@
             <include name="org/jboss/test/cluster/classloader/leak/web/*"/>
          </classes>
        </war>
-   	 <war destfile="${build.lib}/cluster-clleak-field.war"
-           webxml="${build.resources}/cluster/classloader/leak/war/field/WEB-INF/web.xml">
-         <webinf dir="${build.resources}/cluster/classloader/leak/war/field/WEB-INF">
-            <include name="jboss-web.xml"/>
-         </webinf>
-         <classes dir="${build.classes}">
-            <include name="org/jboss/test/classloader/leak/web/*"/>
-            <include name="org/jboss/test/classloader/leak/aop/*"/>
-            <include name="org/jboss/test/cluster/classloader/leak/web/*"/>
-         </classes>
-       </war>
-       <war destfile="${build.lib}/cluster-clleak-field-no-replicable.war"
-           webxml="${build.resources}/cluster/classloader/leak/war/field/noreplicable/WEB-INF/web.xml">
-         <webinf dir="${build.resources}/cluster/classloader/leak/war/field/WEB-INF">
-            <include name="jboss-web.xml"/>
-         </webinf>
-         <classes dir="${build.classes}">
-            <include name="org/jboss/test/classloader/leak/web/*"/>
-            <include name="org/jboss/test/cluster/classloader/leak/web/*"/>
-         </classes>
-       </war>
    	 <war destfile="${build.lib}/cluster-clleak-simple-ejb.war"
            webxml="${build.resources}/cluster/classloader/leak/war/ejb2/WEB-INF/web.xml">
          <classes dir="${build.classes}">
@@ -965,90 +830,5 @@
       </zip>  
    	
    </target>  
- 
-
-   <!-- cache JARs -->
-   <target name="_jars-cache">
-      <!-- Not much to do with jar, but ... -->
-      <mkdir dir="${build.resources}/META-INF"/>
-      <copy todir="${build.resources}/META-INF" filtering="no">
-         <fileset dir="${source.resources}/cluster/cache/META-INF">
-            <include name="*-service*.xml"/>
-         </fileset>
-      </copy>
-      
-      <!-- pre-compile the aop classes -->
-      <taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
-         classpathref="org.jboss.aop.classpath"/>
-      <path id="aop.task.classpath">
-         <path refid="org.jboss.aop.classpath"/>
-         <fileset refid="org.jboss:jboss-common-core:jar"/>
-         <fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
-         <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
-         <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
-         <fileset refid="javassist:javassist:jar"/>
-         <fileset refid="trove:trove:jar"/>
-      </path>
-      
-      <aopc compilerclasspathref="aop.task.classpath">
-         <classpath refid="thirdparty.classpath"/>
-         <classpath path="${build.classes}"/>
-         <src path="${build.classes}"/>
-         <include name="org/jboss/test/cluster/cache/aop/**"/>
-         <aoppath
-            path="${source.resources}/cluster/cache/standaloneAop/META-INF/jboss-aop.xml"/>
-      </aopc>
-      
-      <!-- build cachetest.jar -->
-      <jar destfile="${build.lib}/cachetest.jar"
-         manifest="${build.resources}/cluster/cache/manifest.mf">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/cluster/cache/bean/*.class"/>
-            <include name="org/jboss/test/cluster/cache/aop/*.class"/>
-         </fileset>
-         <metainf dir="${build.resources}/cluster/cache/META-INF/">
-            <include name="jboss.xml"/>
-            <include name="ejb-jar.xml"/>
-         </metainf>
-      </jar>
-      
-      <!-- build cachetest.sar -->
-      <!--
-      -->
-      <delete file="${build.resources}/cluster/cache/META-INF/jboss-service.xml"/>
-      <copy file="${build.resources}/cluster/cache/META-INF/tree-service.xml"
-         tofile="${build.resources}/cluster/cache/META-INF/jboss-service.xml"/>
-      
-      <jar destfile="${build.lib}/cachetest.sar">
-         <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
-         <fileset refid="jgroups:jgroups:jar"/>
-         <fileset dir="${build.resources}/cluster/cache">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-      
-      <!-- build cacheAoptest.sar -->
-      <delete file="${build.resources}/cluster/cache/META-INF/jboss-service.xml"/>
-      <copy file="${build.resources}/cluster/cache/META-INF/tree-aop-service.xml"
-         tofile="${build.resources}/cluster/cache/META-INF/jboss-service.xml"/>
-      
-      <jar destfile="${build.lib}/cacheAoptest.sar">
-         <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
-         <fileset refid="jgroups:jgroups:jar"/>
-         <fileset dir="${build.resources}/cluster/cache">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-      
-      <!-- build cachetest.aop -->
-      <!--
-      <jar destfile="${build.lib}/cachetest.aop">
-      <fileset dir="${build.classes}">
-      <include name="org/jboss/test/cache/bean/aop/*.class"/>
-      </fileset>
-      <metainf dir="${build.resources}/cache/aop/META-INF/"/>
-      </jar>
-      -->
-      
-   </target>  
+	
 </project>

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2010-03-24 11:01:23 UTC (rev 102870)
+++ trunk/testsuite/imports/server-config.xml	2010-03-24 12:10:40 UTC (rev 102871)
@@ -369,30 +369,6 @@
          <sysproperty key="jboss.partition.name" value="${partitionName}" />
          <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
       </server>
-      <server name="cluster-field-udp-0" host="${node0}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />   
-         <jvmarg value="-XX:-UseGCOverheadLimit" />     
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-         <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
-      </server>
-      <server name="cluster-field-udp-1" host="${node1}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />        
-         <jvmarg value="-XX:-UseGCOverheadLimit" />
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-         <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
-      </server>
       <server name="cluster-udp-SYNC-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
@@ -421,32 +397,6 @@
          <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
          <sysproperty key="node0.bind.address" value="${node0}" />
       </server>
-      <server name="cluster-field-udp-SYNC-0" host="${node0}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />     
-         <jvmarg value="-XX:-UseGCOverheadLimit" />   
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
-         <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
-      </server>
-      <server name="cluster-field-udp-SYNC-1" host="${node1}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />    
-         <jvmarg value="-XX:-UseGCOverheadLimit" />    
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
-         <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
-      </server>
       <server name="cluster-udp-BR-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
@@ -475,32 +425,6 @@
          <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
          <sysproperty key="node0.bind.address" value="${node0}" />
       </server>
-      <server name="cluster-field-udp-BR-0" host="${node0}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />   
-         <jvmarg value="-XX:-UseGCOverheadLimit" />     
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
-         <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
-      </server>
-      <server name="cluster-field-udp-BR-1" host="${node1}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />        
-         <jvmarg value="-XX:-UseGCOverheadLimit" />
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
-         <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
-      </server>
       <server name="cluster-tcp-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
@@ -557,32 +481,6 @@
          <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
          <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
       </server>
-      <server name="cluster-field-tcp-0" host="${node0}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />   
-         <jvmarg value="-XX:-UseGCOverheadLimit" />     
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jboss.multiplexer.stack" value="tcp" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
-         <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
-      </server>
-      <server name="cluster-field-tcp-1" host="${node1}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />        
-         <jvmarg value="-XX:-UseGCOverheadLimit" />
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jboss.multiplexer.stack" value="tcp" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
-         <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
-      </server>
       <server name="cluster-tcp-SYNC-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
@@ -609,32 +507,6 @@
          <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
          <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
       </server>
-      <server name="cluster-field-tcp-SYNC-0" host="${node0}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />        
-         <jvmarg value="-XX:-UseGCOverheadLimit" />
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
-         <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
-      </server>
-      <server name="cluster-field-tcp-SYNC-1" host="${node1}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />   
-         <jvmarg value="-XX:-UseGCOverheadLimit" />     
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
-         <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
-      </server>
       <server name="cluster-tcp-BR-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
@@ -661,32 +533,6 @@
          <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
          <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
       </server>
-      <server name="cluster-field-tcp-BR-0" host="${node0}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />        
-         <jvmarg value="-XX:-UseGCOverheadLimit" />
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
-         <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
-      </server>
-      <server name="cluster-field-tcp-BR-1" host="${node1}">
-         <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx512m" />
-         <jvmarg value="-XX:MaxPermSize=512m" />        
-         <jvmarg value="-XX:-UseGCOverheadLimit" />
-         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-         <sysproperty key="resolve.dns" value="false" />
-         <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
-         <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
-      </server>
       <server name="tomcat-sso-cluster0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />

Deleted: trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/BasicFieldGranularityClassloaderLeakTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/BasicFieldGranularityClassloaderLeakTestCase.java	2010-03-24 11:01:23 UTC (rev 102870)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/BasicFieldGranularityClassloaderLeakTestCase.java	2010-03-24 12:10:40 UTC (rev 102871)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cluster.classloader.leak.test;
-
-import junit.framework.Test;
-
-/**
- * Test for classloader leaks following deployment, use and undeployment
- * of a war configured for FIELD granularity.
- * <p/>
- * If these tests are run with JBoss Profiler's jbossAgent (.dll or .so) on the path
- * and the AS is started with -agentlib:jbossAgent, in case of classloader leakage
- * an extensive report will be logged to the server log, showing the path to root of
- * all references to the classloader.
- * 
- * @author Brian Stansberry
- */
-public class BasicFieldGranularityClassloaderLeakTestCase extends FieldGranularityClassloaderLeakTestBase
-{
-   private static final String FIELD_WAR = "cluster-clleak-field.war";
-   
-   
-   public BasicFieldGranularityClassloaderLeakTestCase(String name)
-   {
-      super(name);
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(BasicFieldGranularityClassloaderLeakTestCase.class, "classloader-leak-test.sar");
-   }
-   
-   public void testFieldWar() throws Exception
-   {
-      warTest(FIELD_WAR);
-   }
-}

Deleted: trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java	2010-03-24 11:01:23 UTC (rev 102870)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java	2010-03-24 12:10:40 UTC (rev 102871)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cluster.classloader.leak.test;
-
-
-/**
- * Base class for test for classloader leaks following deployment, use and undeployment
- * of various wars configured for FIELD granularity or with session attribute
- * types bytecode enhanced for POJO Cache.
- * <p/>
- * If these tests are run with JBoss Profiler's jbossAgent (.dll or .so) on the path
- * and the AS is started with -agentlib:jbossAgent, in case of classloader leakage
- * an extensive report will be logged to the server log, showing the path to root of
- * all references to the classloader.
- * 
- * @author Brian Stansberry
- */
-public class FieldGranularityClassloaderLeakTestBase extends ClassloaderLeakTestBase
-{   
-   
-   public FieldGranularityClassloaderLeakTestBase(String name)
-   {
-      super(name);
-   }
-   
-   protected String getWarContextPath()
-   {
-      return "clustered-clleak";
-   }
-   
-   protected String[] getEjbKeys()
-   {
-      return new String[]{};
-   }
-   
-   protected void makeEjbRequests() throws Exception
-   {
-      throw new UnsupportedOperationException("No EJB tests");
-   }
-}

Deleted: trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NoReplicableWarFieldGranularityClassloaderLeakTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NoReplicableWarFieldGranularityClassloaderLeakTestCase.java	2010-03-24 11:01:23 UTC (rev 102870)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NoReplicableWarFieldGranularityClassloaderLeakTestCase.java	2010-03-24 12:10:40 UTC (rev 102871)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cluster.classloader.leak.test;
-
-import junit.framework.Test;
-
-/**
- * Test for classloader leaks following deployment, use and undeployment
- * of a war configured for FIELD granularity which doesn't contain any
- * classes enhanced for POJO Cache.
- * <p/>
- * If these tests are run with JBoss Profiler's jbossAgent (.dll or .so) on the path
- * and the AS is started with -agentlib:jbossAgent, in case of classloader leakage
- * an extensive report will be logged to the server log, showing the path to root of
- * all references to the classloader.
- * 
- * @author Brian Stansberry
- */
-public class NoReplicableWarFieldGranularityClassloaderLeakTestCase extends FieldGranularityClassloaderLeakTestBase
-{
-   private static final String FIELD_NO_REPLICABLE_WAR = "cluster-clleak-field-no-replicable.war";
-   
-   
-   public NoReplicableWarFieldGranularityClassloaderLeakTestCase(String name)
-   {
-      super(name);
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(NoReplicableWarFieldGranularityClassloaderLeakTestCase.class, "classloader-leak-test.sar");
-   }
-   
-   public void testFieldNoReplicableWar() throws Exception
-   {
-      warTest(FIELD_NO_REPLICABLE_WAR);
-   }
-}

Deleted: trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NonFieldGranularityReplicableClassloaderLeakTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NonFieldGranularityReplicableClassloaderLeakTestCase.java	2010-03-24 11:01:23 UTC (rev 102870)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/NonFieldGranularityReplicableClassloaderLeakTestCase.java	2010-03-24 12:10:40 UTC (rev 102871)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cluster.classloader.leak.test;
-
-import junit.framework.Test;
-
-/**
- * Test for classloader leaks following deployment, use and undeployment
- * of a war NOT configured for FIELD granularity which however does contain 
- * session attribute classes bytecode enhanced for POJO Cache.
- * <p/>
- * If these tests are run with JBoss Profiler's jbossAgent (.dll or .so) on the path
- * and the AS is started with -agentlib:jbossAgent, in case of classloader leakage
- * an extensive report will be logged to the server log, showing the path to root of
- * all references to the classloader.
- * 
- * @author Brian Stansberry
- */
-public class NonFieldGranularityReplicableClassloaderLeakTestCase extends FieldGranularityClassloaderLeakTestBase
-{
-   private static final String SIMPLE_REPLICABLE_WAR = "cluster-clleak-simple-replicable.war";
-      
-   public NonFieldGranularityReplicableClassloaderLeakTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(NonFieldGranularityReplicableClassloaderLeakTestCase.class, "classloader-leak-test.sar");
-   }
-   
-   public void testSimpleReplicableWar() throws Exception
-   {
-      warTest(SIMPLE_REPLICABLE_WAR);
-   }
-}




More information about the jboss-cvs-commits mailing list