Author: jfrederic.clere(a)jboss.com Date: 2008-09-15 17:30:54 -0400 (Mon, 15 Sep 2008) New Revision: 1834 Modified: trunk/mod_cluster/test/java/.classpath trunk/mod_cluster/test/java/build.properties.default trunk/mod_cluster/test/java/build.xml trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java Log: Quick hack to test the listener in mod_cluster... Modified: trunk/mod_cluster/test/java/.classpath =================================================================== --- trunk/mod_cluster/test/java/.classpath 2008-09-15 21:29:48 UTC (rev 1833) +++ trunk/mod_cluster/test/java/.classpath 2008-09-15 21:30:54 UTC (rev 1834) @@ -11,5 +11,6 @@ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging.jar"/> <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-codec-1.3.jar"/> <classpathentry kind="var" path="TOMCAT_LIBS_BASE/junit-4.5/junit-4.5.jar"/> + <classpathentry kind="lib" path="../../mod_cluster/target/mod_cluster-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/mod_cluster/test/java/build.properties.default =================================================================== --- trunk/mod_cluster/test/java/build.properties.default 2008-09-15 21:29:48 UTC (rev 1833) +++ trunk/mod_cluster/test/java/build.properties.default 2008-09-15 21:30:54 UTC (rev 1834) @@ -38,3 +38,5 @@ base-jboss-ejb-api.home=${base.path}/${jboss-ejb-api.version}/lib jboss-ejb-api.jar.loc=${base-jboss.loc}/jboss-ejb-api/${jboss-ejb-api.version}/jboss-ejb-api-${jboss-ejb-api.version}.jar jboss-ejb-api.jar=${base.path}/${jboss-ejb-api.version}/jboss-ejb-api-spi-${jboss-ejb-api.version}.jar + +mod_cluster.jar=../../target/mod_cluster-1.0.0-SNAPSHOT.jar Modified: trunk/mod_cluster/test/java/build.xml =================================================================== --- trunk/mod_cluster/test/java/build.xml 2008-09-15 21:29:48 UTC (rev 1833) +++ trunk/mod_cluster/test/java/build.xml 2008-09-15 21:30:54 UTC (rev 1834) @@ -51,6 +51,9 @@ <pathelement location="${jboss-logging.jar}"/> <pathelement location="${jboss-ejb-api.jar}"/> + + <!-- Paul stuff --> + <pathelement location="${mod_cluster.jar}"/> <!-- <fileset dir="${jbossweb.build}/bin/"> <include name="tomcat-juli.jar"/> 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-15 21:29:48 UTC (rev 1833) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java 2008-09-15 21:30:54 UTC (rev 1834) @@ -43,12 +43,18 @@ public class Maintest extends TestCase { static StandardServer server = null; + static boolean isJBossWEB = true; public static void main( String args[] ) { TestRunner.run(suite()); } public static Test suite() { TestSuite suite = new TestSuite(); server = (StandardServer) ServerFactory.getServer(); + + // Read the -DJbossWEB=true/false. + String jbossweb = System.getProperty("JbossWEB"); + if (jbossweb != null) + isJBossWEB = false; // Read the -Dtest="value". String test = System.getProperty("test"); @@ -80,6 +86,9 @@ static StandardServer getServer() { return server; } + static boolean isJBossWEB() { + return isJBossWEB; + } /* Print the service and connectors the server knows */ static void listServices() { 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-15 21:29:48 UTC (rev 1833) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java 2008-09-15 21:30:54 UTC (rev 1834) @@ -52,7 +52,9 @@ int numbnodes = 10; String [] nodenames = new String [numbnodes]; JBossWeb [] service = new JBossWeb[numbnodes]; - ClusterListener cluster = null; + ClusterListener jcluster = null; + LifecycleListener lifecycle = null; + org.jboss.modcluster.ClusterListener pcluster = null; StandardServer server = Maintest.getServer(); for (int i=0; i<numbnodes; i++) { @@ -70,12 +72,19 @@ } } - cluster = new ClusterListener(); - cluster.setAdvertiseGroupAddress("232.0.0.2"); - cluster.setAdvertisePort(23364); - cluster.setSsl(false); + 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(); + lifecycle = pcluster; + } + // SSL ? - server.addLifecycleListener((LifecycleListener) cluster); + server.addLifecycleListener(lifecycle); // Debug Stuff Maintest.listServices(); @@ -92,7 +101,11 @@ } // Read the result via INFO. - String result = cluster.getProxyInfo(); + String result = null; + if (Maintest.isJBossWEB()) + result = jcluster.getProxyInfo(); + else + result = pcluster.getProxyList(); ArrayList nodes = new ArrayList(); if (result != null) { System.out.println(result); @@ -153,7 +166,7 @@ for (int i=0; i<numbnodes; i++) { server.removeService(service[i]); } - server.removeLifecycleListener(cluster); + server.removeLifecycleListener(lifecycle); } catch (InterruptedException ex) { ex.printStackTrace(); fail("can't stop service");