From 0729dd88d650bd87e89ff08318770de8f61c1665 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Fri, 9 Nov 2012 17:04:57 +0000
Subject: [PATCH] Revert the last change.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407544 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-core/pom.xml | 103 +++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 56 deletions(-)

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 90b26d1abb..8ea7d21cde 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -601,9 +601,9 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <excludes combine.children="append">
-                                <!-- These are performance tests so take too long to run -->
+                                <!-- These are performance tests and take too long to run -->
                                 <exclude>**/perf/*</exclude>
-                                <!-- These are load tests so take too long to run -->
+                                <!-- These are load tests and take too long to run -->
                                 <exclude>**/load/*</exclude>
                             </excludes>
                         </configuration>
@@ -611,14 +611,12 @@
                 </plugins>
             </build>
         </profile>
-        <!-- Apache CI builds enable this profile to avoid testing known failing cases -->
         <profile>
-            <id>activemq.tests-exclude-broken</id>
+            <id>activemq.exclude-broken-tests</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
                 <property>
                     <name>activemq.tests</name>
-                    <value>exclude-broken</value>
                 </property>
             </activation>
             <build>
@@ -627,63 +625,58 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <excludes combine.children="append">
-                                <!-- These are performance tests so take too long to run -->
-                                <exclude>**/perf/*</exclude>
-                                <!-- These are load tests so take too long to run -->
-                                <exclude>**/load/*</exclude>
+                                <!-- http://jira.activemq.org/jira/browse/AMQ-626 -->
+                                <exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>
+                                <exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>
+                                <exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
 
-                                <!--&lt;!&ndash; http://jira.activemq.org/jira/browse/AMQ-626 &ndash;&gt;-->
-                                <!--<exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>-->
-                                <!--<exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>-->
-                                <!--<exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>-->
+                                <!-- Multicast and UDP based tests fail on GBuild -->
+                                <exclude>**/PeerTransportTest.*</exclude>
+                                <exclude>**/MulticastTransportTest.*</exclude>
+                                <exclude>**/MulticastNetworkTest.*</exclude>
+                                <exclude>**/UnreliableUdpTransportTest.*</exclude>
+                                <exclude>**/SslTransportBrokerTest.*</exclude>
 
-                                <!--&lt;!&ndash; Multicast and UDP based tests fail on GBuild &ndash;&gt;-->
-                                <!--<exclude>**/PeerTransportTest.*</exclude>-->
-                                <!--<exclude>**/MulticastTransportTest.*</exclude>-->
-                                <!--<exclude>**/MulticastNetworkTest.*</exclude>-->
-                                <!--<exclude>**/UnreliableUdpTransportTest.*</exclude>-->
-                                <!--<exclude>**/SslTransportBrokerTest.*</exclude>-->
+                                <!-- this one is a little flaky and can fail on some platforms randomly -->
+                                <exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>
+                                <exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>
+                                <exclude>**/ZeroconfDiscoverTransportTest.*</exclude>
 
-                                <!--&lt;!&ndash; this one is a little flaky and can fail on some platforms randomly &ndash;&gt;-->
-                                <!--<exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>-->
-                                <!--<exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>-->
-                                <!--<exclude>**/ZeroconfDiscoverTransportTest.*</exclude>-->
+                                <!-- m2 tests failing since move from assembly  -->
+                                <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
+                                <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
 
-                                <!--&lt;!&ndash; m2 tests failing since move from assembly  &ndash;&gt;-->
-                                <!--<exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>-->
-                                <!--<exclude>**/TwoBrokerMulticastQueueTest.*</exclude>-->
+                                <!-- This test only works on machines which have ssh propertly configured -->
+                                <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
 
-                                <!--&lt;!&ndash; This test only works on machines which have ssh propertly configured &ndash;&gt;-->
-                                <!--<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>-->
+                                <!-- http://issues.apache.org/activemq/browse/AMQ-1027 -->
+                                <exclude>**/FailoverConsumerTest.*</exclude>
 
-                                <!--&lt;!&ndash; http://issues.apache.org/activemq/browse/AMQ-1027 &ndash;&gt;-->
-                                <!--<exclude>**/FailoverConsumerTest.*</exclude>-->
+                                <!-- The NIO implemenation is not working properly on OS X.. -->
+                                <exclude>**/nio/**</exclude>
+                                <exclude>**/NioQueueSubscriptionTest.*/</exclude>
 
