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>