[mod_cluster-commits] mod_cluster SVN: r791 - in trunk: container/catalina/src/test/java/org/jboss/modcluster/container/catalina and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Apr 5 15:21:12 EDT 2012
Author: pferraro
Date: 2012-04-05 15:21:12 -0400 (Thu, 05 Apr 2012)
New Revision: 791
Modified:
trunk/container-spi/src/main/java/org/jboss/modcluster/container/Engine.java
trunk/container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaEngine.java
trunk/container/catalina/src/test/java/org/jboss/modcluster/container/catalina/EngineTestCase.java
trunk/core/src/main/java/org/jboss/modcluster/ModClusterService.java
trunk/core/src/main/java/org/jboss/modcluster/config/impl/ModClusterConfig.java
trunk/core/src/test/java/org/jboss/modcluster/load/metric/MBeanAttributeRatioLoadMetricTestCase.java
Log:
Obtain default host from Engine, don't just assume it's "localhost".
Modified: trunk/container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaEngine.java
===================================================================
--- trunk/container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaEngine.java 2012-04-05 17:36:54 UTC (rev 790)
+++ trunk/container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaEngine.java 2012-04-05 19:21:12 UTC (rev 791)
@@ -86,6 +86,11 @@
}
@Override
+ public String getDefaultHost() {
+ return this.engine.getDefaultHost();
+ }
+
+ @Override
public String getJvmRoute() {
return this.engine.getJvmRoute();
}
Modified: trunk/container/catalina/src/test/java/org/jboss/modcluster/container/catalina/EngineTestCase.java
===================================================================
--- trunk/container/catalina/src/test/java/org/jboss/modcluster/container/catalina/EngineTestCase.java 2012-04-05 17:36:54 UTC (rev 790)
+++ trunk/container/catalina/src/test/java/org/jboss/modcluster/container/catalina/EngineTestCase.java 2012-04-05 19:21:12 UTC (rev 791)
@@ -49,6 +49,16 @@
}
@Test
+ public void getDefaultHost() {
+ String expected = "localhost";
+ when(this.engine.getDefaultHost()).thenReturn(expected);
+
+ String result = this.catalinaEngine.getDefaultHost();
+
+ assertSame(expected, result);
+ }
+
+ @Test
public void findHost() {
org.apache.catalina.Host host = mock(org.apache.catalina.Host.class);
HostFactory hostFactory = mock(HostFactory.class);
Modified: trunk/container-spi/src/main/java/org/jboss/modcluster/container/Engine.java
===================================================================
--- trunk/container-spi/src/main/java/org/jboss/modcluster/container/Engine.java 2012-04-05 17:36:54 UTC (rev 790)
+++ trunk/container-spi/src/main/java/org/jboss/modcluster/container/Engine.java 2012-04-05 19:21:12 UTC (rev 791)
@@ -98,4 +98,10 @@
* @return a parameter name
*/
String getSessionParameterName();
+
+ /**
+ * Returns the default host of this engine.
+ * @return the default host
+ */
+ String getDefaultHost();
}
Modified: trunk/core/src/main/java/org/jboss/modcluster/ModClusterService.java
===================================================================
--- trunk/core/src/main/java/org/jboss/modcluster/ModClusterService.java 2012-04-05 17:36:54 UTC (rev 790)
+++ trunk/core/src/main/java/org/jboss/modcluster/ModClusterService.java 2012-04-05 19:21:12 UTC (rev 791)
@@ -27,6 +27,7 @@
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -149,12 +150,22 @@
if (!excludedContextPaths.isEmpty()) {
for (Engine engine : server.getEngines()) {
+ String defaultHost = engine.getDefaultHost();
for (Host host : engine.getHosts()) {
+ Set<String> excluded = new HashSet<String>();
Set<String> paths = excludedContextPaths.get(host.getName());
-
if (paths != null) {
- this.excludedContexts.put(host, Collections.unmodifiableSet(paths));
+ excluded.addAll(paths);
}
+ if (host.getName().equals(defaultHost)) {
+ paths = excludedContextPaths.get(null);
+ if (paths != null) {
+ excluded.addAll(paths);
+ }
+ }
+ if (!excluded.isEmpty()) {
+ this.excludedContexts.put(host, Collections.unmodifiableSet(excluded));
+ }
}
}
}
Modified: trunk/core/src/main/java/org/jboss/modcluster/config/impl/ModClusterConfig.java
===================================================================
--- trunk/core/src/main/java/org/jboss/modcluster/config/impl/ModClusterConfig.java 2012-04-05 17:36:54 UTC (rev 790)
+++ trunk/core/src/main/java/org/jboss/modcluster/config/impl/ModClusterConfig.java 2012-04-05 19:21:12 UTC (rev 791)
@@ -112,6 +112,7 @@
this.advertiseInterface = advertiseInterface;
}
+ @Deprecated
public void setAdvertiseInterface(String advertiseInterface) {
try {
this.setAdvertiseInterface(InetAddress.getByName(advertiseInterface));
@@ -243,7 +244,6 @@
private static final String ROOT_CONTEXT = "ROOT";
private static final String CONTEXT_DELIMITER = ",";
private static final String HOST_CONTEXT_DELIMITER = ":";
- private static final String DEFAULT_HOST = "localhost";
@Deprecated
public void setExcludedContexts(String contexts) {
@@ -264,7 +264,7 @@
throw new IllegalArgumentException(trimmedContexts + " is not a valid value for excludedContexts");
}
- String host = DEFAULT_HOST;
+ String host = null;
String trimmedContext = parts[0].trim();
if (parts.length == 2) {
@@ -298,7 +298,7 @@
if (builder.length() > 0) {
builder.append(CONTEXT_DELIMITER);
}
- if (!host.equals(DEFAULT_HOST)) {
+ if (host != null) {
builder.append(host).append(HOST_CONTEXT_DELIMITER);
}
builder.append(path.isEmpty() ? ROOT_CONTEXT : path.substring(1));
Modified: trunk/core/src/test/java/org/jboss/modcluster/load/metric/MBeanAttributeRatioLoadMetricTestCase.java
===================================================================
--- trunk/core/src/test/java/org/jboss/modcluster/load/metric/MBeanAttributeRatioLoadMetricTestCase.java 2012-04-05 17:36:54 UTC (rev 790)
+++ trunk/core/src/test/java/org/jboss/modcluster/load/metric/MBeanAttributeRatioLoadMetricTestCase.java 2012-04-05 19:21:12 UTC (rev 791)
@@ -35,7 +35,6 @@
import javax.management.QueryExp;
import org.jboss.modcluster.container.Engine;
-import org.jboss.modcluster.container.Server;
import org.jboss.modcluster.load.metric.impl.MBeanAttributeRatioLoadMetric;
import org.junit.Test;
More information about the mod_cluster-commits
mailing list