You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/06/19 22:15:11 UTC
svn commit: r786650 - in /activemq/sandbox/activemq-flow:
activemq-broker/src/main/java/org/apache/activemq/apollo/broker/
activemq-client/src/test/java/org/apache/activemq/apollo/test2/
activemq-client/src/test/java/org/apache/activemq/legacy/test2/
Author: chirino
Date: Fri Jun 19 20:15:10 2009
New Revision: 786650
URL: http://svn.apache.org/viewvc?rev=786650&view=rev
Log:
Moving lots of tests out of the legacy package since they are now passing.
Added:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/ConsumerReceiveWithTimeoutTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/ConsumerReceiveWithTimeoutTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSQueueRedeliverTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSQueueRedeliverTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckListenerTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckListenerTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsConnectionStartStopTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsConnectionStartStopTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsCreateConsumerInOnMessageTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsCreateConsumerInOnMessageTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableQueueWildcardSendReceiveTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableQueueWildcardSendReceiveTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableTopicWildcardSendReceiveTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicWildcardSendReceiveTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsQueueSelectorTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsQueueSelectorTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveTestSupport.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveWithMessageExpirationTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicRedeliverTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSelectorTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveSubscriberTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveSubscriberTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendSameMessageTest.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendSameMessageTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/TestSupport.java
- copied, changed from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/TestSupport.java
Removed:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/ConsumerReceiveWithTimeoutTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSQueueRedeliverTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckListenerTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsConnectionStartStopTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsCreateConsumerInOnMessageTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableQueueWildcardSendReceiveTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicWildcardSendReceiveTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsQueueSelectorTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveTestSupport.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveWithMessageExpirationTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicRedeliverTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSelectorTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveSubscriberTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendSameMessageTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/TestSupport.java
Modified:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSDurableTopicRedeliverTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSIndividualAckTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckListenerTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSelectorTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java Fri Jun 19 20:15:10 2009
@@ -23,7 +23,6 @@
import org.apache.activemq.Service;
import org.apache.activemq.apollo.broker.ProtocolHandler.ConsumerContext;
-import org.apache.activemq.apollo.broker.path.PathMap;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
import org.apache.activemq.protobuf.AsciiBuffer;
@@ -97,13 +96,7 @@
}
if ( database == null ) {
- Store store = StoreFactory.createStore("kaha-db");
- if( store.getStoreDirectory() == null ) {
- File baseDir = broker.getDataDirectory();
- String hostName = getHostName().toString();
- String subDir = IOHelper.toFileSystemDirectorySafeName(hostName);
- store.setStoreDirectory( new File(baseDir, subDir ) );
- }
+ Store store = createDefaultStore();
database = new BrokerDatabase(store);
}
@@ -129,6 +122,17 @@
started = true;
}
+ public Store createDefaultStore() throws Exception {
+ Store store = StoreFactory.createStore("kaha-db");
+ if( store.getStoreDirectory() == null ) {
+ File baseDir = broker.getDataDirectory();
+ String hostName = getHostName().toString();
+ String subDir = IOHelper.toFileSystemDirectorySafeName(hostName);
+ store.setStoreDirectory( new File(baseDir, subDir ) );
+ }
+ return store;
+ }
+
public synchronized void stop() throws Exception {
if (!started) {
return;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/ConsumerReceiveWithTimeoutTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/ConsumerReceiveWithTimeoutTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/ConsumerReceiveWithTimeoutTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/ConsumerReceiveWithTimeoutTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/ConsumerReceiveWithTimeoutTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/ConsumerReceiveWithTimeoutTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/ConsumerReceiveWithTimeoutTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.JMSException;
@@ -25,6 +25,7 @@
import javax.jms.Session;
+
/**
* @version $Revision: 1.1.1.1 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSQueueRedeliverTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSQueueRedeliverTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSQueueRedeliverTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSQueueRedeliverTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSQueueRedeliverTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSQueueRedeliverTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSQueueRedeliverTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
+
/**
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckListenerTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckListenerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckListenerTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckListenerTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckListenerTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckListenerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckListenerTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.Message;
@@ -25,6 +25,7 @@
import javax.jms.Session;
+
/**
* @version $Revision: 1.2 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsAutoAckTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.JMSException;
@@ -25,6 +25,7 @@
import javax.jms.Session;
+
/**
* @version $Revision: 1.2 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsConnectionStartStopTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsConnectionStartStopTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsConnectionStartStopTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsConnectionStartStopTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsConnectionStartStopTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsConnectionStartStopTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsConnectionStartStopTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.JMSException;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsCreateConsumerInOnMessageTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsCreateConsumerInOnMessageTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsCreateConsumerInOnMessageTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsCreateConsumerInOnMessageTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsCreateConsumerInOnMessageTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsCreateConsumerInOnMessageTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsCreateConsumerInOnMessageTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.Message;
@@ -25,6 +25,7 @@
import javax.jms.Topic;
+
/**
* @version $Revision: 1.2 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableQueueWildcardSendReceiveTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableQueueWildcardSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableQueueWildcardSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableQueueWildcardSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableQueueWildcardSendReceiveTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableQueueWildcardSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableQueueWildcardSendReceiveTest.java Fri Jun 19 20:15:10 2009
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.DeliveryMode;
+
/**
* @version $Revision: 1.2 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableTopicWildcardSendReceiveTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicWildcardSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableTopicWildcardSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableTopicWildcardSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicWildcardSendReceiveTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicWildcardSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsDurableTopicWildcardSendReceiveTest.java Fri Jun 19 20:15:10 2009
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.DeliveryMode;
+
/**
* @version $Revision: 1.2 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsQueueSelectorTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsQueueSelectorTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsQueueSelectorTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsQueueSelectorTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsQueueSelectorTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsQueueSelectorTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsQueueSelectorTest.java Fri Jun 19 20:15:10 2009
@@ -15,7 +15,8 @@
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
+
/**
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveTestSupport.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,7 +39,7 @@
/**
* @version $Revision: 1.7 $
*/
-public class JmsSendReceiveTestSupport extends TestSupport implements MessageListener {
+abstract public class JmsSendReceiveTestSupport extends TestSupport implements MessageListener {
private static final Log LOG = LogFactory.getLog(JmsSendReceiveTestSupport.class);
protected int messageCount = 100;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveWithMessageExpirationTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveWithMessageExpirationTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveWithMessageExpirationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import java.util.Date;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicRedeliverTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicRedeliverTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicRedeliverTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.Destination;
@@ -99,7 +99,7 @@
* Returns the consumer subject.
*
* @return String - consumer subject
- * @see org.apache.activemq.legacy.testsupport.test.TestSupport#getConsumerSubject()
+ * @see org.apache.activemq.apollo.test2.testsupport.test.TestSupport#getConsumerSubject()
*/
protected String getConsumerSubject() {
return "TEST";
@@ -109,7 +109,7 @@
* Returns the producer subject.
*
* @return String - producer subject
- * @see org.apache.activemq.legacy.testsupport.test.TestSupport#getProducerSubject()
+ * @see org.apache.activemq.apollo.test2.testsupport.test.TestSupport#getProducerSubject()
*/
protected String getProducerSubject() {
return "TEST";
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSelectorTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSelectorTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSelectorTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java Fri Jun 19 20:15:10 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveSubscriberTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveSubscriberTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveSubscriberTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveSubscriberTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveSubscriberTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveSubscriberTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveSubscriberTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
@@ -22,6 +22,7 @@
import javax.jms.TopicSession;
+
/**
* @version $Revision: 1.4 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendSameMessageTest.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendSameMessageTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendSameMessageTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendSameMessageTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendSameMessageTest.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendSameMessageTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendSameMessageTest.java Fri Jun 19 20:15:10 2009
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import javax.jms.TextMessage;
+
/**
* @version $Revision: 1.3 $
*/
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/TestSupport.java (from r786645, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/TestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/TestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/TestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/TestSupport.java&r1=786645&r2=786650&rev=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/TestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/TestSupport.java Fri Jun 19 20:15:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test2;
+package org.apache.activemq.apollo.test2;
import java.io.File;
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java Fri Jun 19 20:15:10 2009
@@ -29,8 +29,11 @@
import javax.jms.TopicSubscriber;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.activemq.legacy.store.PersistenceAdapter;
+import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.test2.TestSupport;
+import org.apache.activemq.broker.store.Store;
+import org.apache.activemq.protobuf.AsciiBuffer;
+
/**
* @version $Revision: 1.1.1.1 $
@@ -41,7 +44,7 @@
private Session session;
private TopicSubscriber consumer;
private MessageProducer producer;
- private BrokerService broker;
+ private Broker broker;
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory("vm://durable-broker");
@@ -70,11 +73,11 @@
private void createBroker() throws Exception {
try {
- broker = new BrokerService();
- broker.setBrokerName("durable-broker");
- broker.setDeleteAllMessagesOnStartup(true);
- broker.setPersistenceAdapter(createPersistenceAdapter());
- broker.setPersistent(true);
+ broker = new Broker();
+ broker.getDefaultVirtualHost().addHostName(new AsciiBuffer("durable-broker"));
+ Store store = createPersistenceAdapter();
+ store.setDeleteAllMessages(true);
+ broker.getDefaultVirtualHost().setStore(store);
broker.start();
} catch (Exception e) {
e.printStackTrace();
@@ -85,13 +88,12 @@
private void createRestartedBroker() throws Exception {
try {
- broker = new BrokerService();
- broker.setBrokerName("durable-broker");
- broker.setDeleteAllMessagesOnStartup(false);
- broker.setPersistenceAdapter(createPersistenceAdapter());
- broker.setPersistent(true);
+ broker = new Broker();
+ broker.getDefaultVirtualHost().addHostName(new AsciiBuffer("durable-broker"));
+ Store store = createPersistenceAdapter();
+ store.setDeleteAllMessages(true);
+ broker.getDefaultVirtualHost().setStore(store);
broker.start();
-
} catch (Exception e) {
e.printStackTrace();
}
@@ -108,7 +110,7 @@
}
}
- protected abstract PersistenceAdapter createPersistenceAdapter() throws Exception;
+ protected abstract Store createPersistenceAdapter() throws Exception;
public void testUnsubscribeSubscription() throws Exception {
session = connection.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSDurableTopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSDurableTopicRedeliverTest.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSDurableTopicRedeliverTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSDurableTopicRedeliverTest.java Fri Jun 19 20:15:10 2009
@@ -20,6 +20,7 @@
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.apache.activemq.apollo.test2.JmsTopicRedeliverTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSIndividualAckTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSIndividualAckTest.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSIndividualAckTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSIndividualAckTest.java Fri Jun 19 20:15:10 2009
@@ -10,6 +10,7 @@
import javax.jms.TextMessage;
import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.apollo.test2.TestSupport;
/**
* @version $Revision: 1.4 $
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckListenerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckListenerTest.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckListenerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckListenerTest.java Fri Jun 19 20:15:10 2009
@@ -24,6 +24,8 @@
import javax.jms.Queue;
import javax.jms.Session;
+import org.apache.activemq.apollo.test2.TestSupport;
+
/**
* @version $Revision: 1.3 $
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckTest.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckTest.java Fri Jun 19 20:15:10 2009
@@ -24,6 +24,8 @@
import javax.jms.Queue;
import javax.jms.Session;
+import org.apache.activemq.apollo.test2.TestSupport;
+
/**
* @version $Revision: 1.4 $
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSelectorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSelectorTest.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSelectorTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSelectorTest.java Fri Jun 19 20:15:10 2009
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.legacy.test2;
+import org.apache.activemq.apollo.test2.JmsTopicSelectorTest;
+
/**
* @version $Revision: 1.2 $
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java Fri Jun 19 20:15:10 2009
@@ -25,6 +25,7 @@
import javax.jms.TextMessage;
import javax.jms.Topic;
+import org.apache.activemq.apollo.test2.JmsTopicSendReceiveTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java?rev=786650&r1=786649&r2=786650&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java Fri Jun 19 20:15:10 2009
@@ -17,6 +17,7 @@
package org.apache.activemq.legacy.test2;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.apollo.test2.JmsTopicSendReceiveWithTwoConnectionsTest;
/**
*