Author: jfrederic.clere(a)jboss.com Date: 2008-09-17 12:33:20 -0400 (Wed, 17 Sep 2008) New Revision: 1855 Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/ServerThread.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestBase.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailover.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestJBWEB_117.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Chunk_JBWEB_117.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java Log: Move the choice of the clusterlistener to Maintest into all classes. Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java 2008-09-17 16:12:44 UTC (rev 1854) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java 2008-09-17 16:33:20 UTC (rev 1855) @@ -42,7 +42,7 @@ import org.apache.catalina.core.*; import org.apache.catalina.startup.HostConfig; -import org.jboss.web.cluster.ClusterListener; +import org.apache.catalina.LifecycleListener; public class JBossWeb extends Embedded { @@ -204,12 +204,8 @@ service2.addConnector(8000); server.addService(service2); - ClusterListener cluster = new ClusterListener(); - cluster.setAdvertiseGroupAddress("232.0.0.2"); - cluster.setAdvertisePort(23364); - cluster.setSsl(false); - // SSL ? - server.addLifecycleListener((LifecycleListener) cluster); + LifecycleListener cluster = Maintest.createClusterListener("232.0.0.2", 23364, false); + server.addLifecycleListener(cluster); Service[] services = server.findServices(); for (int i = 0; i < services.length; i++) { Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/ServerThread.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/ServerThread.java 2008-09-17 16:12:44 UTC (rev 1854) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/ServerThread.java 2008-09-17 16:33:20 UTC (rev 1855) @@ -37,8 +37,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardServer; -import org.jboss.web.cluster.ClusterListener; - public class ServerThread extends Thread { int delay; boolean ok = true; Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestBase.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestBase.java 2008-09-17 16:12:44 UTC (rev 1854) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestBase.java 2008-09-17 16:33:20 UTC (rev 1855) @@ -39,8 +39,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardServer; -import org.jboss.web.cluster.ClusterListener; - public class TestBase extends TestCase { /* Test */ @@ -50,7 +48,7 @@ StandardServer server = Maintest.getServer(); JBossWeb service = null; JBossWeb service2 = null; - ClusterListener cluster = null; + LifecycleListener cluster = null; try { // server = (StandardServer) ServerFactory.getServer(); @@ -62,12 +60,8 @@ service2.addConnector(8000); server.addService(service2); - cluster = new ClusterListener(); - cluster.setAdvertiseGroupAddress("232.0.0.2"); - cluster.setAdvertisePort(23364); - cluster.setSsl(false); - // SSL ? - server.addLifecycleListener((LifecycleListener) cluster); + cluster = Maintest.createClusterListener("232.0.0.2", 23364, false); + server.addLifecycleListener(cluster); // Debug Stuff Maintest.listServices(); Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailover.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailover.java 2008-09-17 16:12:44 UTC (rev 1854) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailover.java 2008-09-17 16:33:20 UTC (rev 1855) @@ -39,8 +39,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardServer; -import org.jboss.web.cluster.ClusterListener; - public class TestFailover extends TestCase { StandardServer server = null; @@ -51,7 +49,7 @@ boolean clienterror = false; server = Maintest.getServer(); JBossWeb service = null; - ClusterListener cluster = null; + LifecycleListener cluster = null; try { // server = (StandardServer) ServerFactory.getServer(); @@ -59,13 +57,8 @@ service.addConnector(8009); server.addService(service); - cluster = new ClusterListener(); - cluster.setAdvertiseGroupAddress("232.0.0.2"); - cluster.setAdvertisePort(23364); - cluster.setSsl(false); - - // SSL ? - server.addLifecycleListener((LifecycleListener) cluster); + cluster = Maintest.createClusterListener("232.0.0.2", 23364, false); + server.addLifecycleListener(cluster); Maintest.listServices(); } catch(IOException ex) { @@ -116,14 +109,9 @@ service.addConnector(8000); server.addService(service); - cluster = new ClusterListener(); - cluster.setAdvertiseGroupAddress("232.0.0.2"); - cluster.setAdvertisePort(23364); - cluster.setSsl(false); + cluster = Maintest.createClusterListener("232.0.0.2", 23364, false); + server.addLifecycleListener(cluster); - // SSL ? - server.addLifecycleListener((LifecycleListener) cluster); - } catch(IOException ex) { ex.printStackTrace(); fail("Server start() failed"); Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestJBWEB_117.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestJBWEB_117.java 2008-09-17 16:12:44 UTC (rev 1854) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestJBWEB_117.java 2008-09-17 16:33:20 UTC (rev 1855) @@ -43,10 +43,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardServer; -import org.jboss.web.cluster.ClusterListener; - -import org.apache.catalina.core.AprLifecycleListener; - public class TestJBWEB_117 extends TestCase { /* Test for JBWEB-117 */ Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Chunk_JBWEB_117.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Chunk_JBWEB_117.java 2008-09-17 16:12:44 UTC (rev 1854) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Chunk_JBWEB_117.java 2008-09-17 16:33:20 UTC (rev 1855) @@ -42,10 +42,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardServer; -import org.jboss.web.cluster.ClusterListener; - -import org.apache.catalina.core.AprLifecycleListener; - public class Test_Chunk_JBWEB_117 extends TestCase { /* Test for JBWEB-117 */ Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java 2008-09-17 16:12:44 UTC (rev 1854) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java 2008-09-17 16:33:20 UTC (rev 1855) @@ -40,8 +40,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardServer; -import org.jboss.web.cluster.ClusterListener; - import org.apache.catalina.core.AprLifecycleListener; public class Test_Native_JBWEB_117 extends TestCase {