Author: chirino
Date: Mon Jun 22 23:39:37 2009
New Revision: 787445
URL: http://svn.apache.org/viewvc?rev=787445&view=rev
Log:
Disabling watchTopicAdvisories for now as it's not yet implmeneted and perhaps
it's a better to default to false anyways.
Moving passing tests out of the legacy package.
Added:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java
- copied, changed from r787427,
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java
- copied, changed from r787427,
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/apollo/test2/JmsClientAckListenerTest.java
- copied, changed from r787427,
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/apollo/test2/JmsClientAckTest.java
- copied, changed from r787427,
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/apollo/test3/JmsQueueRequestReplyTest.java
- copied, changed from r787427,
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueRequestReplyTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java
- copied, changed from r787427,
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java
Removed:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.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/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/test3/JmsQueueRequestReplyTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java
Modified:
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
Modified:
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=787445&r1=787444&r2=787445&view=diff
==============================================================================
---
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
(original)
+++
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
Mon Jun 22 23:39:37 2009
@@ -143,7 +143,7 @@
private boolean exclusiveConsumer;
private boolean alwaysSyncSend;
private int closeTimeout = 15000;
- private boolean watchTopicAdvisories = true;
+ private boolean watchTopicAdvisories = false;
private long warnAboutUnstartedConnectionTimeout = 500L;
private int sendTimeout =0;
private boolean sendAcksAsync=true;
Modified:
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?rev=787445&r1=787444&r2=787445&view=diff
==============================================================================
---
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
(original)
+++
activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
Mon Jun 22 23:39:37 2009
@@ -105,7 +105,7 @@
private boolean exclusiveConsumer;
private boolean nestedMapAndListEnabled = true;
private boolean alwaysSyncSend;
- private boolean watchTopicAdvisories = true;
+ private boolean watchTopicAdvisories = false;
private int producerWindowSize = DEFAULT_PRODUCER_WINDOW_SIZE;
private long warnAboutUnstartedConnectionTimeout = 500L;
private int sendTimeout =0;
Copied:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java
(from r787427,
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java&r1=787427&r2=787445&rev=787445&view=diff
==============================================================================
---
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java
(original)
+++
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java
Mon Jun 22 23:39:37 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test1;
+package org.apache.activemq.apollo.test1;
import java.lang.Thread.UncaughtExceptionHandler;
import java.util.HashMap;
@@ -41,7 +41,6 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQMessageConsumer;
import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
Copied:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java
(from r787427,
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/apollo/test2/JMSDurableTopicRedeliverTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSDurableTopicRedeliverTest.java&r1=787427&r2=787445&rev=787445&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/apollo/test2/JMSDurableTopicRedeliverTest.java
Mon Jun 22 23:39:37 2009
@@ -14,13 +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.Message;
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;
Copied:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsClientAckListenerTest.java
(from r787427,
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/apollo/test2/JmsClientAckListenerTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsClientAckListenerTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckListenerTest.java&r1=787427&r2=787445&rev=787445&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/apollo/test2/JmsClientAckListenerTest.java
Mon Jun 22 23:39:37 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;
@@ -24,7 +24,6 @@
import javax.jms.Queue;
import javax.jms.Session;
-import org.apache.activemq.apollo.test2.TestSupport;
/**
Copied:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsClientAckTest.java
(from r787427,
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/apollo/test2/JmsClientAckTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsClientAckTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckTest.java&r1=787427&r2=787445&rev=787445&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/apollo/test2/JmsClientAckTest.java
Mon Jun 22 23:39:37 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;
@@ -24,7 +24,6 @@
import javax.jms.Queue;
import javax.jms.Session;
-import org.apache.activemq.apollo.test2.TestSupport;
/**
Copied:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueRequestReplyTest.java
(from r787427,
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueRequestReplyTest.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueRequestReplyTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueRequestReplyTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueRequestReplyTest.java&r1=787427&r2=787445&rev=787445&view=diff
==============================================================================
---
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueRequestReplyTest.java
(original)
+++
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueRequestReplyTest.java
Mon Jun 22 23:39:37 2009
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
+
/**
Copied:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java
(from r787427,
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java&r1=787427&r2=787445&rev=787445&view=diff
==============================================================================
---
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java
(original)
+++
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java
Mon Jun 22 23:39:37 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
import java.util.List;
import java.util.Vector;
@@ -29,7 +29,6 @@
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.activemq.apollo.test3.TestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
