Author: ritchiem
Date: Sun Sep 6 02:20:34 2009
New Revision: 811748
URL: http://svn.apache.org/viewvc?rev=811748&view=rev
Log:
QPID-2081, QPID-155 : Updated AMQSession to allow queue/exchange decare to be
set on a per session basis
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
qpid/trunk/qpid/java/test-profiles/Excludes
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=811748&r1=811747&r2=811748&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Sun Sep 6 02:20:34 2009
@@ -206,9 +206,9 @@
*/
protected static final boolean DEFAULT_MANDATORY =
Boolean.parseBoolean(System.getProperty("qpid.default_mandatory", "true"));
- protected static final boolean DECLARE_QUEUES =
+ protected final boolean DECLARE_QUEUES =
Boolean.parseBoolean(System.getProperty("qpid.declare_queues",
"true"));
- protected static final boolean DECLARE_EXCHANGES =
+ protected final boolean DECLARE_EXCHANGES =
Boolean.parseBoolean(System.getProperty("qpid.declare_exchanges",
"true"));
/** System property to enable strict AMQP compliance. */
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java?rev=811748&r1=811747&r2=811748&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
Sun Sep 6 02:20:34 2009
@@ -46,8 +46,11 @@
fail("JMSException should be thrown as the queue does not exist");
}
catch (JMSException e)
- {
- assertTrue(e.getMessage().contains("does not exist"));
+ {
+ assertTrue("Exception should be that the queue does not exist :" +
+ e.getMessage(),
+ e.getMessage().contains("does not exist"));
+
}
}
@@ -60,7 +63,7 @@
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
String EXCHANGE_TYPE = "test.direct";
- Queue queue = session.createQueue("new.direct://" + EXCHANGE_TYPE +
"/queue/queue");
+ Queue queue = session.createQueue("direct://" + EXCHANGE_TYPE +
"/queue/queue");
try
{
@@ -69,9 +72,9 @@
}
catch (JMSException e)
{
- System.err.println(e.getMessage());
-
- assertTrue(e.getMessage().contains("Exchange " + EXCHANGE_TYPE + "
does not exist"));
+ assertTrue("Exception should be that the exchange does not exist
:" +
+ e.getMessage(),
+ e.getMessage().contains("Exchange " + EXCHANGE_TYPE + "
does not exist"));
}
}
Modified: qpid/trunk/qpid/java/test-profiles/Excludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Excludes?rev=811748&r1=811747&r2=811748&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/Excludes (original)
+++ qpid/trunk/qpid/java/test-profiles/Excludes Sun Sep 6 02:20:34 2009
@@ -15,5 +15,3 @@
org.apache.qpid.server.logging.MemoryMessageStoreLoggingTest#testMessageStoreClose
org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#testMessageStoreClose
-// QPID-2081 - the connection close here needs more work
-org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#testExchangeDeclare
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
