[jboss-cvs] JBossAS SVN: r72698 - in trunk/testsuite: imports/config and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 24 15:43:07 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-04-24 15:43:07 -0400 (Thu, 24 Apr 2008)
New Revision: 72698
Added:
trunk/testsuite/src/resources/cluster/classloader/leak/war/nocluster/
trunk/testsuite/src/resources/cluster/classloader/leak/war/nocluster/WEB-INF/
trunk/testsuite/src/resources/cluster/classloader/leak/war/nocluster/WEB-INF/web.xml
Modified:
trunk/testsuite/imports/config/tests-clustering.xml
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/ClassloaderLeakUnitTestCase.java
Log:
Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml 2008-04-24 19:37:28 UTC (rev 72697)
+++ trunk/testsuite/imports/config/tests-clustering.xml 2008-04-24 19:43:07 UTC (rev 72698)
@@ -54,6 +54,9 @@
<patternset id="cluster.multicfg.http.jk.includes">
<include name="org/jboss/test/cluster/multicfg/web/jk/test/*TestCase.class"/>
</patternset>
+ <patternset id="cluster.classloader.leak.includes">
+ <include name="org/jboss/test/cluster/classloader/leak/test/*TestCase.class"/>
+ </patternset>
<patternset id="cluster.excludes">
<exclude name="org/jboss/test/cluster/**/*TestCase.class"/>
</patternset>
@@ -292,8 +295,31 @@
<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>
+ <target name="tests-clustered-classloader-leak">
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+
+ <create-cluster-node conf="cluster-classloader-leak-0"/>
+ <create-cluster-node conf="cluster-classloader-leak-1"/>
+
+ <server:start name="cluster-classloader-leak-0"/>
+ <server:start name="cluster-classloader-leak-1"/>
+
+ <antcall target="tests-clustering-unit">
+ <param name="cluster.includes.refid" value="cluster.classloader.leak.includes"/>
+ <param name="jboss-junit-configuration" value="ClusteredClassLoaderLeak"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-classloader-leak-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-classloader-leak-1"/>
+ </antcall>
+
+ <server:stop name="cluster-classloader-leak-0"/>
+ <server:stop name="cluster-classloader-leak-1"/>
+
+ </target>
+
<!-- Executes a set of tests in a clustered environment -->
<target name="tests-clustering-unit">
<mkdir dir="${build.reports}"/>
@@ -517,7 +543,7 @@
<server:stop name="cluster-${jboss-junit-configuration}-1"/>
</target>
- <!-- Runs only the basic http tests (ASYNC, with BR) -->
+ <!-- Runs only the basic http tests (ASYNC, no BR) -->
<target name="tests-clustering-http">
<property name="jboss-junit-configuration" value="udp"/>
@@ -527,8 +553,6 @@
<server:start name="cluster-${jboss-junit-configuration}-0"/>
<server:start name="cluster-${jboss-junit-configuration}-1"/>
- <echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, with BR)"/>
-
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
@@ -540,7 +564,29 @@
<server:stop name="cluster-${jboss-junit-configuration}-1"/>
</target>
- <!-- Runs only the basic field tests (ASYNC, with BR) -->
+ <!-- Runs only the basic http tests (ASYNC, with BR) -->
+ <target name="tests-clustering-http-br">
+
+ <property name="jboss-junit-configuration" value="udp"/>
+
+ <antcall target="tests-clustering-configure" inheritRefs="true"/>
+
+ <server:start name="cluster-${jboss-junit-configuration}-BR-0"/>
+ <server:start name="cluster-${jboss-junit-configuration}-BR-1"/>
+
+ <antcall target="tests-clustering-unit">
+ <param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-standard-session-cache"/>
+ <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"/>
+ </target>
+
+ <!-- Runs only the basic field tests (ASYNC, no BR) -->
<target name="tests-clustering-field">
<property name="jboss-junit-configuration" value="udp"/>
@@ -564,4 +610,28 @@
</target>
+ <!-- Runs only the basic field tests (ASYNC, with BR) -->
+ <target name="tests-clustering-field-br">
+
+ <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">
+ <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.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>
\ No newline at end of file
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2008-04-24 19:37:28 UTC (rev 72697)
+++ trunk/testsuite/imports/sections/cluster.xml 2008-04-24 19:43:07 UTC (rev 72698)
@@ -518,6 +518,17 @@
<include name="org/jboss/test/cluster/classloader/leak/web/*"/>
</classes>
</war>
+ <war destfile="${build.lib}/cluster-clleak-nocluster-replicable.war"
+ webxml="${build.resources}/cluster/classloader/leak/war/nocluster/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/*"/>
+ <include name="org/jboss/test/cluster/classloader/leak/web/aop/*"/>
+ </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}">
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-04-24 19:37:28 UTC (rev 72697)
+++ trunk/testsuite/imports/server-config.xml 2008-04-24 19:43:07 UTC (rev 72698)
@@ -601,6 +601,32 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
+ <server name="cluster-classloader-leak-0" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <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.messaging.ServerPeerID" value="0" />
+ <sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="jboss.partition.name" value="${partitionName}"/>
+ </server>
+ <server name="cluster-classloader-leak-1" host="${node1}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <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.messaging.ServerPeerID" value="1" />
+ <sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="jboss.partition.name" value="${partitionName}"/>
+ </server>
<server name="profileservice" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/ClassloaderLeakUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/ClassloaderLeakUnitTestCase.java 2008-04-24 19:37:28 UTC (rev 72697)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/ClassloaderLeakUnitTestCase.java 2008-04-24 19:43:07 UTC (rev 72698)
@@ -48,6 +48,7 @@
private static final String SIMPLE_REPLICABLE_WAR = "cluster-clleak-simple-replicable.war";
private static final String FIELD_WAR = "cluster-clleak-field.war";
private static final String FIELD_NO_REPLICABLE_WAR = "cluster-clleak-field-no-replicable.war";
+ private static final String NO_CLUSTER_REPLICABLE_WAR = "cluster-clleak-nocluster-replicable.war";
private static final String SIMPLE_EJB = "cluster-clleak-ejb.jar";
private static final String SIMPLE_EAR = "cluster clleak-simple.ear";
private static final String SIMPLE_ISOLATED_EAR = "cluster-clleak-simple-isolated.ear";
@@ -73,26 +74,31 @@
return getDeploySetup(ClassloaderLeakUnitTestCase.class, "classloader-leak-test.sar");
}
- public void testSimpleWar() throws Exception
- {
- warTest(SIMPLE_WAR);
- }
+// public void testSimpleWar() throws Exception
+// {
+// warTest(SIMPLE_WAR);
+// }
+//
+// public void testSimpleReplicableWar() throws Exception
+// {
+// warTest(SIMPLE_REPLICABLE_WAR);
+// }
+//
+// public void testFieldWar() throws Exception
+// {
+// warTest(FIELD_WAR);
+// }
+//
+// public void testFieldNoReplicableWar() throws Exception
+// {
+// warTest(FIELD_NO_REPLICABLE_WAR);
+// }
- public void testSimpleReplicableWar() throws Exception
+ public void testNoClusterReplicableWar() throws Exception
{
- warTest(SIMPLE_REPLICABLE_WAR);
+ warTest(NO_CLUSTER_REPLICABLE_WAR);
}
- public void testFieldWar() throws Exception
- {
- warTest(FIELD_WAR);
- }
-
- public void testFieldNoReplicableWar() throws Exception
- {
- warTest(FIELD_NO_REPLICABLE_WAR);
- }
-
// public void testSimpleEjb() throws Exception
// {
// ejbTest(SIMPLE_EJB);
Added: trunk/testsuite/src/resources/cluster/classloader/leak/war/nocluster/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/classloader/leak/war/nocluster/WEB-INF/web.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/classloader/leak/war/nocluster/WEB-INF/web.xml 2008-04-24 19:43:07 UTC (rev 72698)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+ <!-- NOT distributable
+ <distributable/>
+ -->
+
+ <!-- Registers an mbean the test driver can use to check the cache state -->
+ <listener>
+ <listener-class>org.jboss.test.classloader.leak.web.ClassloaderLeakContextListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>ReplicableServlet</servlet-name>
+ <servlet-class>org.jboss.test.cluster.classloader.leak.web.ReplicableServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ReplicableServlet</servlet-name>
+ <url-pattern>/SimpleServlet</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: trunk/testsuite/src/resources/cluster/classloader/leak/war/nocluster/WEB-INF/web.xml
___________________________________________________________________
Name: svn:executable
+ *
More information about the jboss-cvs-commits
mailing list