Author: pferraro
Date: 2009-03-16 12:19:42 -0400 (Mon, 16 Mar 2009)
New Revision: 2362
Added:
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/test.war/
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/test.war/WEB-INF/
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/test.war/WEB-INF/web.xml
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/test/mcmp/MCMPTestCase.java
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/jbossweb.sar/server.xml
Log:
Use new webapp for testing, since ROOT is now excluded by default.
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/test/mcmp/MCMPTestCase.java
===================================================================
---
trunk/mod_cluster/src/test/java/org/jboss/modcluster/test/mcmp/MCMPTestCase.java 2009-03-16
12:48:17 UTC (rev 2361)
+++
trunk/mod_cluster/src/test/java/org/jboss/modcluster/test/mcmp/MCMPTestCase.java 2009-03-16
16:19:42 UTC (rev 2362)
@@ -51,9 +51,11 @@
public class MCMPTestCase
{
private static final String MOD_CLUSTER_SERVICE =
"jboss.web:service=ModCluster";
- private static final String ROOT_CONTEXT =
"jboss.web.deployment:war=/ROOT";
+ private static final String TEST_CONTEXT =
"jboss.web.deployment:war=/test";
private static final String WEB_SERVER = "jboss.web:service=WebServer";
- private static final List<String> expectedContexts =
Arrays.asList("/", "/invoker", "/juddi",
"/jbossws", "/jmx-console", "/web-console");
+ private static final List<String> expectedContexts =
Arrays.asList("/test");
+ private static final String expectedJvmRoute = "node1";
+ private static final String expectedAliases = "localhost";
private MockProxy proxy = new MockProxy();
private MBeanServerConnection server;
@@ -65,7 +67,7 @@
public void init() throws Exception
{
this.server = new MBeanServerConnector(0).getServer();
- this.rootContext = ObjectName.getInstance(ROOT_CONTEXT);
+ this.rootContext = ObjectName.getInstance(TEST_CONTEXT);
this.webServer = ObjectName.getInstance(WEB_SERVER);
this.modClusterService = ObjectName.getInstance(MOD_CLUSTER_SERVICE);
@@ -86,7 +88,7 @@
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.CONFIG, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Assert.assertFalse(request.getParameters().isEmpty());
Set<String> contexts = new HashSet<String>(expectedContexts);
@@ -103,10 +105,10 @@
Assert.assertSame(MCMPRequestType.ENABLE_APP, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Map<String, String> parameters = request.getParameters();
Assert.assertEquals(2, parameters.size());
- Assert.assertEquals("localhost", parameters.get("Alias"));
+ Assert.assertEquals(expectedAliases, parameters.get("Alias"));
String context = parameters.get("Context");
Assert.assertTrue(context, contexts.remove(context));
}
@@ -117,7 +119,7 @@
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.STATUS, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Map<String, String> parameters = request.getParameters();
Assert.assertEquals(1, parameters.size());
String load = parameters.get("Load");
@@ -130,7 +132,7 @@
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.STATUS, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
parameters = request.getParameters();
Assert.assertEquals(1, parameters.size());
load = parameters.get("Load");
@@ -157,20 +159,20 @@
Assert.assertSame(MCMPRequestType.STOP_APP, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Map<String, String> parameters = request.getParameters();
Assert.assertEquals(2, parameters.size());
- Assert.assertEquals("localhost", parameters.get("Alias"));
+ Assert.assertEquals(expectedAliases, parameters.get("Alias"));
Assert.assertEquals("/", parameters.get("Context"));
request = requests.poll();
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.REMOVE_APP, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
parameters = request.getParameters();
Assert.assertEquals(2, parameters.size());
- Assert.assertEquals("localhost", parameters.get("Alias"));
+ Assert.assertEquals(expectedAliases, parameters.get("Alias"));
Assert.assertEquals("/", parameters.get("Context"));
// Test deploy of webapp
@@ -186,10 +188,10 @@
Assert.assertSame(MCMPRequestType.ENABLE_APP, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
parameters = request.getParameters();
Assert.assertEquals(2, parameters.size());
- Assert.assertEquals("localhost", parameters.get("Alias"));
+ Assert.assertEquals(expectedAliases, parameters.get("Alias"));
Assert.assertEquals("/", parameters.get("Context"));
}
@@ -215,7 +217,7 @@
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.DISABLE_APP, request.getRequestType());
Assert.assertTrue(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Assert.assertTrue(request.getParameters().toString(),
request.getParameters().isEmpty());
// Test ModClusterService.enable()
@@ -233,7 +235,7 @@
Assert.assertSame(MCMPRequestType.ENABLE_APP, request.getRequestType());
Assert.assertTrue(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Assert.assertTrue(request.getParameters().toString(),
request.getParameters().isEmpty());
}
@@ -264,10 +266,10 @@
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.STOP_APP, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Map<String, String> parameters = request.getParameters();
Assert.assertEquals(2, parameters.size());
- Assert.assertEquals("localhost", parameters.get("Alias"));
+ Assert.assertEquals(expectedAliases, parameters.get("Alias"));
String context = parameters.get("Context");
Assert.assertTrue(context, stopContexts.remove(context));
@@ -277,10 +279,10 @@
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.REMOVE_APP, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
parameters = request.getParameters();
Assert.assertEquals(2, parameters.size());
- Assert.assertEquals("localhost", parameters.get("Alias"));
+ Assert.assertEquals(expectedAliases, parameters.get("Alias"));
context = parameters.get("Context");
Assert.assertTrue(context, removeContexts.remove(context));
@@ -291,7 +293,7 @@
Assert.assertNotNull(request);
Assert.assertSame(MCMPRequestType.REMOVE_APP, request.getRequestType());
Assert.assertTrue(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Assert.assertTrue(request.getParameters().toString(),
request.getParameters().isEmpty());
// Test web server start
@@ -307,7 +309,7 @@
Assert.assertSame(MCMPRequestType.CONFIG, request.getRequestType());
Assert.assertFalse(request.isWildcard());
- Assert.assertEquals("localhost", request.getJvmRoute());
+ Assert.assertEquals(expectedJvmRoute, request.getJvmRoute());
Assert.assertFalse(request.getParameters().isEmpty());
request = requests.poll(20, TimeUnit.SECONDS);
Modified:
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/jbossweb.sar/server.xml
===================================================================
---
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/jbossweb.sar/server.xml 2009-03-16
12:48:17 UTC (rev 2361)
+++
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/jbossweb.sar/server.xml 2009-03-16
16:19:42 UTC (rev 2362)
@@ -33,7 +33,7 @@
keystorePass="rmi+ssl" sslProtocol = "TLS" />
-->
- <Engine name="jboss.web" defaultHost="localhost"
jvmRoute="localhost">
+ <Engine name="jboss.web" defaultHost="localhost"
jvmRoute="${jboss.jvmRoute}">
<!-- The JAAS based authentication and authorization realm implementation
that is compatible with the jboss 3.2.x realm implementation.
Added:
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/test.war/WEB-INF/web.xml
===================================================================
---
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/test.war/WEB-INF/web.xml
(rev 0)
+++
trunk/mod_cluster/src/test/resources/test-configs/mod-cluster-jbossas/deploy/test.war/WEB-INF/web.xml 2009-03-16
16:19:42 UTC (rev 2362)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+
+ <distributable/>
+
+</web-app>