Author: pferraro
Date: 2008-09-17 21:58:30 -0400 (Wed, 17 Sep 2008)
New Revision: 1861
Modified:
trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml
Log:
Naming fixes
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-18 01:47:00
UTC (rev 1860)
+++ trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml 2008-09-18 01:58:30
UTC (rev 1861)
@@ -71,78 +71,83 @@
<!-- Other metrics sources -->
<bean name="OperatingSystemLoadMetricSource"
-
class="org.jboss.modcluster.load.metric.impl.OperatingSystemLoadMetricSource"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.OperatingSystemLoadMetricSource">
<constructor>
- <parameter><inject
bean="ModClusterLoadBalanceFactorProvider"/></parameter>
+ <parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
</constructor>
</bean>
<!-- JBossWeb load metric sources -->
<bean name="RequestProcessorLoadMetricSource"
-
class="org.jboss.modcluster.load.metric.impl.RequestProcessorLoadMetricSource"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.RequestProcessorLoadMetricSource">
<constructor>
- <parameter><inject
bean="ModClusterLoadBalanceFactorProvider"/></parameter>
- <parameter><inject bean="JMXKernel"
property="mbeanServer"/></parameter>
+ <parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
+ <parameter class="javax.management.MBeanServer"><inject
bean="JMXKernel" property="mbeanServer"/></parameter>
</constructor>
</bean>
<bean name="SessionLoadMetricSource"
- class="org.jboss.modcluster.load.metric.impl.SessionLoadMetricSource"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.SessionLoadMetricSource">
<constructor>
- <parameter><inject
bean="ModClusterLoadBalanceFactorProvider"/></parameter>
- <parameter><inject bean="JMXKernel"
property="mbeanServer"/></parameter>
+ <parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
+ <parameter class="javax.management.MBeanServer"><inject
bean="JMXKernel" property="mbeanServer"/></parameter>
</constructor>
</bean>
<bean name="ThreadPoolLoadMetricSource"
-
class="org.jboss.modcluster.load.metric.impl.ThreadPoolLoadMetricSource"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.ThreadPoolLoadMetricSource">
<constructor>
- <parameter><inject
bean="ModClusterLoadBalanceFactorProvider"/></parameter>
- <parameter><inject bean="JMXKernel"
property="mbeanServer"/></parameter>
+ <parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
+ <parameter class="javax.management.MBeanServer"><inject
bean="JMXKernel" property="mbeanServer"/></parameter>
</constructor>
</bean>
+ <bean name="ConnectionPoolLoadMetricSource"
+
class="org.jboss.modcluster.load.metric.impl.ConnectionPoolLoadMetricSource">
+ <constructor>
+ <parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
+ <parameter class="javax.management.MBeanServer"><inject
bean="JMXKernel" property="mbeanServer"/></parameter>
+ </constructor>
+ </bean>
<!-- System/JVM metrics -->
<bean name="AverageSystemLoadMetric"
- class="org.jboss.modcluster.load.metric.impl.AverageSystemLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.AverageSystemLoadMetric">
<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.modcluster.load.metric.impl.SystemMemoryUsageLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.SystemMemoryUsageLoadMetric">
<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.modcluster.load.metric.impl.HeapMemoryUsageLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.HeapMemoryUsageLoadMetric">
<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>
+ <parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
</constructor>
</bean>
<bean name="ThreadCountLoadMetric"
- class="org.jboss.modcluster.load.metric.impl.ThreadCountLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.ThreadCountLoadMetric">
<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>
+ <parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
</constructor>
<property name="capacity">300</property>
</bean>
+ <bean name="ConnectionPoolUsageMetric"
+
class="org.jboss.modcluster.load.metric.impl.ConnectionPoolUsageLoadMetric">
+
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ConnectionPoolUsageLoadMetric",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
+ <constructor>
+ <parameter><inject
bean="ConnectionPoolLoadMetricSource"/></parameter>
+ </constructor>
+ </bean>
<!-- Analogous to method=R in mod_jk -->
<bean name="RequestCountLoadMetric"
- class="org.jboss.modcluster.load.metric.impl.RequestCountLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.RequestCountLoadMetric">
<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>
@@ -152,8 +157,7 @@
<!-- Analogous to method=S in mod_jk -->
<bean name="ActiveSessionsLoadMetric"
-
class="org.jboss.modcluster.load.metric.impl.ActiveSessionsLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.ActiveSessionsLoadMetric">
<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>
@@ -163,8 +167,7 @@
<!-- Analogous to method=T in mod_jk -->
<bean name="ReceiveTrafficLoadMetric"
-
class="org.jboss.modcluster.load.metric.impl.ReceiveTrafficLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.ReceiveTrafficLoadMetric">
<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>
@@ -172,8 +175,7 @@
<property name="capacity">1024</property><!-- maximum
capacity estimated at 1024KB/s -->
</bean>
<bean name="SendTrafficLoadMetric"
- class="org.jboss.modcluster.load.metric.impl.SendTrafficLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.SendTrafficLoadMetric">
<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>
@@ -183,8 +185,7 @@
<!-- Analogous to method=B in mod_jk -->
<bean name="BusyConnectorsLoadMetric"
-
class="org.jboss.modcluster.load.metric.impl.BusyConnectorsLoadMetric"
- mode="On Demand">
+
class="org.jboss.modcluster.load.metric.impl.BusyConnectorsLoadMetric">
<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>
@@ -204,7 +205,7 @@
<parameter><inject
bean="DynamicModClusterLoadBalanceFactorProvider"/></parameter>
<parameter><bean
class="org.jboss.ha.singleton.HASingletonElectionPolicySimple"/></parameter>
</constructor>
-
+
</bean>
<!--
Show replies by date