JBoss Native SVN: r1860 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 21:47:00 -0400 (Wed, 17 Sep 2008)
New Revision: 1860
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java
Log:
More logic consolidation
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java 2008-09-17 22:42:20 UTC (rev 1859)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java 2008-09-18 01:47:00 UTC (rev 1860)
@@ -171,31 +171,41 @@
public static MCMPRequest createEnableAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.ENABLE_APP, false, createContextParameters(context));
+ return createRequest(MCMPRequestType.ENABLE_APP, context);
}
public static MCMPRequest createDisableAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.DISABLE_APP, false, createContextParameters(context));
+ return createRequest(MCMPRequestType.DISABLE_APP, context);
}
public static MCMPRequest createStopAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.STOP_APP, false, createContextParameters(context));
+ return createRequest(MCMPRequestType.STOP_APP, context);
}
public static MCMPRequest createRemoveAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.REMOVE_APP, false, createContextParameters(context));
+ return createRequest(MCMPRequestType.REMOVE_APP, context);
}
- public static MCMPRequest createStatusRequest(Engine engine, int lbf)
+ private static MCMPRequest createRequest(MCMPRequestType type, Context context)
{
Map<String, String> parameters = new HashMap<String, String>();
- parameters.put("JVMRoute", engine.getJvmRoute());
- parameters.put("Load", String.valueOf(lbf));
- return new MCMPRequest(MCMPRequestType.STATUS, false, parameters);
+ parameters.put("JVMRoute", Utils.getJvmRoute(context));
+
+ String path = context.getPath();
+
+ parameters.put("Context", "".equals(path) ? "/" : path);
+ parameters.put("Alias", Utils.getHost(context));
+
+ return new MCMPRequest(type, false, parameters);
}
+
+ public static MCMPRequest createStatusRequest(Engine engine, int lbf)
+ {
+ return createStatusRequest(engine.getJvmRoute(), lbf);
+ }
public static MCMPRequest createStatusRequest(String jvmRoute, int lbf)
{
@@ -207,19 +217,24 @@
public static MCMPRequest createEnableEngineRequest(Engine engine)
{
- return new MCMPRequest(MCMPRequestType.ENABLE_APP, true, createEngineParameters(engine));
+ return createRequest(MCMPRequestType.ENABLE_APP, engine);
}
public static MCMPRequest createDisableEngineRequest(Engine engine)
{
- return new MCMPRequest(MCMPRequestType.DISABLE_APP, true, createEngineParameters(engine));
+ return createRequest(MCMPRequestType.DISABLE_APP, engine);
}
public static MCMPRequest createRemoveAllRequest(Engine engine)
{
- return new MCMPRequest(MCMPRequestType.REMOVE_APP, true, createEngineParameters(engine));
+ return createRequest(MCMPRequestType.REMOVE_APP, engine);
}
+ private static MCMPRequest createRequest(MCMPRequestType type, Engine engine)
+ {
+ return new MCMPRequest(type, true, Collections.singletonMap("JVMRoute", engine.getJvmRoute()));
+ }
+
/**
* Reset configuration for a particular proxy following an error.
*/
@@ -258,26 +273,6 @@
return INFO;
}
- private static Map<String, String> createEngineParameters(Engine engine)
- {
- Map<String, String> parameters = new HashMap<String, String>();
- parameters.put("JVMRoute", engine.getJvmRoute());
- return parameters;
- }
-
- private static Map<String, String> createContextParameters(Context context)
- {
- Map<String, String> parameters = new HashMap<String, String>();
- parameters.put("JVMRoute", Utils.getJvmRoute(context));
-
- String path = context.getPath();
-
- parameters.put("Context", "".equals(path) ? "/" : path);
- parameters.put("Alias", Utils.getHost(context));
-
- return parameters;
- }
-
public static AddressPort parseAddressPort(String addressPort)
{
try
17 years, 3 months
JBoss Native SVN: r1859 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 18:42:20 -0400 (Wed, 17 Sep 2008)
New Revision: 1859
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/MBeanQueryLoadMetricSource.java
Log:
Fixed NullPointerException when load is queried via mbean.
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/MBeanQueryLoadMetricSource.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/MBeanQueryLoadMetricSource.java 2008-09-17 20:55:28 UTC (rev 1858)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/MBeanQueryLoadMetricSource.java 2008-09-17 22:42:20 UTC (rev 1859)
@@ -65,13 +65,18 @@
* @{inheritDoc}
* @see org.jboss.modcluster.load.metric.impl.AbstractLoadMetricSource#prepare()
*/
- @SuppressWarnings("unchecked")
@Override
public void prepare()
{
- this.objectNames = this.pattern.isPattern() ? this.server.queryNames(this.pattern, null) : Collections.singleton(this.pattern);
+ this.objectNames = this.queryNames();
}
+ @SuppressWarnings("unchecked")
+ private Set<ObjectName> queryNames()
+ {
+ return this.pattern.isPattern() ? this.server.queryNames(this.pattern, null) : Collections.singleton(this.pattern);
+ }
+
/**
* @{inheritDoc}
* @see org.jboss.modcluster.load.metric.impl.AbstractLoadMetricSource#cleanup()
@@ -92,9 +97,12 @@
*/
public <T> List<T> getAttributes(String attribute, Class<T> targetClass) throws JMException
{
- List<T> list = new ArrayList<T>(this.objectNames.size());
+ // In case load was queried via mbean
+ Set<ObjectName> names = (this.objectNames != null) ? this.objectNames : this.queryNames();
- for (ObjectName name: this.objectNames)
+ List<T> list = new ArrayList<T>(names.size());
+
+ for (ObjectName name: names)
{
list.add(targetClass.cast(this.server.getAttribute(name, attribute)));
}
17 years, 3 months
JBoss Native SVN: r1858 - trunk/mod_cluster.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 16:55:28 -0400 (Wed, 17 Sep 2008)
New Revision: 1858
Modified:
trunk/mod_cluster/pom.xml
Log:
Upgrade dependencies
Modified: trunk/mod_cluster/pom.xml
===================================================================
--- trunk/mod_cluster/pom.xml 2008-09-17 20:54:39 UTC (rev 1857)
+++ trunk/mod_cluster/pom.xml 2008-09-17 20:55:28 UTC (rev 1858)
@@ -59,7 +59,7 @@
<dependency>
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>2.1.1.CR6</version>
+ <version>2.1.1.CR7</version>
</dependency>
<dependency>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta14</version>
+ <version>2.0.0.CR1</version>
</dependency>
<!-- Test dependencies -->
17 years, 3 months
JBoss Native SVN: r1857 - trunk/mod_cluster/test/java.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-17 16:54:39 -0400 (Wed, 17 Sep 2008)
New Revision: 1857
Modified:
trunk/mod_cluster/test/java/Advertize.java
Log:
Put values corresponding to default values of mod_cluster.
Modified: trunk/mod_cluster/test/java/Advertize.java
===================================================================
--- trunk/mod_cluster/test/java/Advertize.java 2008-09-17 20:30:42 UTC (rev 1856)
+++ trunk/mod_cluster/test/java/Advertize.java 2008-09-17 20:54:39 UTC (rev 1857)
@@ -6,7 +6,7 @@
{
public static void main(String[] args) throws Exception
{
- InetAddress group = InetAddress.getByName("228.5.6.7");
+ InetAddress group = InetAddress.getByName("232.0.0.2");
MulticastSocket s = new MulticastSocket(23364);
s.joinGroup(group);
byte[] buf = new byte[1000];
17 years, 3 months
JBoss Native SVN: r1856 - trunk/mod_cluster.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 16:30:42 -0400 (Wed, 17 Sep 2008)
New Revision: 1856
Modified:
trunk/mod_cluster/pom.xml
Log:
Make sure non-java resources from src/main/java are included in the jar.
Modified: trunk/mod_cluster/pom.xml
===================================================================
--- trunk/mod_cluster/pom.xml 2008-09-17 16:33:20 UTC (rev 1855)
+++ trunk/mod_cluster/pom.xml 2008-09-17 20:30:42 UTC (rev 1856)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,6 +20,14 @@
</scm>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
17 years, 3 months
JBoss Native SVN: r1855 - trunk/mod_cluster/test/java/org/jboss/mod_cluster.
by jbossnative-commits＠lists.jboss.org
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 {
17 years, 3 months
JBoss Native SVN: r1854 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-17 12:12:44 -0400 (Wed, 17 Sep 2008)
New Revision: 1854
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
Log:
Remove the INFO before the reset of the configuration.
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-17 16:08:13 UTC (rev 1853)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-17 16:12:44 UTC (rev 1854)
@@ -459,33 +459,31 @@
lock.lock();
try
- {
+ {
+ // Reset the node information after an error.
for (Proxy proxy: this.proxies)
{
if (proxy.getState() == Proxy.State.ERROR)
{
proxy.setState(Proxy.State.OK);
+
+ // We recovered above; if we get another IOException
+ // we should log it
+ proxy.setIoExceptionLogged(false);
- this.sendRequest(MCMPUtils.getInfoRequest(), proxy);
-
- if (proxy.getState() == Proxy.State.OK)
+ if (sendResetRequests)
{
- // We recovered above; if we get another IOException
- // we should log it
- proxy.setIoExceptionLogged(false);
-
- if (sendResetRequests)
+ if (resetRequests == null)
{
- if (resetRequests == null)
- {
- resetRequests = this.resetRequestSource.getResetRequests();
- }
-
- for (MCMPRequest request: resetRequests)
- {
- this.sendRequest(request, proxy);
- }
+ resetRequests = this.resetRequestSource.getResetRequests();
}
+
+ for (MCMPRequest request: resetRequests)
+ {
+ this.sendRequest(request, proxy);
+ }
+ } else {
+ this.sendRequest(MCMPUtils.getInfoRequest(), proxy);
}
}
}
17 years, 3 months
JBoss Native SVN: r1853 - trunk/mod_cluster/src/test/java/org/jboss/modcluster.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 12:08:13 -0400 (Wed, 17 Sep 2008)
New Revision: 1853
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java
Log:
Fixed expected Host address in CONFIG
Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java
===================================================================
--- trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-09-17 16:07:42 UTC (rev 1852)
+++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-09-17 16:08:13 UTC (rev 1853)
@@ -524,7 +524,7 @@
assertEquals(17, parameters.size());
assertEquals("host1", parameters.get("JVMRoute"));
- assertEquals("172.0.0.1", parameters.get("Host"));
+ assertEquals("127.0.0.1", parameters.get("Host"));
assertEquals("0", parameters.get("Port"));
assertEquals("ajp", parameters.get("Type"));
assertEquals("domain", parameters.get("Domain"));
17 years, 3 months
JBoss Native SVN: r1852 - trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 12:07:42 -0400 (Wed, 17 Sep 2008)
New Revision: 1852
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java
Log:
Fixed expected Host address in CONFIG
Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java
===================================================================
--- trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java 2008-09-17 16:06:46 UTC (rev 1851)
+++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java 2008-09-17 16:07:42 UTC (rev 1852)
@@ -164,7 +164,7 @@
assertFalse(request.isWildcard());
assertEquals(17, parameters.size());
assertEquals("host1", parameters.get("JVMRoute"));
- assertEquals("172.0.0.1", parameters.get("Host"));
+ assertEquals("127.0.0.1", parameters.get("Host"));
assertEquals("0", parameters.get("Port"));
assertEquals("ajp", parameters.get("Type"));
assertEquals("domain", parameters.get("Domain"));
@@ -280,7 +280,7 @@
assertFalse(request.isWildcard());
assertEquals(17, parameters.size());
assertEquals("host1", parameters.get("JVMRoute"));
- assertEquals("172.0.0.1", parameters.get("Host"));
+ assertEquals("127.0.0.1", parameters.get("Host"));
assertEquals("0", parameters.get("Port"));
assertEquals("ajp", parameters.get("Type"));
assertEquals("domain", parameters.get("Domain"));
17 years, 3 months
JBoss Native SVN: r1851 - trunk/mod_cluster/src/test/java/org/jboss/modcluster.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 12:06:46 -0400 (Wed, 17 Sep 2008)
New Revision: 1851
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java
Log:
Fixed expected Host address in CONFIG
Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java
===================================================================
--- trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java 2008-09-17 15:54:02 UTC (rev 1850)
+++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java 2008-09-17 16:06:46 UTC (rev 1851)
@@ -134,7 +134,7 @@
assertFalse(request.isWildcard());
assertEquals(17, parameters.size());
assertEquals("host1", parameters.get("JVMRoute"));
- assertEquals("172.0.0.1", parameters.get("Host"));
+ assertEquals("127.0.0.1", parameters.get("Host"));
assertEquals("0", parameters.get("Port"));
assertEquals("ajp", parameters.get("Type"));
assertEquals("domain", parameters.get("Domain"));
17 years, 3 months