Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move http network test to options module so it can be run 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1391203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2012-09-27 20:42:28 +00:00
parent 8a75d960d5
commit f37fc74822
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-core/pom.xml
View File

@ -516,9 +516,6 @@
<exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
<exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
<!-- TODO move to optional module... -->
<exclude>**/TwoBrokerTopicSendReceiveUsingHttpTest.*</exclude>
<!-- This test only works on machines which have ssh propertly configured -->
<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
@ -1152,9 +1149,6 @@
<exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
<exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
<!-- TODO move to optional module... -->
<exclude>**/TwoBrokerTopicSendReceiveUsingHttpTest.*</exclude>
<!-- This test only works on machines which have ssh propertly configured -->
<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>

7
activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
View File

@ -15,7 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans>
<beans
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

3
activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java → activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java
View File

@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.usecases;
package org.apache.activemq;
import javax.jms.JMSException;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.usecases.TwoBrokerTopicSendReceiveTest;
/**
*