From 45a268b4f00d9a36c0202e5bcc1966ff3e342be7 Mon Sep 17 00:00:00 2001
From: Tomaz Cerar <tomaz.cerar@gmail.com>
Date: Fri, 22 Mar 2013 22:47:43 +0100
Subject: [PATCH] re-enable clustring tests

re-enable more tests

Fix configurations to use undertow
---
 .../configuration/examples/subsystems-hornetq-colocated.xml   | 2 +-
 .../main/resources/configuration/examples/subsystems-jts.xml  | 2 +-
 .../main/resources/configuration/examples/subsystems-xts.xml  | 2 +-
 osgi/integration/http/pom.xml                                 | 1 +
 .../ee/initializeinorder/InitializeInOrderTestCase.java       | 2 --
 testsuite/integration/pom.xml                                 | 2 +-
 testsuite/pom.xml                                             | 4 ++--
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml b/build/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml
index 23ca5102acc..15f446686fc 100644
--- a/build/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml
+++ b/build/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml
@@ -24,7 +24,7 @@
       <subsystem supplement="standalone">configuration/subsystems/security.xml</subsystem>
       <subsystem>configuration/subsystems/threads.xml</subsystem>
       <subsystem>configuration/subsystems/transactions.xml</subsystem>
-      <subsystem>configuration/subsystems/web.xml</subsystem>
+      <subsystem>configuration/subsystems/undertow.xml</subsystem>
       <subsystem>configuration/subsystems/webservices.xml</subsystem>
       <subsystem>configuration/subsystems/weld.xml</subsystem>
    </subsystems>
diff --git a/build/src/main/resources/configuration/examples/subsystems-jts.xml b/build/src/main/resources/configuration/examples/subsystems-jts.xml
index 5dfa084f75b..0258e3b43a0 100644
--- a/build/src/main/resources/configuration/examples/subsystems-jts.xml
+++ b/build/src/main/resources/configuration/examples/subsystems-jts.xml
@@ -26,7 +26,7 @@
       <subsystem supplement="standalone">configuration/subsystems/security.xml</subsystem>
       <subsystem>configuration/subsystems/threads.xml</subsystem>
       <subsystem supplement="jts-example">configuration/subsystems/transactions.xml</subsystem>
-      <subsystem>configuration/subsystems/web.xml</subsystem>
+      <subsystem>configuration/subsystems/undertow.xml</subsystem>
       <subsystem>configuration/subsystems/webservices.xml</subsystem>
       <subsystem>configuration/subsystems/weld.xml</subsystem>
    </subsystems>
diff --git a/build/src/main/resources/configuration/examples/subsystems-xts.xml b/build/src/main/resources/configuration/examples/subsystems-xts.xml
index 613234f2a94..1c07da91335 100644
--- a/build/src/main/resources/configuration/examples/subsystems-xts.xml
+++ b/build/src/main/resources/configuration/examples/subsystems-xts.xml
@@ -28,7 +28,7 @@
       <subsystem supplement="standalone">configuration/subsystems/security.xml</subsystem>
       <subsystem>configuration/subsystems/threads.xml</subsystem>
       <subsystem>configuration/subsystems/transactions.xml</subsystem>
-      <subsystem>configuration/subsystems/web.xml</subsystem>
+      <subsystem>configuration/subsystems/undertow.xml</subsystem>
       <subsystem>configuration/subsystems/webservices.xml</subsystem>
       <subsystem>configuration/subsystems/weld.xml</subsystem>
       <subsystem>configuration/examples/subsystems/xts.xml</subsystem>
diff --git a/osgi/integration/http/pom.xml b/osgi/integration/http/pom.xml
index 6a3532f5399..3ae3cff596a 100644
--- a/osgi/integration/http/pom.xml
+++ b/osgi/integration/http/pom.xml
@@ -93,6 +93,7 @@
                             !org.jboss.as.osgi*, 
                             !org.jboss.as.server*, 
                             !org.jboss.as.web*,
+                            !io.undertow*,
                         </Import-Package>
                     </instructions>
                 </configuration>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/initializeinorder/InitializeInOrderTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/initializeinorder/InitializeInOrderTestCase.java
index d95da753649..b0cf883e123 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/initializeinorder/InitializeInOrderTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/initializeinorder/InitializeInOrderTestCase.java
@@ -66,14 +66,12 @@ public static Archive<?> deployment() {
 
     @Test
     public void testPostConstruct() throws NamingException {
-        System.out.println("initOrder = " + initOrder);
         Assert.assertEquals(2, initOrder.size());
         Assert.assertEquals("MyServlet", initOrder.get(0));
         Assert.assertEquals("MyEjb", initOrder.get(1));
     }
     
     public static void recordInit(final String clazz) {
-        System.out.println("adding class: " +clazz);
         initOrder.add(clazz);
     }
 
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 98eb28b79f0..3d53594627d 100644
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -56,7 +56,7 @@
                 <module>osgi</module>
                 <module>iiop</module>
                 <module>xts</module>
-                <!--module>clust</module-->
+                <module>clust</module>
                 <module>multinode</module>
                 <module>manualmode</module>
             </modules>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 637f79bcd53..9392cebf966 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -492,8 +492,8 @@
             <activation><property><name>allTests</name></property></activation>
             <modules>
                 <module>integration</module>
-                <!--<module>compat</module>
-                <module>domain</module>-->
+                <module>compat</module>
+                <!--<module>domain</module>-->
             </modules>
         </profile>