[jboss-cvs] JBossAS SVN: r63848 - in trunk/testsuite: imports/sections and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 5 18:34:30 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-07-05 18:34:30 -0400 (Thu, 05 Jul 2007)
New Revision: 63848
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperServletContextListener.java
trunk/testsuite/src/resources/cluster/http/http-cross-ctx-first/WEB-INF/web.xml
trunk/testsuite/src/resources/cluster/http/http-cross-ctx-second/WEB-INF/web.xml
trunk/testsuite/src/resources/cluster/http/http-cross-ctx-third/WEB-INF/web.xml
trunk/testsuite/src/resources/cluster/http/http-field-jdk5/WEB-INF/web.xml
trunk/testsuite/src/resources/cluster/http/http-field/WEB-INF/web.xml
trunk/testsuite/src/resources/cluster/http/http-jk/WEB-INF/web.xml
trunk/testsuite/src/resources/cluster/http/http-scoped/WEB-INF/web.xml
trunk/testsuite/src/resources/cluster/http/web.xml
Log:
Deploy CacheHelper as a SAR rather than via a ServletContextListener
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/build.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -594,7 +594,7 @@
</patternset>
<!-- patternsets for that require clustering to be enabled -->
<patternset id="cluster.field.includes">
- <include name="org/jboss/test/cluster/test/*FieldBasedTestCase.class"/>
+ <include name="org/jboss/test/cluster/test/*FieldBased*TestCase.class"/>
<include name="org/jboss/test/cluster/test/StateTransferTestCase.class"/>
<include name="org/jboss/test/cluster/test/UndeployFieldTestCase.class"/>
</patternset>
@@ -612,7 +612,7 @@
<exclude name="org/jboss/test/cluster/test/*ConcurrentTestCase.class"/>
<exclude name="org/jboss/test/cluster/test/FormAuthFailoverTestCase.class"/>
<!-- Exclude the FIELD granularity tests, as they require a different config -->
- <exclude name="org/jboss/test/cluster/test/*FieldBasedTestCase.class"/>
+ <exclude name="org/jboss/test/cluster/test/*FieldBased*TestCase.class"/>
<exclude name="org/jboss/test/cluster/test/StateTransferTestCase.class"/>
<exclude name="org/jboss/test/cluster/test/UndeployFieldTestCase.class"/>
</patternset>
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/imports/sections/cluster.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -79,9 +79,19 @@
</jar>
<!--beans for testing HASingletonElectionPolicy -->
- <copy todir="${build.lib}"
- file="${build.resources}/ha/electionpolicy/ha-electionpolicy-beans.xml"
- overwrite="true"/>
+ <copy todir="${build.lib}"
+ file="${build.resources}/ha/electionpolicy/ha-electionpolicy-beans.xml"
+ overwrite="true"/>
+
+ <!-- Remote interface to JBoss Cache -->
+ <jar destfile="${build.lib}/jbosscache-helper.sar">
+ <metainf dir="${build.resources}/cluster/web/cachehelper">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cluster/web/CacheHelper*"/>
+ </fileset>
+ </jar>
<!-- build httpsessionreplication.jar -->
<war warfile="${build.lib}/http-sr.war"
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java 2007-07-05 22:34:30 UTC (rev 63848)
@@ -54,7 +54,7 @@
public static Test suite() throws Exception
{
Test t1 = JBossClusteredTestCase.getDeploySetup(FieldBasedTestCase.class,
- "http-field.war");
+ "jbosscache-helper.sar, http-field.war");
return t1;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java 2007-07-05 22:34:30 UTC (rev 63848)
@@ -45,7 +45,7 @@
public static Test suite() throws Exception
{
Test t1 = JBossClusteredTestCase.getDeploySetup(SimpleTestCase.class,
- "http-sr.war");
+ "jbosscache-helper.sar, http-sr.war");
return t1;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java 2007-07-05 22:34:30 UTC (rev 63848)
@@ -98,7 +98,7 @@
public static Test suite() throws Exception
{
Test t1 = JBossClusteredTestCase.getDeploySetup(StateTransferTestCase.class,
- "http-scoped.war");
+ "jbosscache-helper.sar, http-scoped.war");
return t1;
}
@@ -122,20 +122,6 @@
}
}
- protected void tearDown() throws Exception
- {
- try
- {
- SessionTestUtil.uninstallHelper(adaptor0_);
- }
- catch (Exception e) {}
- try
- {
- SessionTestUtil.uninstallHelper(adaptor1_);
- }
- catch (Exception e) {}
- }
-
protected String getWarName()
{
return "http-scoped";
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java 2007-07-05 22:34:30 UTC (rev 63848)
@@ -26,7 +26,6 @@
import java.util.Iterator;
import java.util.Set;
-import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.jboss.cache.Cache;
@@ -37,6 +36,7 @@
import org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.ObjectNameFactory;
+import org.jboss.system.ServiceMBeanSupport;
/**
* Helper class to locate and invoke methods on the cache mbean used by Tomcat.
@@ -45,7 +45,9 @@
* Date: Aug 16, 2005
* @version $Id$
*/
-public class CacheHelper implements CacheHelperMBean
+public class CacheHelper
+ extends ServiceMBeanSupport
+ implements CacheHelperMBean
{
public static final ObjectName OBJECT_NAME =
ObjectNameFactory.create("jboss.test:service=WebTestCacheHelper");
@@ -54,13 +56,11 @@
"jboss.cache:service=TomcatClusteringCache";
private static final String VERSION_KEY = "VERSION";
- private MBeanServer server;
private PojoCache pojoCache;
private boolean leaveInstalledAfterShutdown;
- public CacheHelper(MBeanServer server)
- {
- this.server = server;
+ public CacheHelper()
+ {
}
public static PojoCache getCacheInstance()
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperServletContextListener.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperServletContextListener.java 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperServletContextListener.java 2007-07-05 22:34:30 UTC (rev 63848)
@@ -16,7 +16,7 @@
server = MBeanServerLocator.locateJBoss();
if (!server.isRegistered(CacheHelper.OBJECT_NAME))
{
- helper = new CacheHelper(server);
+ helper = new CacheHelper();
try
{
server.registerMBean(helper, CacheHelper.OBJECT_NAME);
Modified: trunk/testsuite/src/resources/cluster/http/http-cross-ctx-first/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/http-cross-ctx-first/WEB-INF/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/http-cross-ctx-first/WEB-INF/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -8,11 +8,6 @@
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>Restricted</web-resource-name>
Modified: trunk/testsuite/src/resources/cluster/http/http-cross-ctx-second/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/http-cross-ctx-second/WEB-INF/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/http-cross-ctx-second/WEB-INF/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -8,11 +8,6 @@
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>Restricted</web-resource-name>
Modified: trunk/testsuite/src/resources/cluster/http/http-cross-ctx-third/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/http-cross-ctx-third/WEB-INF/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/http-cross-ctx-third/WEB-INF/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -8,11 +8,6 @@
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>Restricted</web-resource-name>
Modified: trunk/testsuite/src/resources/cluster/http/http-field/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/http-field/WEB-INF/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/http-field/WEB-INF/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -8,11 +8,6 @@
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>Restricted</web-resource-name>
Modified: trunk/testsuite/src/resources/cluster/http/http-field-jdk5/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/http-field-jdk5/WEB-INF/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/http-field-jdk5/WEB-INF/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -8,11 +8,6 @@
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>Restricted</web-resource-name>
Modified: trunk/testsuite/src/resources/cluster/http/http-jk/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/http-jk/WEB-INF/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/http-jk/WEB-INF/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -8,9 +8,4 @@
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
</web-app>
Modified: trunk/testsuite/src/resources/cluster/http/http-scoped/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/http-scoped/WEB-INF/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/http-scoped/WEB-INF/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -8,11 +8,6 @@
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>Restricted</web-resource-name>
Modified: trunk/testsuite/src/resources/cluster/http/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/web.xml 2007-07-05 21:59:39 UTC (rev 63847)
+++ trunk/testsuite/src/resources/cluster/http/web.xml 2007-07-05 22:34:30 UTC (rev 63848)
@@ -11,11 +11,6 @@
</description>
<distributable/>
- <!-- Registers an mbean the test driver can use to check the cache state -->
- <listener>
- <listener-class>org.jboss.test.cluster.web.CacheHelperServletContextListener</listener-class>
- </listener>
-
<!-- timeout is set to 60 seconds -->
<session-config>
<session-timeout>1</session-timeout>
More information about the jboss-cvs-commits
mailing list