[jboss-cvs] JBossAS SVN: r103647 - in trunk: testsuite/src/main/org/jboss/test/cluster/mod_cluster and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 7 13:38:53 EDT 2010
Author: pferraro
Date: 2010-04-07 13:38:52 -0400 (Wed, 07 Apr 2010)
New Revision: 103647
Modified:
trunk/component-matrix/pom.xml
trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/MockProxy.java
trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java
trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml
trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml
trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml
trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml
trunk/testsuite/src/resources/test-configs/mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml
trunk/testsuite/src/resources/test-configs/mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml
trunk/tomcat/src/resources/mod_cluster-jboss-beans.xml
Log:
[JBAS-7836] Upgrade mod_cluster to 1.1.0.CR1
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/component-matrix/pom.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -122,7 +122,7 @@
<version.org.jboss.metadata.ejb>2.0.0-alpha-10</version.org.jboss.metadata.ejb>
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
<version.org.jboss.metadata.war>2.0.0.Alpha14</version.org.jboss.metadata.war>
- <version.org.jboss.mod_cluster>1.1.0.Beta1</version.org.jboss.mod_cluster>
+ <version.org.jboss.mod_cluster>1.1.0.CR1</version.org.jboss.mod_cluster>
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
<version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java 2010-04-07 17:38:52 UTC (rev 103647)
@@ -89,7 +89,7 @@
int count = this.proxy.getRequests().drainTo(requests);
- Assert.assertEquals(1, count);
+ Assert.assertEquals(requests.toString(), 2, count);
for (Map.Entry<String, Map<String, String>> infoRequest: requests)
{
@@ -111,7 +111,7 @@
count = this.proxy.getRequests(String.format(JVM_ROUTE_PATTERN, host)).drainTo(requests);
- Assert.assertTrue(Integer.toString(count), count >= 2);
+ Assert.assertTrue(requests.toString(), count >= 2);
Map.Entry<String, Map<String, String>> configRequest = requests.get(0);
String command = configRequest.getKey();
@@ -119,12 +119,13 @@
Assert.assertTrue(command, command.startsWith("CONFIG"));
Assert.assertFalse(command.contains("*"));
- Assert.assertEquals(5, parameters.size());
+ Assert.assertEquals(parameters.toString(), 6, parameters.size());
Assert.assertEquals("8009", parameters.get("Port"));
Assert.assertEquals(host, parameters.get("Host"));
Assert.assertEquals("ajp", parameters.get("Type"));
Assert.assertEquals(String.format(JVM_ROUTE_PATTERN, host), parameters.get("JVMRoute"));
Assert.assertEquals("No", parameters.get("StickySessionForce"));
+ Assert.assertEquals("1", parameters.get("Maxattempts"));
for (Map.Entry<String, Map<String, String>> statusRequest: requests.subList(1, requests.size()))
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/MockProxy.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/MockProxy.java 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/MockProxy.java 2010-04-07 17:38:52 UTC (rev 103647)
@@ -28,10 +28,13 @@
import java.io.OutputStreamWriter;
import java.net.ServerSocket;
import java.net.Socket;
+import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.URLDecoder;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
@@ -49,13 +52,15 @@
private final ConcurrentMap<String, BlockingQueue<Map.Entry<String, Map<String, String>>>> requestMap = new ConcurrentHashMap<String, BlockingQueue<Map.Entry<String, Map<String, String>>>>();
private ServerSocket server;
- private Thread[] workers;
+ private final List<Thread> workers;
+ private final int threads;
private volatile boolean healthy = true;
public MockProxy(int threads)
{
- this.workers = new Thread[threads];
+ this.workers = new ArrayList<Thread>(threads);
+ this.threads = threads;
}
public void run()
@@ -85,7 +90,7 @@
}
String command = line;
-
+ System.out.println("Received command: " + command);
line = reader.readLine();
while ((line != null) && (line.length() > 0))
@@ -97,6 +102,7 @@
if (line != null)
{
line = reader.readLine();
+ System.out.println("Received body: " + line);
}
Map<String, String> parameters = new HashMap<String, String>();
@@ -114,6 +120,7 @@
parameters.put(name, value);
}
+ System.out.println("Parsed body: " + line);
}
if (this.healthy)
@@ -128,12 +135,11 @@
writer.newLine();
writer.newLine();
writer.flush();
-
- line = reader.readLine();
}
Map.Entry<String, Map<String, String>> request = Collections.singletonMap(command, parameters).entrySet().iterator().next();
+ System.out.println("Received: " + request);
String jvmRoute = parameters.get("JVMRoute");
if (jvmRoute == null)
@@ -144,6 +150,11 @@
{
this.getRequests(jvmRoute).add(request);
}
+ Thread.yield();
+ if (line != null)
+ {
+ line = reader.readLine();
+ }
}
}
finally
@@ -161,6 +172,10 @@
}
}
}
+ catch (SocketException e)
+ {
+ System.out.println("Socket accept interrupted");
+ }
catch (SocketTimeoutException e)
{
System.out.println("Socket accept timeout");
@@ -200,44 +215,51 @@
this.server = new ServerSocket(0, 200, null);
this.server.setSoTimeout(15000);
- for (int i = 0; i < this.workers.length; ++i)
+ for (int i = 0; i < this.threads; ++i)
{
- this.workers[i] = new Thread(this);
- this.workers[i].start();
+ Thread thread = new Thread(this);
+
+ this.workers.add(thread);
+
+ thread.start();
}
}
- public void stop() throws IOException
+ public void stop()
{
- for (int i = 0; i < this.workers.length; ++i)
+ for (Thread worker: this.workers)
{
- Thread worker = this.workers[i];
-
if (worker != null)
{
worker.interrupt();
}
}
- if (this.server != null) this.server.close();
+ if (this.server != null)
+ {
+ try
+ {
+ this.server.close();
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace(System.err);
+ }
+ }
- for (int i = 0; i < this.workers.length; ++i)
+ for (Thread worker: this.workers)
{
- Thread worker = this.workers[i];
-
- if (worker != null)
+ try
{
- try
- {
- worker.join();
- }
- catch (InterruptedException e)
- {
- Thread.currentThread().interrupt();
- }
+ worker.join();
}
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ }
}
+ this.workers.clear();
this.requestMap.clear();
this.requests.clear();
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java 2010-04-07 17:38:52 UTC (rev 103647)
@@ -120,12 +120,13 @@
Assert.assertTrue(command, command.startsWith("CONFIG"));
Assert.assertFalse(command.contains("*"));
- Assert.assertEquals(5, parameters.size());
+ Assert.assertEquals(parameters.toString(), 6, parameters.size());
Assert.assertEquals("8009", parameters.get("Port"));
Assert.assertEquals(host, parameters.get("Host"));
Assert.assertEquals("ajp", parameters.get("Type"));
Assert.assertEquals(String.format(JVM_ROUTE_PATTERN, host), parameters.get("JVMRoute"));
Assert.assertEquals("No", parameters.get("StickySessionForce"));
+ Assert.assertEquals("1", parameters.get("Maxattempts"));
for (Map.Entry<String, Map<String, String>> statusRequest: requests.subList(1, requests.size()))
{
Modified: trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -16,7 +16,7 @@
<!-- Uncomment to enable mod_cluster integration -->
<depends>ModClusterListener</depends>
-
+
<!-- Inject the TomcatDeployer -->
<property name="tomcatDeployer"><inject bean="WarDeployer"/></property>
<!-- Set the securityManagerService used to flush the auth cache on session expiration -->
@@ -29,85 +29,5 @@
-->
</bean>
-
- <bean name="WebServerMO"
- class="org.jboss.web.tomcat.service.management.WebServer">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>service</key>
- <value>WebServer</value>
- </entry>
- </map>
- </property>
- </bean>
- <bean name="ConnectorBean-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ConnectorBean">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>GlobalRequestProcessor</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="ThreadPool-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ThreadPool">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>ThreadPool</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="${jboss.bind.address}-MO"
- class="org.jboss.web.tomcat.service.management.Host">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>Host</value>
- </entry>
- <entry>
- <key>host</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </value>
- </entry>
- </map>
- </property>
- </bean>
-
-
-</deployment>
+</deployment>
\ No newline at end of file
Modified: trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/resources/test-configs/ha-mod_cluster-0/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -12,6 +12,7 @@
<constructor>
<!-- To use the HA singleton version of mod_cluster, change this injection to HAModClusterService -->
<parameter><inject bean="HAModClusterService"/></parameter>
+ <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
</constructor>
</bean>
@@ -108,7 +109,7 @@
<property name="stickySession">true</property>
<property name="stickySessionForce">false</property>
<property name="stickySessionRemove">false</property>
- <property name="maxAttempts">-1</property>
+ <property name="maxAttempts">1</property>
<property name="workerTimeout">-1</property>
</bean>
Modified: trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -16,7 +16,7 @@
<!-- Uncomment to enable mod_cluster integration -->
<depends>ModClusterListener</depends>
-
+
<!-- Inject the TomcatDeployer -->
<property name="tomcatDeployer"><inject bean="WarDeployer"/></property>
<!-- Set the securityManagerService used to flush the auth cache on session expiration -->
@@ -29,85 +29,5 @@
-->
</bean>
-
- <bean name="WebServerMO"
- class="org.jboss.web.tomcat.service.management.WebServer">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>service</key>
- <value>WebServer</value>
- </entry>
- </map>
- </property>
- </bean>
- <bean name="ConnectorBean-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ConnectorBean">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>GlobalRequestProcessor</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="ThreadPool-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ThreadPool">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>ThreadPool</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="${jboss.bind.address}-MO"
- class="org.jboss.web.tomcat.service.management.Host">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>Host</value>
- </entry>
- <entry>
- <key>host</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </value>
- </entry>
- </map>
- </property>
- </bean>
-
-
-</deployment>
+</deployment>
\ No newline at end of file
Modified: trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/resources/test-configs/ha-mod_cluster-1/deploy/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -12,6 +12,7 @@
<constructor>
<!-- To use the HA singleton version of mod_cluster, change this injection to HAModClusterService -->
<parameter><inject bean="HAModClusterService"/></parameter>
+ <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
</constructor>
</bean>
@@ -108,7 +109,7 @@
<property name="stickySession">true</property>
<property name="stickySessionForce">false</property>
<property name="stickySessionRemove">false</property>
- <property name="maxAttempts">-1</property>
+ <property name="maxAttempts">1</property>
<property name="workerTimeout">-1</property>
</bean>
Modified: trunk/testsuite/src/resources/test-configs/mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/resources/test-configs/mod_cluster-0/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -16,7 +16,7 @@
<!-- Uncomment to enable mod_cluster integration -->
<depends>ModClusterListener</depends>
-
+
<!-- Inject the TomcatDeployer -->
<property name="tomcatDeployer"><inject bean="WarDeployer"/></property>
<!-- Set the securityManagerService used to flush the auth cache on session expiration -->
@@ -29,85 +29,5 @@
-->
</bean>
-
- <bean name="WebServerMO"
- class="org.jboss.web.tomcat.service.management.WebServer">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>service</key>
- <value>WebServer</value>
- </entry>
- </map>
- </property>
- </bean>
- <bean name="ConnectorBean-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ConnectorBean">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>GlobalRequestProcessor</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="ThreadPool-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ThreadPool">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>ThreadPool</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="${jboss.bind.address}-MO"
- class="org.jboss.web.tomcat.service.management.Host">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>Host</value>
- </entry>
- <entry>
- <key>host</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </value>
- </entry>
- </map>
- </property>
- </bean>
-
-
-</deployment>
+</deployment>
\ No newline at end of file
Modified: trunk/testsuite/src/resources/test-configs/mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/testsuite/src/resources/test-configs/mod_cluster-1/deploy/jbossweb.sar/META-INF/jboss-beans.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -16,7 +16,7 @@
<!-- Uncomment to enable mod_cluster integration -->
<depends>ModClusterListener</depends>
-
+
<!-- Inject the TomcatDeployer -->
<property name="tomcatDeployer"><inject bean="WarDeployer"/></property>
<!-- Set the securityManagerService used to flush the auth cache on session expiration -->
@@ -29,85 +29,5 @@
-->
</bean>
-
- <bean name="WebServerMO"
- class="org.jboss.web.tomcat.service.management.WebServer">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>service</key>
- <value>WebServer</value>
- </entry>
- </map>
- </property>
- </bean>
- <bean name="ConnectorBean-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ConnectorBean">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>GlobalRequestProcessor</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" >
- <parameter>jboss.web:service=WebServer</parameter>
- </value-factory>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="ThreadPool-http-${jboss.bind.address}-8080MO"
- class="org.jboss.web.tomcat.service.management.ThreadPool">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>ThreadPool</value>
- </entry>
- </map>
- </property>
- <property name="port">
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="address">
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </property>
- <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="${jboss.bind.address}-MO"
- class="org.jboss.web.tomcat.service.management.Host">
- <property name="domain">jboss.web</property>
- <property name="nameProps">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>type</key>
- <value>Host</value>
- </entry>
- <entry>
- <key>host</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding" parameter="jboss.web:service=WebServer"/>
- </value>
- </entry>
- </map>
- </property>
- </bean>
-
-
-</deployment>
+</deployment>
\ No newline at end of file
Modified: trunk/tomcat/src/resources/mod_cluster-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/mod_cluster-jboss-beans.xml 2010-04-07 17:20:03 UTC (rev 103646)
+++ trunk/tomcat/src/resources/mod_cluster-jboss-beans.xml 2010-04-07 17:38:52 UTC (rev 103647)
@@ -11,7 +11,8 @@
<bean name="ModClusterListener" class="org.jboss.modcluster.catalina.CatalinaEventHandlerAdapter" mode="On Demand">
<constructor>
<!-- To use the HA singleton version of mod_cluster, change this injection to HAModClusterService -->
- <parameter><inject bean="ModClusterService"/></parameter>
+ <parameter class="org.jboss.modcluster.ContainerEventHandler"><inject bean="ModClusterService"/></parameter>
+ <parameter class="javax.management.MBeanServer"><inject bean="JMXKernel" property="mbeanServer"/></parameter>
</constructor>
</bean>
@@ -19,7 +20,7 @@
<bean name="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.modcluster.ModClusterServiceMBean.class)</annotation>
<constructor>
- <parameter><inject bean="ModClusterConfig"/></parameter>
+ <parameter class="org.jboss.modcluster.config.ModClusterConfig"><inject bean="ModClusterConfig"/></parameter>
<parameter class="org.jboss.modcluster.load.LoadBalanceFactorProvider"><inject bean="DynamicLoadBalanceFactorProvider"/></parameter>
</constructor>
</bean>
@@ -29,10 +30,10 @@
<bean name="HAModClusterService" class="org.jboss.modcluster.ha.HAModClusterService" mode="On Demand">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ModCluster",exposedInterface=org.jboss.modcluster.ha.HAModClusterServiceMBean.class)</annotation>
<constructor>
- <parameter><inject bean="ModClusterConfig"/></parameter>
- <parameter><inject bean="DynamicLoadBalanceFactorProvider"/></parameter>
- <parameter><inject bean="HAPartition"/></parameter>
- <parameter><bean class="org.jboss.ha.singleton.HASingletonElectionPolicySimple"/></parameter>
+ <parameter class="org.jboss.modcluster.config.ha.HAModClusterConfig"><inject bean="ModClusterConfig"/></parameter>
+ <parameter class="org.jboss.modcluster.load.LoadBalanceFactorProvider"><inject bean="DynamicLoadBalanceFactorProvider"/></parameter>
+ <parameter class="org.jboss.ha.framework.interfaces.HAPartition"><inject bean="HAPartition"/></parameter>
+ <parameter class="org.jboss.ha.framework.interfaces.HASingletonElectionPolicy"><bean class="org.jboss.ha.singleton.HASingletonElectionPolicySimple"/></parameter>
</constructor>
</bean>
@@ -85,6 +86,8 @@
<!-- Context may be qualified by host using a colon, e.g. host1:context1 -->
<!-- If no host is defined, localhost is assumed. -->
<property name="excludedContexts">${jboss.mod_cluster.excludedContexts:ROOT,admin-console,invoker,jbossws,jmx-console,juddi,web-console}</property>
+ <!-- If disabled, contexts will *not* auto-enable during startup/deploy, and instead be enabled manually -->
+ <property name="autoEnableContexts">${jboss.mod_cluster.autoEnableContexts:true}</property>
<!-- Security key the proxy is going to send with advertise messages.
Default is none. -->
@@ -108,7 +111,7 @@
<property name="stickySession">true</property>
<property name="stickySessionForce">false</property>
<property name="stickySessionRemove">false</property>
- <property name="maxAttempts">-1</property>
+ <property name="maxAttempts">1</property>
<property name="workerTimeout">-1</property>
</bean>
@@ -207,7 +210,7 @@
<bean name="RequestCountLoadMetric" class="org.jboss.modcluster.load.metric.impl.RequestCountLoadMetric" mode="On Demand">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ModCluster,provider=LoadBalanceFactor,metric=RequestCount",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
- <parameter><inject bean="RequestProcessorLoadMetricSource"/></parameter>
+ <parameter class="org.jboss.modcluster.load.metric.impl.RequestProcessorLoadMetricSource"><inject bean="RequestProcessorLoadMetricSource"/></parameter>
<!--parameter>requestCount</parameter-->
</constructor>
<!-- This metric requires an explicit capacity, e.g. maximum capacity of 1000 requests/sec -->
@@ -218,7 +221,7 @@
<bean name="ReceiveTrafficLoadMetric" class="org.jboss.modcluster.load.metric.impl.ReceiveTrafficLoadMetric" mode="On Demand">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ModCluster,provider=LoadBalanceFactor,metric=ReceiveTraffic",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
- <parameter><inject bean="RequestProcessorLoadMetricSource"/></parameter>
+ <parameter class="org.jboss.modcluster.load.metric.impl.RequestProcessorLoadMetricSource"><inject bean="RequestProcessorLoadMetricSource"/></parameter>
<!--parameter>bytesReceived</parameter-->
</constructor>
<!-- This metric requires an explicit capacity, e.g. max capacity of 1024 KB/s -->
@@ -228,7 +231,7 @@
<bean name="SendTrafficLoadMetric" class="org.jboss.modcluster.load.metric.impl.SendTrafficLoadMetric" mode="On Demand">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=ModCluster,provider=LoadBalanceFactor,metric=SendTraffic",exposedInterface=org.jboss.modcluster.load.metric.LoadMetricMBean.class)</annotation>
<constructor>
- <parameter><inject bean="RequestProcessorLoadMetricSource"/></parameter>
+ <parameter class="org.jboss.modcluster.load.metric.impl.RequestProcessorLoadMetricSource"><inject bean="RequestProcessorLoadMetricSource"/></parameter>
<!--parameter>bytesSent</parameter-->
</constructor>
<!-- This metric requires an explicit capacity, e.g. max capacity of 512 KB/s -->
More information about the jboss-cvs-commits
mailing list