You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2012/09/27 22:42:28 UTC
svn commit: r1391203 - in /activemq/trunk: activemq-core/
activemq-core/src/test/java/org/apache/activemq/usecases/
activemq-core/src/test/resources/org/apache/activemq/usecases/
activemq-optional/src/test/java/org/apache/activemq/
Author: gtully
Date: Thu Sep 27 20:42:28 2012
New Revision: 1391203
URL: http://svn.apache.org/viewvc?rev=1391203&view=rev
Log:
move http network test to options module so it can be run
Added:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java (contents, props changed)
- copied, changed from r1391152, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
Removed:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
Modified:
activemq/trunk/activemq-core/pom.xml
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1391203&r1=1391202&r2=1391203&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Thu Sep 27 20:42:28 2012
@@ -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>
Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml?rev=1391203&r1=1391202&r2=1391203&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml Thu Sep 27 20:42:28 2012
@@ -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"/>
Copied: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java (from r1391152, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java?p2=activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java&r1=1391152&r2=1391203&rev=1391203&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java Thu Sep 27 20:42:28 2012
@@ -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;
/**
*
Propchange: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date