[jboss-cvs] JBossAS SVN: r64825 - in trunk/testsuite/imports: config and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 23 18:10:12 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-08-23 18:10:12 -0400 (Thu, 23 Aug 2007)
New Revision: 64825
Removed:
trunk/testsuite/imports/sections/cache.xml
Modified:
trunk/testsuite/imports/config/tests-clustering.xml
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/imports/test-jars.xml
Log:
[JBAS-4552] Move cache integration tests to cluster package
Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml 2007-08-23 22:06:55 UTC (rev 64824)
+++ trunk/testsuite/imports/config/tests-clustering.xml 2007-08-23 22:10:12 UTC (rev 64825)
@@ -18,6 +18,9 @@
<include name="org/jboss/test/cluster/defaultcfg/ejb2/test/*TestCase.class"/>
<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"/>
Deleted: trunk/testsuite/imports/sections/cache.xml
===================================================================
--- trunk/testsuite/imports/sections/cache.xml 2007-08-23 22:06:55 UTC (rev 64824)
+++ trunk/testsuite/imports/sections/cache.xml 2007-08-23 22:10:12 UTC (rev 64825)
@@ -1,94 +0,0 @@
-<project name="tests-cache-jars">
- <!-- 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}/cache/META-INF">
- <include name="*-service*.xml"/>
- </fileset>
- </copy>
-
- <!-- pre-compile the aop classes -->
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
- classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="javassist.classpath"/>
- <path refid="trove.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
- </path>
-
- <aopc compilerclasspathref="aop.task.classpath">
- <classpath refid="thirdparty.classpath"/>
- <classpath path="${build.classes}"/>
- <src path="${build.classes}"/>
- <include name="org/jboss/test/cache/test/standAloneAop/**"/>
- <aoppath
- path="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/>
- </aopc>
-
- <!-- build cachetest.jar -->
- <jar destfile="${build.lib}/cachetest.jar"
- manifest="${build.resources}/cache/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cache/bean/*.class"/>
- <include name="org/jboss/test/cache/test/standAloneAop/*.class"/>
- </fileset>
- <metainf dir="${build.resources}/cache/META-INF/">
- <include name="jboss.xml"/>
- <include name="ejb-jar.xml"/>
- </metainf>
- </jar>
-
- <!-- build cachetest.sar -->
- <!--
- -->
- <delete file="${build.resources}/cache/META-INF/jboss-service.xml"/>
- <copy file="${build.resources}/cache/META-INF/tree-service.xml"
- tofile="${build.resources}/cache/META-INF/jboss-service.xml"/>
-
- <jar destfile="${build.lib}/cachetest.sar">
- <fileset dir="${jboss.cache.lib}">
- <include name="jboss-cache.jar"/>
- </fileset>
- <fileset dir="${jgroups.jgroups.lib}">
- <include name="jgroups.jar"/>
- </fileset>
- <fileset dir="${build.resources}/cache">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
-
- <!-- build cacheAoptest.sar -->
- <delete file="${build.resources}/cache/META-INF/jboss-service.xml"/>
- <copy file="${build.resources}/cache/META-INF/tree-aop-service.xml"
- tofile="${build.resources}/cache/META-INF/jboss-service.xml"/>
-
- <jar destfile="${build.lib}/cacheAoptest.sar">
- <fileset dir="${jboss.cache.lib}">
- <include name="jboss-cache.jar"/>
- </fileset>
- <fileset dir="${jgroups.jgroups.lib}">
- <include name="jgroups.jar"/>
- </fileset>
- <fileset dir="${build.resources}/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/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2007-08-23 22:06:55 UTC (rev 64824)
+++ trunk/testsuite/imports/sections/cluster.xml 2007-08-23 22:10:12 UTC (rev 64825)
@@ -468,7 +468,7 @@
</target>
<!-- testbeancluster test -->
- <target name="_jars-testbeancluster" depends="_jars-testbean">
+ <target name="_jars-testbeancluster" depends="compile-resources">
<mkdir dir="${build.lib}"/>
<copy todir="${build.lib}"
@@ -558,4 +558,98 @@
fullpath="META-INF/jboss.xml" includes="pooledha-jboss.xml"/>
</jar>
</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="jboss.aop.classpath"/>
+ <path id="aop.task.classpath">
+ <path refid="javassist.classpath"/>
+ <path refid="trove.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.common.core.classpath"/>
+ <path refid="jboss.common.logging.spi.classpath"/>
+ <path refid="jboss.common.logging.log4j.classpath"/>
+ <path refid="jboss.common.logging.jdk.classpath"/>
+ </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 dir="${jboss.cache.lib}">
+ <include name="jbosscache.jar"/>
+ </fileset>
+ <fileset dir="${jgroups.jgroups.lib}">
+ <include name="jgroups.jar"/>
+ </fileset>
+ <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 dir="${jboss.cache.lib}">
+ <include name="jbosscache.jar"/>
+ </fileset>
+ <fileset dir="${jgroups.jgroups.lib}">
+ <include name="jgroups.jar"/>
+ </fileset>
+ <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/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml 2007-08-23 22:06:55 UTC (rev 64824)
+++ trunk/testsuite/imports/test-jars.xml 2007-08-23 22:10:12 UTC (rev 64825)
@@ -11,7 +11,6 @@
<import file="sections/bank.xml"/>
<import file="sections/bench.xml"/>
<import file="sections/bmp.xml"/>
- <import file="sections/cache.xml"/>
<import file="sections/classloader.xml"/>
<import file="sections/client.xml"/>
<import file="sections/cluster.xml"/>
More information about the jboss-cvs-commits
mailing list