[jboss-cvs] JBossAS SVN: r107572 - in branches/infinispan-int/testsuite: imports and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 12 15:51:36 EDT 2010
Author: smarlow at redhat.com
Date: 2010-08-12 15:51:34 -0400 (Thu, 12 Aug 2010)
New Revision: 107572
Removed:
branches/infinispan-int/testsuite/imports/sections/cluster.xml
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/CacheManagerUnitTestCase.java
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/aop/
Modified:
branches/infinispan-int/testsuite/build.xml
branches/infinispan-int/testsuite/imports/test-jars.xml
branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Address.java
branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Person.java
Log:
remove pojocache jbc
Modified: branches/infinispan-int/testsuite/build.xml
===================================================================
--- branches/infinispan-int/testsuite/build.xml 2010-08-12 19:11:24 UTC (rev 107571)
+++ branches/infinispan-int/testsuite/build.xml 2010-08-12 19:51:34 UTC (rev 107572)
@@ -233,9 +233,11 @@
<fileset refid="jacorb:jacorb_g:jar"/>
<fileset refid="javax.enterprise:cdi-api:jar"/>
<fileset refid="javax.inject:javax.inject:jar"/>
- <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
- <fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
- <fileset refid="jgroups:jgroups:jar"/>
+<!--
+ <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
+ <fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
+-->
+ <fileset refid="org.jgroups:jgroups:jar"/>
<fileset refid="joesnmp:joesnmp:jar"/>
<fileset refid="junit:junit:jar"/>
<fileset refid="org.easymock:easymock:jar"/>
@@ -264,7 +266,7 @@
<fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-core:jar"/>
- <fileset refid="org.jboss.cluster:jboss-ha-server-cache-jbc:jar"/>
+ <fileset refid="org.jboss.cluster:jboss-ha-server-cache-ispn:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-cache-spi:jar"/>
<fileset refid="org.jboss.jaxr:juddi-saaj:jar"/>
<fileset refid="org.jboss.jaxr:juddi-service:sar"/>
@@ -281,7 +283,7 @@
<fileset refid="org.hibernate:hibernate-annotations:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
<fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
- <fileset refid="org.hibernate:hibernate-jbosscache:jar"/>
+ <fileset refid="org.hibernate:hibernate-infinispan:jar"/>
<fileset refid="org.hibernate:hibernate-testing:jar"/>
<fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
Deleted: branches/infinispan-int/testsuite/imports/sections/cluster.xml
===================================================================
--- branches/infinispan-int/testsuite/imports/sections/cluster.xml 2010-08-12 19:11:24 UTC (rev 107571)
+++ branches/infinispan-int/testsuite/imports/sections/cluster.xml 2010-08-12 19:51:34 UTC (rev 107572)
@@ -1,846 +0,0 @@
-
-
-<project name="tests-cluster-jars">
-
- <target name="_jars-cluster" depends="compile-resources">
- <war warfile="${build.lib}/dist-ss.war"
- webxml="${build.resources}/cluster/web/web.xml">
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/*"/>
- </classes>
- </war>
-
- <jar destfile="${build.lib}/ds-tests.sar">
- <metainf dir="${build.resources}/cluster/ds">
- <include name="jboss-service.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/hapartition/ds/*"/>
- <include name="org/jboss/test/cluster/multicfg/test/*_Stub.class"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/drm-tests.sar">
- <metainf dir="${build.resources}/cluster/drm">
- <include name="jboss-service.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/hapartition/drm/*"/>
- <include name="org/jboss/test/cluster/multicfg/test/*_Stub.class"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/rpc-tests.sar">
- <metainf dir="${build.resources}/cluster/rpc">
- <include name="jboss-service.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/hapartition/rpc/*"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/rpc-cl-tests.sar">
- <metainf dir="${build.resources}/cluster/rpc-cl">
- <include name="jboss-service.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/hapartition/rpc/*"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/partitionstatetransfer.sar">
- <metainf dir="${build.resources}/cluster/partition">
- <include name="jboss-beans.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/hapartition/state/*"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/ejb2/passexp">
- <include name="META-INF/passexp-stacks.xml"/>
- </fileset>
- </jar>
-
- <!-- MBeans for testing Clustered DeploymentRepository additions -->
- <copy todir="${build.lib}" overwrite="true">
- <fileset dir="${build.resources}/cluster/profileservice"/>
- </copy>
-
- <!-- MBeans for testing Clustered DeploymentRepository additions -->
- <copy todir="${build.lib}" overwrite="true">
- <fileset dir="${build.resources}/cluster/farm/hotdeploy"/>
- </copy>
-
- <!-- MC beans for testing partition restart -->
- <copy todir="${build.lib}"
- file="${build.resources}/cluster/partition/partition-restart-jboss-beans.xml"
- overwrite="true"/>
-
- <!-- EJBs for testing partition restart -->
- <jar destfile="${build.lib}/partition-restart.jar">
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/testbean/interfaces/**"/>
- <include name="org/jboss/test/testbean/bean/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
- <include name="org/somepackage/**"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/partition">
- <include name="META-INF/*.xml"/>
- </fileset>
- </jar>
-
- <!--beans for testing HASingletonDeployerTestCase -->
- <copy todir="${build.lib}"
- file="${build.resources}/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml"
- overwrite="true"/>
-
- <!--sar for testing HASingletonElectionPolicy -->
- <jar destfile="${build.lib}/ha-singleton-election.sar">
- <metainf dir="${build.resources}/cluster/hasingleton/electionpolicy">
- <include name="ha-electionpolicy-jboss-beans.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/hasingleton/*Example*.class"/>
- </fileset>
- </jar>
-
- <!--beans for testing HASingletonControllerBeanUnitTestCase -->
- <jar destfile="${build.lib}/ha-singleton-pojo.sar">
- <metainf dir="${build.resources}/cluster/hasingleton/">
- <include name="ha-singleton-jboss-beans.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/hasingleton/*Example*.class"/>
- </fileset>
- </jar>
-
- <!--beans for testing HAServiceUnitTestCase, HASingletonUnitTestCase -->
- <jar destfile="${build.lib}/ha-service.sar">
- <metainf dir="${build.resources}/cluster/haservice">
- <include name="*.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/haservice/**"/>
- </fileset>
- </jar>
-
- <!-- ha-invoker adaptor sar -->
- <jar destfile="${build.lib}/ha-invoker.sar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/invokerha/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/invokerha/">
- <include name="META-INF/*.xml"/>
- </fileset>
- </jar>
-
- <!-- The cross-server.jar ejb jar -->
- <zip destfile="${build.lib}/cross-server.jar">
- <zipfileset dir="${build.resources}/cluster/cross-server"
- prefix="META-INF"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/ejb2/crossserver/*"/>
- </fileset>
- </zip>
-
- <!-- Remote interface to JBoss Cache -->
- <jar destfile="${build.lib}/jbosscache-helper.sar">
- <metainf dir="${build.resources}/cluster/web/cachehelper">
- <include name="jboss-beans.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/CacheHelper*"/>
- <include name="org/jboss/test/cluster/web/TestConfigurationAdder.class"/>
- </fileset>
- </jar>
-
- <!-- build httpsessionreplication.jar -->
- <war warfile="${build.lib}/http-sr.war"
- webxml="${build.resources}/cluster/http/http-sr/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-sr/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${build.resources}/cluster/http">
- <include name="*.jsp"/>
- </fileset>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/BindingListener.class"/>
- <include name="org/jboss/test/cluster/web/CacheHelper*"/>
- </classes>
- </war>
-
- <!-- build http-default.war (copy of http-sr, w/out jboss-web.xml) -->
- <war warfile="${build.lib}/http-default.war"
- webxml="${build.resources}/cluster/http/http-sr/WEB-INF/web.xml">
- <fileset dir="${build.resources}/cluster/http">
- <include name="*.jsp"/>
- </fileset>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/BindingListener.class"/>
- <include name="org/jboss/test/cluster/web/CacheHelper*"/>
- </classes>
- </war>
-
- <!-- build http-jk.jar -->
- <war warfile="${build.lib}/http-jk.war"
- webxml="${build.resources}/cluster/http/http-jk/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-jk/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="context.xml"/>
- </webinf>
- <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 -->
- <copy
- tofile="${build.resources}/cluster/http/http-scoped/WEB-INF/jboss-web.xml"
- file="${build.resources}/cluster/http/http-scoped/jboss-web.xml"
- overwrite="true"/>
-
- <war warfile="${build.lib}/http-scoped.war"
- webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-scoped/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-scoped">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <!-- build http-scoped-attr.jar -->
- <copy
- tofile="${build.resources}/cluster/http/http-scoped/WEB-INF/jboss-web.xml"
- file="${build.resources}/cluster/http/http-scoped/jboss-web-attr-based.xml"
- overwrite="true"/>
-
- <war warfile="${build.lib}/http-scoped-attr.war"
- webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-scoped/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-scoped">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <!-- build http-scoped-set.jar -->
- <copy
- tofile="${build.resources}/cluster/http/http-scoped/WEB-INF/jboss-web.xml"
- file="${build.resources}/cluster/http/http-scoped/jboss-web-set-trigger.xml"
- overwrite="true"/>
-
- <war warfile="${build.lib}/http-scoped-set.war"
- webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-scoped/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-scoped">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <!-- build http-scoped-set-attr.jar -->
- <copy
- tofile="${build.resources}/cluster/http/http-scoped/WEB-INF/jboss-web.xml"
- file="${build.resources}/cluster/http/http-scoped/jboss-web-attr-set.xml"
- overwrite="true"/>
-
- <war warfile="${build.lib}/http-scoped-set-attr.war"
- webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-scoped/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-scoped">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <!-- build http-cross-ctx-first.jar -->
- <war warfile="${build.lib}/http-cross-ctx-first.war"
- webxml="${build.resources}/cluster/http/http-cross-ctx-first/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-cross-ctx-first/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-cross-ctx-first">
- <include name="*.jsp"/>
- </fileset>
- </war>
-
- <!-- build http-cross-ctx-second.jar -->
- <war warfile="${build.lib}/http-cross-ctx-second.war"
- webxml="${build.resources}/cluster/http/http-cross-ctx-second/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-cross-ctx-second/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-cross-ctx-second">
- <include name="*.jsp"/>
- </fileset>
- </war>
-
- <!-- build http-cross-ctx-third.jar -->
- <war warfile="${build.lib}/http-cross-ctx-third.war"
- webxml="${build.resources}/cluster/http/http-cross-ctx-third/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/http-cross-ctx-third/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-cross-ctx-third">
- <include name="*.jsp"/>
- </fileset>
- </war>
-
- <ear earfile="${build.lib}/http-cross-ctx.ear"
- appxml="${build.resources}/cluster/http/application.xml">
- <fileset dir="${build.lib}">
- <include name="http-cross-ctx-first.war"/>
- <include name="http-cross-ctx-second.war"/>
- <include name="http-cross-ctx-third.war"/>
- </fileset>
- </ear>
-
- <!-- Session passivation test wars -->
-
- <war warfile="${build.lib}/http-session-pass.war"
- webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/passivation/SESSION">
- <include name="*"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-scoped">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <war warfile="${build.lib}/http-attr-pass.war"
- webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/http/passivation/ATTRIBUTE">
- <include name="*"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-scoped">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <!-- Build clustered classloader leak test archives -->
-
- <war destfile="${build.lib}/cluster-clleak-simple.war"
- webxml="${build.resources}/cluster/classloader/leak/war/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/classloader/leak/war/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-nopass.war"
- webxml="${build.resources}/cluster/classloader/leak/war/nopass/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/classloader/leak/war/nopass/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-replicable.war"
- webxml="${build.resources}/cluster/classloader/leak/war/replicable/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/classloader/leak/war/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-simple-ejb.war"
- webxml="${build.resources}/cluster/classloader/leak/war/ejb2/WEB-INF/web.xml">
- <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>
- <jar destfile="${build.lib}/cluster-clleak-ejb.jar"
- manifest="${build.resources}/cluster/classloader/leak/ejb/META-INF/MANIFEST.MF">
- <metainf dir="${build.resources}/cluster/classloader/leak/ejb/META-INF"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/classloader/leak/ejb/**"/>
- </fileset>
- </jar>
- <ear destfile="${build.lib}/cluster-clleak-simple.ear"
- appxml="${build.resources}/cluster/classloader/leak/ear/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="cluster-clleak-simple-ejb.war"/>
- <include name="cluster-clleak-ejb.jar"/>
- </fileset>
- </ear>
- <ear destfile="${build.lib}/cluster-clleak-simple-isolated.ear"
- appxml="${build.resources}/cluster/classloader/leak/ear/META-INF/application.xml">
- <metainf dir="${build.resources}/cluster/classloader/leak/ear/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- <fileset dir="${build.lib}">
- <include name="cluster-clleak-simple-ejb.war"/>
- <include name="cluster-clleak-ejb.jar"/>
- </fileset>
- </ear>
- <ear destfile="${build.lib}/cluster-clleak-noweb.ear"
- appxml="${build.resources}/cluster/classloader/leak/ear/META-INF/application-noweb.xml">
- <fileset dir="${build.lib}">
- <include name="cluster-clleak-ejb.jar"/>
- </fileset>
- </ear>
- <ear destfile="${build.lib}/cluster-clleak-noweb-isolated.ear"
- appxml="${build.resources}/cluster/classloader/leak/ear/META-INF/application-noweb.xml">
- <metainf dir="${build.resources}/cluster/classloader/leak/ear/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- <fileset dir="${build.lib}">
- <include name="cluster-clleak-ejb.jar"/>
- </fileset>
- </ear>
-
- <!-- DataSourcePersistentManager Tests -->
- <copy todir="${build.lib}"
- file="${build.resources}/cluster/persistent/httpsession-ds.xml"
- overwrite="true"/>
-
- <jar destfile="${build.lib}/disable-manager-override.beans">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/persistent/ManagerOverrideDisabler.class"/>
- </fileset>
- <metainf dir="${build.resources}/cluster/persistent/">
- <include name="disable-manager-override-jboss-beans.xml"/>
- </metainf>
- </jar>
-
- <!-- build http-cross-ctx-first-persistent.jar -->
- <war warfile="${build.lib}/http-cross-ctx-first-persistent.war"
- webxml="${build.resources}/cluster/http/http-cross-ctx-first/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/persistent/WEB-INF">
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-cross-ctx-first">
- <include name="*.jsp"/>
- </fileset>
- </war>
-
- <!-- build http-cross-ctx-second-persistent.jar -->
- <war warfile="${build.lib}/http-cross-ctx-second-persistent.war"
- webxml="${build.resources}/cluster/http/http-cross-ctx-second/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/persistent/WEB-INF">
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-cross-ctx-second">
- <include name="*.jsp"/>
- </fileset>
- </war>
-
- <!-- build http-cross-ctx-third-persistent.jar -->
- <war warfile="${build.lib}/http-cross-ctx-third-persistent.war"
- webxml="${build.resources}/cluster/http/http-cross-ctx-third/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/persistent/WEB-INF">
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-cross-ctx-third">
- <include name="*.jsp"/>
- </fileset>
- </war>
-
- <ear earfile="${build.lib}/http-cross-ctx-persistent.ear"
- appxml="${build.resources}/cluster/persistent/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="http-cross-ctx-first-persistent.war"/>
- <include name="http-cross-ctx-second-persistent.war"/>
- <include name="http-cross-ctx-third-persistent.war"/>
- </fileset>
- </ear>
-
- <war warfile="${build.lib}/http-scoped-persistent.war"
- webxml="${build.resources}/cluster/http/http-scoped/WEB-INF/web.xml">
- <webinf dir="${build.resources}/cluster/persistent/WEB-INF">
- <include name="context.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/Person.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-scoped">
- <include name="*.jsp"/>
- <include name="*.html"/>
- </fileset>
- </war>
-
- <jar destfile="${build.lib}/rdbmsstore-tablesetup.jar">
- <metainf dir="${build.resources}/cluster/persistent">
- <include name="rdbmsstore-tablesetup-jboss-beans.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/web/persistent/PersistentStoreTableSetup.class"/>
- </fileset>
- </jar>
-
- <!-- JPA Clustered Second Level Cache -->
- <jar jarfile="${build.lib}/clusteredentity-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/clusteredentity/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-optimistic-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/clusteredentity/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/optimistic">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-classloader-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/clusteredentity/classloader/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/clusteredentity/classloader/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader/optimistic">
- <include name="META-INF/persistence.xml"/>
- <!--include name="META-INF/jboss.xml"/-->
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-classloader-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-classloader-test.jar"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-classloader-optimistic-test.jar"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader">
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader/optimistic">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-providedprefix-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/clusteredentity/classloader/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/providedprefix">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-providedprefix-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-providedprefix-test.jar"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/providedprefix">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader">
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/clusteredentity/embeddedid/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/clusteredentity/embeddedid/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader/optimistic">
- <include name="META-INF/persistence.xml"/>
- <!--include name="META-INF/jboss.xml"/-->
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-embeddedid-test.jar"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader">
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/embeddedid">
- <include name="META-INF/application.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-embeddedid-optimistic-test.jar"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/classloader">
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/clusteredentity/embeddedid/optimistic">
- <include name="META-INF/application.xml"/>
- </fileset>
- </jar>
-
-
- </target>
-
- <!-- testbeancluster test -->
- <target name="_jars-testbeancluster" depends="compile-resources">
- <mkdir dir="${build.lib}"/>
-
- <copy todir="${build.lib}"
- file="${build.resources}/cluster/ejb2/basic/cif-ds.xml"
- overwrite="true"/>
-
- <!-- build testbeancluster.jar -->
- <jar destfile="${build.lib}/testbeancluster.jar">
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/testbean/interfaces/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
- <include name="org/jboss/test/testbean/bean/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/proxy/**"/>
- <include name="org/somepackage/**"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/ejb2/basic">
- <include name="META-INF/*.xml"/>
- </fileset>
- </jar>
-
- <!-- build sfsb-passexp.jar -->
- <jar destfile="${build.lib}/sfsb-passexp.jar">
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/testbean/interfaces/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
- <include name="org/jboss/test/testbean/bean/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/proxy/**"/>
- <include name="org/somepackage/**"/>
- </fileset>
- <fileset dir="${build.resources}/cluster/ejb2/passexp">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/jboss.xml"/>
- </fileset>
- </jar>
-
- <!-- build sfsb-passexp.sar -->
- <jar destfile="${build.lib}/sfsb-passexp.sar">
- <fileset dir="${build.resources}/cluster/ejb2/passexp">
- <include name="META-INF/partition-passexp-jboss-beans.xml"/>
- <include name="META-INF/passexp-stacks.xml"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/test-cif.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/testbean/interfaces/AComplexPK.class"/>
- <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
- </fileset>
- <zipfileset dir="${build.resources}/cluster/ejb2/basic"
- fullpath="META-INF/ejb-jar.xml" includes="cif-ejb-jar.xml"/>
- <zipfileset dir="${build.resources}/cluster/ejb2/basic"
- fullpath="META-INF/jboss.xml" includes="cif-jboss.xml"/>
- <zipfileset dir="${build.resources}/cluster/ejb2/basic"
- fullpath="META-INF/jbosscmp-jdbc.xml" includes="jbosscmp-jdbc.xml"/>
- </jar>
- <ear destfile="${build.lib}/test-cif.ear"
- appxml="${build.resources}/cluster/ejb2/basic/application.xml">
- <!--metainf dir="${build.resources}/cluster/ejb2/basic">
- <include name="jboss-app.xml"/>
- </metainf-->
- <fileset dir="${build.lib}">
- <include name="test-cif.jar"/>
- </fileset>
- <!--fileset dir="${build.resources}/cluster/ejb2/basic">
- <include name="cif-ds.xml"/>
- </fileset-->
- </ear>
-
- <jar destfile="${build.lib}/test-retry.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/testbean/interfaces/AComplexPK.class"/>
- <include name="org/jboss/test/testbean/interfaces/**"/>
- <include name="org/jboss/test/testbean/bean/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
- <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
- </fileset>
- <zipfileset dir="${build.resources}/cluster/ejb2/basic"
- fullpath="META-INF/ejb-jar.xml" includes="retry-ejb-jar.xml"/>
- <zipfileset dir="${build.resources}/cluster/ejb2/basic"
- fullpath="META-INF/jboss.xml" includes="retry-jboss.xml"/>
- <zipfileset dir="${build.resources}/cluster/ejb2/basic"
- fullpath="META-INF/jbosscmp-jdbc.xml" includes="retry-jbosscmp-jdbc.xml"/>
- </jar>
- <ear destfile="${build.lib}/test-retry.ear"
- appxml="${build.resources}/cluster/ejb2/basic/retry-application.xml">
- <!--metainf dir="${build.resources}/cluster/ejb2/basic">
- <include name="jboss-app.xml"/>
- </metainf-->
- <fileset dir="${build.lib}">
- <include name="test-retry.jar"/>
- </fileset>
- <!--fileset dir="${build.resources}/cluster/ejb2/basic">
- <include name="cif-ds.xml"/>
- </fileset-->
- </ear>
-
- <!-- ustxsticky.jar -->
- <zip destfile="${build.lib}/ustxsticky.jar">
- <zipfileset dir="${build.resources}/cluster/ejb2/ustxsticky"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/ejb2/ustxsticky/*"/>
- </fileset>
- </zip>
-
- <zip destfile="${build.lib}/rspfilter.sar">
- <zipfileset dir="${build.resources}/cluster/rspfilter"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/rspfilter/*"/>
- </fileset>
- </zip>
-
- </target>
-
-</project>
Modified: branches/infinispan-int/testsuite/imports/test-jars.xml
===================================================================
--- branches/infinispan-int/testsuite/imports/test-jars.xml 2010-08-12 19:11:24 UTC (rev 107571)
+++ branches/infinispan-int/testsuite/imports/test-jars.xml 2010-08-12 19:51:34 UTC (rev 107572)
@@ -15,7 +15,7 @@
<import file="sections/bootstrapdependencies.xml"/>
<import file="sections/classloader.xml"/>
<import file="sections/client.xml"/>
- <import file="sections/cluster.xml"/>
+<!-- <import file="sections/cluster.xml"/> -->
<import file="sections/cmp.xml"/>
<import file="sections/cookie.xml"/>
<import file="sections/cts.xml"/>
@@ -99,7 +99,6 @@
_jars-bootstrapdependencies,
_jars-classloader,
_jars-client,
- _jars-cluster,
_jars-cmp2,
_jars-cookie,
_jars-cts,
@@ -166,7 +165,6 @@
_jars-session,
_jars-spring,
_jars-testbean,
- _jars-testbeancluster,
_jars-threading,
_jars-timer,
_jars-tm,
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Address.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Address.java 2010-08-12 19:11:24 UTC (rev 107571)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Address.java 2010-08-12 19:51:34 UTC (rev 107572)
@@ -23,7 +23,6 @@
import java.io.Serializable;
-import org.jboss.cache.pojo.annotation.Replicable;
@@ -33,7 +32,6 @@
*
* @version $Revision$
*/
- at Replicable
public class Address implements Serializable
{
/** The serialVersionUID */
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Person.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Person.java 2010-08-12 19:11:24 UTC (rev 107571)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/classloader/leak/aop/Person.java 2010-08-12 19:51:34 UTC (rev 107572)
@@ -24,16 +24,13 @@
import java.io.Serializable;
import java.util.*;
-import org.jboss.cache.pojo.annotation.Replicable;
-
/**
* Test class for AOP-prepared classes. @Replicable annotation will
* cause the class to be aop-prepared.
*
* @version $Revision$
*/
- at Replicable
public class Person implements Serializable
{
/** The serialVersionUID */
Deleted: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/CacheManagerUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/CacheManagerUnitTestCase.java 2010-08-12 19:11:24 UTC (rev 107571)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/CacheManagerUnitTestCase.java 2010-08-12 19:51:34 UTC (rev 107572)
@@ -1,309 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.defaultcfg.test;
-
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.cache.Cache;
-import org.jboss.cache.CacheStatus;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.ConfigurationRegistry;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.ha.cachemanager.CacheManager;
-import org.jboss.ha.framework.server.JChannelFactory;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Tests CacheManager.
- *
- * @author Brian Stansberry
- */
-public class CacheManagerUnitTestCase extends JBossTestCase
-{
- /** A file that includes every configuration element I could think of */
- public static final String DEFAULT_CONFIGURATION_FILE = "cluster/cachemanager/jbc-configs.xml";
- public static final String DEFAULT_STACKS_FILE = "cluster/cachemanager/stacks.xml";
- public static final String DEFAULT_STACK = "test1";
-
- private Set<Cache<Object, Object>> caches = new HashSet<Cache<Object, Object>>();
- private Set<PojoCache> pojoCaches = new HashSet<PojoCache>();
- private String jgroups_bind_addr;
-
- public CacheManagerUnitTestCase(String name)
- {
- super(name);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
-
- String jgroups_bind_addr = System.getProperty("jgroups.bind_addr");
- if (jgroups_bind_addr == null)
- {
- System.setProperty("jbosstest.cluster.node0", System.getProperty("jbosstest.cluster.node0", "localhost"));
- }
- }
-
- protected void tearDown() throws Exception
- {
- if (jgroups_bind_addr == null)
- System.clearProperty("jgroups.bind_addr");
-
- for (Cache<Object, Object> cache : caches)
- {
- try
- {
- cache.stop();
- cache.destroy();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.out);
- }
- }
-
- for (PojoCache pojoCache : pojoCaches)
- {
- try
- {
- pojoCache.stop();
- pojoCache.destroy();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.out);
- }
- }
-
- super.tearDown();
- }
-
- /**
- * A test that instantiates a CacheRegistry and cycles through all its
- * core configs, creating and releasing a plain JBoss Cache for each.
- *
- * @throws Exception
- */
- public void testBasic() throws Exception
- {
- JChannelFactory cf = new JChannelFactory();
- cf.setMultiplexerConfig(DEFAULT_STACKS_FILE);
- cf.setExposeChannels(false);
- cf.start();
- CacheManager registry = new CacheManager(DEFAULT_CONFIGURATION_FILE, cf);
- registry.start();
-
- ConfigurationRegistry configRegistry = registry.getConfigurationRegistry();
-
- Set<String> configNames = registry.getConfigurationNames();
- assertEquals(7, configNames.size());
- Set<String> cacheNames = registry.getCacheNames();
- assertEquals(0, cacheNames.size());
-
- for (String configName : configNames)
- {
- assertNull(configName + " not created", registry.getCache(configName, false));
- Cache<Object, Object> cache = registry.getCache(configName, true);
- caches.add(cache);
-
- // Cache shouldn't be started
- assertEquals(CacheStatus.INSTANTIATED, cache.getCacheStatus());
- cache.create();
- cache.start();
-
- // Config should be a clone
- Configuration rawConfig = configRegistry.getConfiguration(configName);
- Configuration realConfig = cache.getConfiguration();
- assertFalse(rawConfig == realConfig);
- assertEquals(rawConfig.getClusterName(), realConfig.getClusterName());
- }
-
- cacheNames = registry.getCacheNames();
- assertEquals(configNames, cacheNames);
-
- // Test basic releasing of caches
- for (String configName : configNames)
- {
- registry.releaseCache(configName);
- }
-
- cacheNames = registry.getCacheNames();
- assertEquals(0, cacheNames.size());
-
- // We shouldn't have affected configuration set
- Set<String> configNames2 = registry.getConfigurationNames();
- assertEquals(configNames, configNames2);
-
- // Releasing only checkout of cache should have destroyed it
- for (Iterator<Cache<Object, Object>> it = caches.iterator(); it.hasNext();)
- {
- assertEquals(CacheStatus.DESTROYED, it.next().getCacheStatus());
- it.remove();
- }
-
- // Get cache w/o asking to create returns null
- String configName = configNames.iterator().next();
- assertNull(configName + " not created", registry.getCache(configName, false));
- // Get cache w/ asking to create returns cache
- Cache<Object, Object> cache = registry.getCache(configName, true);
- assertFalse(null == cache);
- caches.add(cache);
-
- cache.create();
- cache.start();
-
- // Test 2 checkouts of the same cache
- Cache<Object, Object> cache2 = registry.getCache(configName, true);
- assertEquals(cache, cache2);
-
- registry.releaseCache(configName);
-
- // One release does not cause registry to stop cache
- assertEquals(CacheStatus.STARTED, cache.getCacheStatus());
-
- registry.stop();
-
- // Should still not be stopped
- assertEquals(CacheStatus.STARTED, cache.getCacheStatus());
-
- registry.releaseCache(configName);
-
- // Now it should be stopped
- assertEquals(CacheStatus.DESTROYED, cache.getCacheStatus());
- caches.remove(cache);
-
- cacheNames = registry.getCacheNames();
- assertEquals(0, cacheNames.size());
- assertEquals(cacheNames, registry.getConfigurationNames());
- }
-
- /**
- * Confirms that the CacheManager can start if no config resource is provided.
- *
- * @throws Exception
- */
- public void testNullConfigResource() throws Exception
- {
- JChannelFactory cf = new JChannelFactory();
- cf.setMultiplexerConfig(DEFAULT_STACKS_FILE);
- String configResource = null;
- CacheManager registry = new CacheManager(configResource, cf);
- registry.start();
-
- assertEquals("No configs", 0, registry.getConfigurationNames().size());
- }
-
- public void testAliasing() throws Exception
- {
- JChannelFactory cf = new JChannelFactory();
- cf.setMultiplexerConfig(DEFAULT_STACKS_FILE);
- cf.setExposeChannels(false);
- cf.start();
- CacheManager registry = new CacheManager(DEFAULT_CONFIGURATION_FILE, cf);
- registry.start();
-
- Set<String> configNames = registry.getConfigurationNames();
- assertEquals(7, configNames.size());
-
- assertEquals(0, registry.getCacheNames().size());
-
- Map<String, String> aliases = new HashMap<String, String>();
- aliases.put("alias", DEFAULT_STACK);
- registry.setConfigAliases(aliases);
-
- Map<String, String> registered = registry.getConfigAliases();
- assertEquals(1, registered.size());
- assertEquals(DEFAULT_STACK, registered.get("alias"));
-
- configNames = registry.getConfigurationNames();
- assertEquals(8, configNames.size());
- assertTrue(configNames.contains("alias"));
-
- Cache cache = registry.getCache("alias", true);
- assertNotNull(cache);
- Cache other = registry.getCache(DEFAULT_STACK, false);
- assertEquals(cache, other);
-
- assertEquals(1, registry.getCacheNames().size());
-
- registry.releaseCache(DEFAULT_STACK);
-
- assertEquals(1, registry.getCacheNames().size());
-
- registry.releaseCache("alias");
-
- assertEquals(0, registry.getCacheNames().size());
-
- }
-
- public void testEagerStartCaches() throws Exception
- {
- JChannelFactory cf = new JChannelFactory();
- cf.setMultiplexerConfig(DEFAULT_STACKS_FILE);
- cf.setExposeChannels(false);
- cf.start();
- CacheManager registry = new CacheManager(DEFAULT_CONFIGURATION_FILE, cf);
-
- Set<String> cores = new HashSet<String>();
- cores.add("test1");
- cores.add("test2");
- registry.setEagerStartCaches(cores);
-
- registry.start();
-
- assertEquals(cores, registry.getCacheNames());
-
- Set<Cache> caches = new HashSet<Cache>();
-
- for (String name : cores)
- {
- Cache cache = registry.getCache(name, false);
- assertNotNull(cache);
- assertEquals(CacheStatus.STARTED, cache.getCacheStatus());
- caches.add(cache);
- }
-
- for (String name : cores)
- {
- registry.releaseCache(name);
- }
-
- for (Cache cache : caches)
- {
- assertEquals(CacheStatus.STARTED, cache.getCacheStatus());
- }
-
- registry.stop();
-
- for (Cache cache : caches)
- {
- assertEquals(CacheStatus.DESTROYED, cache.getCacheStatus());
- }
-
- }
-}
More information about the jboss-cvs-commits
mailing list