re-enable clustring tests

re-enable more tests Fix configurations to use undertow
jbossas · Apr 4, 2013 · 45a268b · 45a268b
1 parent 57d6ce0
commit 45a268b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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/...st/java/org/jboss/as/test/integration/ee/initializeinorder/InitializeInOrderTestCase.java b/...st/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
@@ -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
@@ -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>