[jboss-cvs] JBossAS SVN: r63205 - branches/Branch_4_2/testsuite.

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

Author: dimitris at jboss.org
Date: 2007-05-24 18:15:09 -0400 (Thu, 24 May 2007)
New Revision: 63205

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
JBAS-4416, Introduce compatibility tests for interoperating with older jboss versions using the legacy rmi invokers

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-05-24 22:13:52 UTC (rev 63204)
+++ branches/Branch_4_2/testsuite/build.xml	2007-05-24 22:15:09 UTC (rev 63205)
@@ -2877,34 +2877,43 @@
     <fail message="Use -Dmatrix-versions=[version container] for this task" unless="matrix-versions"/>
     <fail message="Set -Djdk14= to a JDK1.4 installation" unless="jdk14"/>
     <fail message="Set -Djdk15= to a JDK1.5 installation" unless="jdk15"/>
-<!--    
-    <test-compatibility client-version="3_2_8SP1" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
-    <test-compatibility client-version="3_2_x" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
-    <test-compatibility client-version="4_0_1SP1" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy -Dorg.jboss.j2ee.LegacySerialization" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_2" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_3" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_3SP1" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
--->    
-    <test-compatibility client-version="4_0_4_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_5_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_x" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
     
-    <test-compatibility-pooledInvokers client-version="4_0_3" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_3SP1" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true -Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_4_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_5_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_x" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <create-config baseconf="default" newconf="legacy-invokers">
+      <patternset>
+        <include name="conf/**"/>
+        <include name="deploy/**"/>
+        <include name="lib/**"/>
+      </patternset>
+    </create-config>
+    
+    <!-- test interoperating with clients using the legacy rmi invokers -->
+    <test-compatibility client-version="3_2_8SP1" client-jdk="${jdk15}" client-serialization-flag="-Dorg.jboss.j2ee.Serialization" serialization-flag="-Dnone" server-config="legacy-invokers"/>
+    <test-compatibility client-version="3_2_x"    client-jdk="${jdk15}" client-serialization-flag="-Dorg.jboss.j2ee.Serialization" serialization-flag="-Dnone" server-config="legacy-invokers"/>
+    <test-compatibility client-version="4_0_1SP1" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.j2ee.LegacySerialization" server-config="legacy-invokers"/>
+    <test-compatibility client-version="4_0_2"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="legacy-invokers"/>
+    <test-compatibility client-version="4_0_3"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="legacy-invokers"/>
+    <test-compatibility client-version="4_0_3SP1" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="legacy-invokers"/>
+    <!-- testing interoperating with clients using the unified invokers over jboss remoting -->
+    <test-compatibility client-version="4_0_4_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" server-config="default"/>
+    <test-compatibility client-version="4_0_5_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" server-config="default"/>
+    <test-compatibility client-version="4_0_x"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" server-config="default"/>
+    <test-compatibility client-version="4_2_x"    client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
+    <!-- testing interoperating with clients using the pooled invokers -->
+    <test-compatibility-pooled-invokers client-version="4_0_3"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy"/>
+    <test-compatibility-pooled-invokers client-version="4_0_3SP1" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy"/>
+    <test-compatibility-pooled-invokers client-version="4_0_4_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+    <test-compatibility-pooled-invokers client-version="4_0_5_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+    <test-compatibility-pooled-invokers client-version="4_0_x"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+    <test-compatibility-pooled-invokers client-version="4_2_x"    client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
   </target>
 
-  <macrodef name="test-compatibility-pooledInvokers">
+  <macrodef name="test-compatibility-pooled-invokers">
     <attribute name="client-version"/>
     <attribute name="client-jdk"/>
+    <attribute name="client-serialization-flag"/>    
     <attribute name="serialization-flag"/>
-    <attribute name="client-serialization-flag"/>
     <sequential>
-      <start-jboss conf="all" jvmargs="-Xmx128m @{serialization-flag}"/>
+      <start-jboss conf="default" jvmargs="-Xmx128m @{serialization-flag}"/>
       <wait-on-host/>
       <antcall target="tests-standard-unit-matrix-version-pooled">
         <param name="matrix-configuration" value="@{client-version}"/>
@@ -2913,17 +2922,18 @@
         <param name="client-serialization-flag" value="@{client-serialization-flag}"/>
       </antcall>
       <stop-jboss jvmargs="@{serialization-flag}"/>
-      <wait-on-shutdown conf="all"/>
+      <wait-on-shutdown conf="default"/>
     </sequential>
   </macrodef>
 
   <macrodef name="test-compatibility">
     <attribute name="client-version"/>
     <attribute name="client-jdk"/>
+    <attribute name="client-serialization-flag"/>    
     <attribute name="serialization-flag"/>
-    <attribute name="client-serialization-flag"/>
+    <attribute name="server-config"/>
     <sequential>
-      <start-jboss conf="all" jvmargs="-Xmx128m @{serialization-flag}"/>
+      <start-jboss conf="@{server-config}" jvmargs="-Xmx128m @{serialization-flag}"/>
       <wait-on-host/>
       <antcall target="tests-standard-unit-matrix-version">
         <param name="matrix-configuration" value="@{client-version}"/>
@@ -2932,7 +2942,7 @@
         <param name="client-serialization-flag" value="@{client-serialization-flag}"/>
       </antcall>
       <stop-jboss jvmargs="@{serialization-flag}"/>
-      <wait-on-shutdown conf="all"/>
+      <wait-on-shutdown conf="@{server-config}"/>
     </sequential>
   </macrodef>