JBoss Native SVN: r1850 - trunk/mod_cluster/src/main/java/org/jboss/modcluster.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-17 11:54:02 -0400 (Wed, 17 Sep 2008)
New Revision: 1850
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java
Log:
Fixed default connector address.
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java 2008-09-17 15:50:14 UTC (rev 1849)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java 2008-09-17 15:54:02 UTC (rev 1850)
@@ -68,7 +68,7 @@
{
InetAddress inetAddress = (InetAddress) IntrospectionUtils.getProperty(connector.getProtocolHandler(), "address");
- return (inetAddress != null) ? inetAddress.getHostAddress() : "172.0.0.1";
+ return (inetAddress != null) ? inetAddress.getHostAddress() : "127.0.0.1";
}
/**
17 years, 3 months
JBoss Native SVN: r1849 - 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 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);
17 years, 3 months
JBoss Native SVN: r1847 - in trunk/mod_cluster/src/main/java/org/jboss/modcluster: ha and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-17 09:00:49 -0400 (Wed, 17 Sep 2008)
New Revision: 1847
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java
trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java
trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java
Log:
Finish arrange the getProxyInfo() logic.
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-17 12:58:10 UTC (rev 1846)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-17 13:00:49 UTC (rev 1847)
@@ -818,6 +818,19 @@
}
/**
+ * @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#getProxyInfo()
+ */
+ public GroupRpcResponse getProxyInfo()
+ {
+ if (!this.coord.isMasterNode()) return null;
+
+ ClusterNode node = ModClusterService.this.getHAPartition().getClusterNode();
+ String info = this.coord.localHandler.getProxyInfo();
+
+ return new StringGroupRpcResponse(node, info);
+ }
+
+ /**
* @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#isProxyHealthOK()
*/
public GroupRpcResponse isProxyHealthOK()
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java 2008-09-17 12:58:10 UTC (rev 1846)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java 2008-09-17 13:00:49 UTC (rev 1847)
@@ -293,6 +293,20 @@
return ((StringGroupRpcResponse) response).getValue();
}
+ public String getProxyInfo()
+ {
+ if (this.singleton.isMasterNode())
+ {
+ return this.localHandler.getProxyInfo();
+ }
+
+ GroupRpcResponse response = this.rpcStub.getProxyInfo();
+
+ this.validateResponse(response, false);
+
+ return ((StringGroupRpcResponse) response).getValue();
+ }
+
public void init(List<AddressPort> initialProxies)
{
if (this.singleton.isMasterNode())
@@ -448,6 +462,14 @@
}
/**
+ * @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#getProxyInfo()
+ */
+ public GroupRpcResponse getProxyInfo()
+ {
+ return this.invokeRpc("getProxyInfo");
+ }
+
+ /**
* @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#isProxyHealthOK()
*/
public GroupRpcResponse isProxyHealthOK()
@@ -557,4 +579,4 @@
throw new IllegalStateException(ClusteredMCMPHandlerImpl.this.sm.getString("modcluster.error.rpc.noresp", methodName));
}
}
-}
\ No newline at end of file
+}
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java 2008-09-17 12:58:10 UTC (rev 1846)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java 2008-09-17 13:00:49 UTC (rev 1847)
@@ -39,6 +39,8 @@
GroupRpcResponse getProxyConfiguration();
+ GroupRpcResponse getProxyInfo();
+
GroupRpcResponse isProxyHealthOK();
GroupRpcResponse markProxiesInError();
17 years, 3 months
JBoss Native SVN: r1846 - 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 08:58:10 -0400 (Wed, 17 Sep 2008)
New Revision: 1846
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
Log:
Synchronize it otherwise the REMOVE-APP, CONFIG, ENABLE-APP
and STATUS may be in wrong order in httpd... Then nothing will be
configured.
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 08:25:07 UTC (rev 1845)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-17 12:58:10 UTC (rev 1846)
@@ -440,7 +440,7 @@
*
* @param engine
*/
- public void status()
+ public synchronized void status()
{
// Don't respond if not yet initialized
if (!this.init) return;
17 years, 3 months
JBoss Native SVN: r1845 - in trunk/mod_cluster: src/main/java/org/jboss/modcluster/mcmp and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-17 04:25:07 -0400 (Wed, 17 Sep 2008)
New Revision: 1845
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/ClusterListener.java
trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java
trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java
Log:
Add getProxyInfo in the mod_cluster listener.
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ClusterListener.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ClusterListener.java 2008-09-16 20:11:32 UTC (rev 1844)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ClusterListener.java 2008-09-17 08:25:07 UTC (rev 1845)
@@ -118,7 +118,18 @@
{
return this.mcmpHandler.getProxyConfiguration();
}
+ /**
+ * Retrieves the full proxy info message.
+ *
+ *
+ * @return the proxy info confguration
+ */
+ public String getProxyInfo()
+ {
+ return this.mcmpHandler.getProxyInfo();
+ }
+
/**
* Reset a DOWN connection to the proxy up to ERROR, where the configuration will
* be refreshed. To be used through JMX or similar.
@@ -227,4 +238,4 @@
String domain = (String) IntrospectionUtils.getProperty(server, "domain");
return ObjectName.getInstance(domain , "type", "ClusterListener");
}
-}
\ No newline at end of file
+}
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-16 20:11:32 UTC (rev 1844)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-17 08:25:07 UTC (rev 1845)
@@ -230,6 +230,12 @@
}
+ public String getProxyInfo()
+ {
+ return this.clusteredHandler.getProxyInfo();
+ }
+
+
public String getProxyConfiguration()
{
return this.clusteredHandler.getProxyConfiguration();
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java 2008-09-16 20:11:32 UTC (rev 1844)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java 2008-09-17 08:25:07 UTC (rev 1845)
@@ -171,6 +171,14 @@
String getProxyConfiguration();
/**
+ * Sends a {@link MCMPRequestType#INFO INFO} request to all proxies,
+ * concatentating their responses into a single string.
+ *
+ * @return the configuration information from all the accessible proxies.
+ */
+ String getProxyInfo();
+
+ /**
* Perform periodic processing. Update the list of proxies to reflect any
* calls to <code>addProxy(...)</code> or <code>removeProxy(...)</code>.
* Attempt to establish communication with any proxies whose state is
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-16 20:11:32 UTC (rev 1844)
+++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestAddDel.java 2008-09-17 08:25:07 UTC (rev 1845)
@@ -108,7 +108,7 @@
if (Maintest.isJBossWEB())
result = jcluster.getProxyInfo();
else
- result = pcluster.getProxyList();
+ result = pcluster.getProxyInfo();
ArrayList nodes = new ArrayList();
if (result != null) {
System.out.println(result);
17 years, 3 months
JBoss Native SVN: r1844 - 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-16 16:11:32 -0400 (Tue, 16 Sep 2008)
New Revision: 1844
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
Log:
Add getProxyInfo() for the existing tests.
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-16 17:16:43 UTC (rev 1843)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-16 20:11:32 UTC (rev 1844)
@@ -342,6 +342,36 @@
return result.toString();
}
+ /**
+ * Retrieves the full proxy info message.
+ *
+ *
+ * @return the proxy info confguration
+ */
+ public String getProxyInfo()
+ {
+ Map<String, String> parameters = new HashMap<String, String>();
+ // Send INFO * request
+ StringBuilder result = new StringBuilder();
+
+ Lock lock = this.proxiesLock.readLock();
+ lock.lock();
+
+ try
+ {
+ for (int i = 0; i < this.proxies.size(); ++i)
+ {
+ Proxy proxy = this.proxies.get(i);
+ result.append("Proxy[").append(i).append("]: [").append(proxy.getAddress()).append(':').append(proxy.getPort()).append("]: \r\n");
+ result.append(this.sendRequest(new MCMPRequest(MCMPRequestType.DUMP, true, parameters), proxy)).append("\r\n");
+ }
+ }
+ finally
+ {
+ lock.unlock();
+ }
+ return result.toString();
+ }
public InetAddress getLocalAddress() throws IOException
{
IOException firstException = null;
17 years, 3 months
JBoss Native SVN: r1843 - trunk/mod_cluster/src/main/resources.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-16 13:16:43 -0400 (Tue, 16 Sep 2008)
New Revision: 1843
Modified:
trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml
Log:
Fixed dynamic lbf mbean class name
Modified: trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml
===================================================================
--- trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml 2008-09-16 16:48:09 UTC (rev 1842)
+++ trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml 2008-09-16 17:16:43 UTC (rev 1843)
@@ -66,7 +66,7 @@
<bean name="DynamicModClusterLoadBalanceFactorProvider"
class="org.jboss.modcluster.load.impl.DynamicLoadBalanceFactorProvider"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=LoadBalanceFactorProvider",exposedInterface=org.jboss.modcluster.load.impl.DynamicLoadBalanceFactorMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=LoadBalanceFactorProvider",exposedInterface=org.jboss.modcluster.load.impl.DynamicLoadBalanceFactorProviderMBean.class)</annotation>
</bean>
<!-- Other metrics sources -->
17 years, 3 months
JBoss Native SVN: r1842 - trunk/mod_cluster/src/main/java/org/jboss/modcluster.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-16 12:48:09 -0400 (Tue, 16 Sep 2008)
New Revision: 1842
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mbeans-descriptors.xml
Log:
Use new package names.
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mbeans-descriptors.xml
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mbeans-descriptors.xml 2008-09-16 16:35:52 UTC (rev 1841)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mbeans-descriptors.xml 2008-09-16 16:48:09 UTC (rev 1842)
@@ -5,7 +5,7 @@
description="Cluster listener for mod_cluster"
domain="Catalina"
group="Listener"
- type="org.jboss.web.cluster.ClusterListener">
+ type="org.jboss.modcluster.ClusterListener">
<attribute name="className"
description="Fully qualified class name of the managed object"
17 years, 3 months
JBoss Native SVN: r1841 - trunk/mod_cluster/src/main/resources.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2008-09-16 12:35:52 -0400 (Tue, 16 Sep 2008)
New Revision: 1841
Modified:
trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml
Log:
Use new package names.
Modified: trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml
===================================================================
--- trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml 2008-09-16 14:55:18 UTC (rev 1840)
+++ trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml 2008-09-16 16:35:52 UTC (rev 1841)
@@ -8,7 +8,7 @@
<!-- Configuration bean -->
<bean name="ModClusterConfig"
- class="org.jboss.web.tomcat.service.modcluster.config.ModClusterConfig"
+ class="org.jboss.modcluster.config.ModClusterConfig"
mode="On Demand">
<!-- Configure this node's communication with the load balancer -->
@@ -58,20 +58,20 @@
this server should take. This basic impl just uses a static
configuration and doesn't adjust it based on runtime conditions. -->
<bean name="StaticModClusterLoadBalanceFactorProvider"
- class="org.jboss.web.tomcat.service.modcluster.load.impl.StaticLoadBalanceFactorProvider"
+ class="org.jboss.modcluster.load.impl.StaticLoadBalanceFactorProvider"
mode="On Demand">
<property name="loadBalanceFactor">1</property>
</bean>
<bean name="DynamicModClusterLoadBalanceFactorProvider"
- class="org.jboss.web.tomcat.service.modcluster.load.impl.DynamicLoadBalanceFactorProvider"
+ class="org.jboss.modcluster.load.impl.DynamicLoadBalanceFactorProvider"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=LoadBalanceFactorProvider",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.impl.DynamicLoadBalanceFactorMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=LoadBalanceFactorProvider",exposedInterface=org.jboss.modcluster.load.impl.DynamicLoadBalanceFactorMBean.class)</annotation>
</bean>
<!-- Other metrics sources -->
<bean name="OperatingSystemLoadMetricSource"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.OperatingSystemLoadMetricSource"
+ class="org.jboss.modcluster.load.metric.impl.OperatingSystemLoadMetricSource"
mode="On Demand">
<constructor>
<parameter><inject bean="ModClusterLoadBalanceFactorProvider"/></parameter>
@@ -80,7 +80,7 @@
<!-- JBossWeb load metric sources -->
<bean name="RequestProcessorLoadMetricSource"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.RequestProcessorLoadMetricSource"
+ class="org.jboss.modcluster.load.metric.impl.RequestProcessorLoadMetricSource"
mode="On Demand">
<constructor>
<parameter><inject bean="ModClusterLoadBalanceFactorProvider"/></parameter>
@@ -88,7 +88,7 @@
</constructor>
</bean>
<bean name="SessionLoadMetricSource"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.SessionLoadMetricSource"
+ class="org.jboss.modcluster.load.metric.impl.SessionLoadMetricSource"
mode="On Demand">
<constructor>
<parameter><inject bean="ModClusterLoadBalanceFactorProvider"/></parameter>
@@ -96,7 +96,7 @@
</constructor>
</bean>
<bean name="ThreadPoolLoadMetricSource"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.ThreadPoolLoadMetricSource"
+ class="org.jboss.modcluster.load.metric.impl.ThreadPoolLoadMetricSource"
mode="On Demand">
<constructor>
<parameter><inject bean="ModClusterLoadBalanceFactorProvider"/></parameter>
@@ -106,33 +106,33 @@
<!-- System/JVM metrics -->
<bean name="AverageSystemLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.AverageSystemLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.AverageSystemLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=AverageSystemLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=AverageSystemLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="OperatingSystemLoadMetricSource"/></parameter>
</constructor>
</bean>
<bean name="SystemMemoryUsageLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.SystemMemoryUsageLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.SystemMemoryUsageLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=SystemMemoryUsageLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=SystemMemoryUsageLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="OperatingSystemLoadMetricSource"/></parameter>
</constructor>
</bean>
<bean name="HeapMemoryUsageLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.HeapMemoryUsageLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.HeapMemoryUsageLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=HeapMemoryUsageLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=HeapMemoryUsageLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="ModClusterLoadBalanceFactorProvider"/></parameter>
</constructor>
</bean>
<bean name="ThreadCountLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.ThreadCountLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.ThreadCountLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ThreadCountLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ThreadCountLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="ModClusterLoadBalanceFactorProvider"/></parameter>
</constructor>
@@ -141,9 +141,9 @@
<!-- Analogous to method=R in mod_jk -->
<bean name="RequestCountLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.RequestCountLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.RequestCountLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=RequestCountLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=RequestCountLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="RequestProcessorLoadMetricSource"/></parameter>
</constructor>
@@ -152,9 +152,9 @@
<!-- Analogous to method=S in mod_jk -->
<bean name="ActiveSessionsLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.ActiveSessionsLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.ActiveSessionsLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ActiveSessionsLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ActiveSessionsLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="SessionLoadMetricSource"/></parameter>
</constructor>
@@ -163,18 +163,18 @@
<!-- Analogous to method=T in mod_jk -->
<bean name="ReceiveTrafficLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.ReceiveTrafficLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.ReceiveTrafficLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ReceiveTrafficLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ReceiveTrafficLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="RequestProcessorLoadMetricSource"/></parameter>
</constructor>
<property name="capacity">1024</property><!-- maximum capacity estimated at 1024KB/s -->
</bean>
<bean name="SendTrafficLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.SendTrafficLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.SendTrafficLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=SendTrafficLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=SendTrafficLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="RequestProcessorLoadMetricSource"/></parameter>
</constructor>
@@ -183,9 +183,9 @@
<!-- Analogous to method=B in mod_jk -->
<bean name="BusyConnectorsLoadMetric"
- class="org.jboss.web.tomcat.service.modcluster.load.metric.impl.BusyConnectorsLoadMetric"
+ class="org.jboss.modcluster.load.metric.impl.BusyConnectorsLoadMetric"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=BusyConnectorsLoadMetric",exposedInterface=org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=BusyConnectorsLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
<parameter><inject bean="ThreadPoolLoadMetricSource"/></parameter>
</constructor>
@@ -193,10 +193,10 @@
<!-- The core ModClusterService -->
<bean name="ModClusterService"
- class="org.jboss.web.tomcat.service.modcluster.ModClusterService"
+ class="org.jboss.modcluster.ModClusterService"
mode="On Demand">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ModCluster",exposedInterface=org.jboss.web.tomcat.service.modcluster.ModClusterServiceMBean.class)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ModCluster",exposedInterface=org.jboss.modcluster.ModClusterServiceMBean.class)</annotation>
<constructor>
<parameter><inject bean="HAPartition"/></parameter>
@@ -212,7 +212,7 @@
ModClusterService of events inside JBoss Web (deployments, starts, stops. etc.)
-->
<bean name="ModClusterLifecycleListener"
- class="org.jboss.web.tomcat.service.modcluster.BasicClusterListener"
+ class="org.jboss.modcluster.BasicClusterListener"
mode="On Demand">
<constructor>
17 years, 3 months
JBoss Native SVN: r1840 - 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-16 10:55:18 -0400 (Tue, 16 Sep 2008)
New Revision: 1840
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
Log:
encodeURL appends the String already.
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-16 12:38:32 UTC (rev 1839)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-16 14:55:18 UTC (rev 1840)
@@ -587,9 +587,9 @@
throw new IllegalArgumentException(this.sm.getString("modcluster.error.nullAttribute", key));
}
- body.append(encoder.encodeURL(key, 0, key.length()));
+ body = encoder.encodeURL(key, 0, key.length());
body.append('=');
- body.append(encoder.encodeURL(value, 0, value.length()));
+ body = encoder.encodeURL(value, 0, value.length());
if (entries.hasNext())
{
17 years, 3 months