[jbossnative-commits] JBoss Native SVN: r1845 - in trunk/mod_cluster: src/main/java/org/jboss/modcluster/mcmp and 1 other directories.
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);