Author: jfrederic.clere(a)jboss.com Date: 2008-09-17 11:50:14 -0400 (Wed, 17 Sep 2008) New Revision: 1849 Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java Log: Move the choice of the clusterlistener to Maintest. Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java 2008-09-17 15:49:56 UTC (rev 1848) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java 2008-09-17 15:50:14 UTC (rev 1849) @@ -40,6 +40,10 @@ import org.apache.catalina.core.StandardServer; import org.apache.catalina.connector.Connector; +import org.apache.catalina.LifecycleListener; + +import org.jboss.web.cluster.ClusterListener; + public class Maintest extends TestCase { static StandardServer server = null; @@ -107,4 +111,37 @@ } } } + static LifecycleListener createClusterListener(String groupa, int groupp, boolean ssl) { + LifecycleListener lifecycle = null; + ClusterListener jcluster = null; + org.jboss.modcluster.ClusterListener pcluster = null; + + if (isJBossWEB) { + jcluster = new ClusterListener(); + jcluster.setAdvertiseGroupAddress(groupa); + jcluster.setAdvertisePort(groupp); + jcluster.setSsl(ssl); + lifecycle = jcluster; + } else { + pcluster = new org.jboss.modcluster.ClusterListener(); + pcluster.setAdvertiseGroupAddress(groupa); + pcluster.setAdvertisePort(groupp); + pcluster.setSsl(ssl); + lifecycle = pcluster; + + } + + return lifecycle; + } + static String getProxyInfo(LifecycleListener lifecycle) { + String result = null; + if (isJBossWEB) { + ClusterListener jcluster = (ClusterListener) lifecycle; + result = jcluster.getProxyInfo(); + } else { + org.jboss.modcluster.ClusterListener pcluster = (org.jboss.modcluster.ClusterListener) lifecycle; + result = pcluster.getProxyInfo(); + } + return result; + } } Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java 2008-09-17 15:49:56 UTC (rev 1848) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java 2008-09-17 15:50:14 UTC (rev 1849) @@ -41,8 +41,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardServer; -import org.jboss.web.cluster.ClusterListener; - public class TestAddDel extends TestCase { /* Test */ @@ -52,9 +50,7 @@ int numbnodes = 10; String [] nodenames = new String [numbnodes]; JBossWeb [] service = new JBossWeb[numbnodes]; - ClusterListener jcluster = null; LifecycleListener lifecycle = null; - org.jboss.modcluster.ClusterListener pcluster = null; StandardServer server = Maintest.getServer(); for (int i=0; i<numbnodes; i++) { @@ -72,21 +68,8 @@ } } - if (Maintest.isJBossWEB()) { - jcluster = new ClusterListener(); - jcluster.setAdvertiseGroupAddress("232.0.0.2"); - jcluster.setAdvertisePort(23364); - jcluster.setSsl(false); - lifecycle = jcluster; - } else { - pcluster = new org.jboss.modcluster.ClusterListener(); - pcluster.setAdvertiseGroupAddress("232.0.0.2"); - pcluster.setAdvertisePort(23364); - pcluster.setSsl(false); - lifecycle = pcluster; - } + lifecycle = Maintest.createClusterListener("232.0.0.2", 23364, false); - // SSL ? server.addLifecycleListener(lifecycle); // Debug Stuff @@ -104,11 +87,8 @@ } // Read the result via INFO. - String result = null; - if (Maintest.isJBossWEB()) - result = jcluster.getProxyInfo(); - else - result = pcluster.getProxyInfo(); + String result = Maintest.getProxyInfo(lifecycle); + ArrayList nodes = new ArrayList(); if (result != null) { System.out.println(result);