-                                <!--&lt;!&ndash; The NIO implemenation is not working properly on OS X.. &ndash;&gt;-->
-                                <!--<exclude>**/nio/**</exclude>-->
-                                <!--<exclude>**/NioQueueSubscriptionTest.*/</exclude>-->
+                                <!-- A test used for memory profiling only. -->
+                                <exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
 
-                                <!--&lt;!&ndash; A test used for memory profiling only. &ndash;&gt;-->
-                                <!--<exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>-->
+                                <!-- used just to test potential memory leaks manually -->
+                                <exclude>**/JDBCTestMemory.*</exclude>
 
-                                <!--&lt;!&ndash; used just to test potential memory leaks manually &ndash;&gt;-->
-                                <!--<exclude>**/JDBCTestMemory.*</exclude>-->
+                                <exclude>**/amq1490/*</exclude>
+                                <exclude>**/archive/*</exclude>
+                                <exclude>**/NetworkFailoverTest.*/**</exclude>
 
-                                <!--<exclude>**/amq1490/*</exclude>-->
-                                <!--<exclude>**/archive/*</exclude>-->
-                                <!--<exclude>**/NetworkFailoverTest.*/**</exclude>-->
+                                <exclude>**/vm/VMTransportBrokerTest.*</exclude>
+                                <exclude>**/broker/MarshallingBrokerTest.*</exclude>
 
-                                <!--<exclude>**/vm/VMTransportBrokerTest.*</exclude>-->
-                                <!--<exclude>**/broker/MarshallingBrokerTest.*</exclude>-->
+                                <exclude>**/AMQDeadlockTest3.*</exclude>
 
-                                <!--<exclude>**/AMQDeadlockTest3.*</exclude>-->
+                                <!-- https://issues.apache.org/activemq/browse/AMQ-2050 -->
+                                <exclude>**/ProxyConnectorTest.*</exclude>
 
-                                <!--&lt;!&ndash; https://issues.apache.org/activemq/browse/AMQ-2050 &ndash;&gt;-->
-                                <!--<exclude>**/ProxyConnectorTest.*</exclude>-->
-
-                                <!--&lt;!&ndash; breaks hudson: disable till we get a chance to give it the time that it needs - http://hudson.zones.apache.org/hudson/job/ActiveMQ/org.apache.activemq$activemq-core/199/testReport/org.apache.activemq.network/BrokerNetworkWithStuckMessagesTest/testBrokerNetworkWithStuckMessages/ &ndash;&gt;-->
-                                <!--<exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>-->
-                                <!--<exclude>**/DoSTest.*</exclude>-->
+                                <!-- breaks hudson: disable till we get a chance to give it the time that it needs - http://hudson.zones.apache.org/hudson/job/ActiveMQ/org.apache.activemq$activemq-core/199/testReport/org.apache.activemq.network/BrokerNetworkWithStuckMessagesTest/testBrokerNetworkWithStuckMessages/ -->
+                                <exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>
+                                <exclude>**/DoSTest.*</exclude>
 
                             </excludes>
                         </configuration>
@@ -702,18 +695,16 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <excludes combine.children="append">
-                                <exclude>**/perf/SimpleDurableTopicTest.*</exclude>
+                                <!-- These are performance tests and take too long to run -->
+                                <exclude>**/perf/*</exclude>
+                                <!-- These are load tests and take too long to run -->
+                                <exclude>**/load/*</exclude>
+
                                 <!-- These tests run too slow to execute as part of the unit tests -->
                                 <exclude>**/TransactionNotStartedErrorTest.*</exclude>
                                 <exclude>**/DefaultStoreBrokerTest.*</exclude>
                                 <exclude>**/TcpTransportBrokerTest.*</exclude>
 
-                                <!-- These are performance tests so take too long to run -->
-                                <exclude>**/perf/*</exclude>
-
-                                <!-- These are load tests so take too long to run -->
-                                <exclude>**/load/*</exclude>
-
                                 <!-- Don't run the openwire encoding tests since the test and impls are code generated -->
                                 <exclude>org/apache/activemq/openwire/v*/**</exclude>