jmscts-cvs Mailing List for JMS CTS
Status: Alpha
Brought to you by:
tanderson
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(51) |
Jun
(69) |
Jul
(191) |
Aug
(7) |
Sep
(38) |
Oct
(41) |
Nov
|
Dec
(8) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(26) |
Feb
(69) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(7) |
Oct
|
Nov
|
Dec
|
2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Tim A. <tan...@us...> - 2007-01-05 12:33:13
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/consumer In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31916/src/java/org/exolab/jmscts/test/consumer Log Message: Directory /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/consumer added to the repository |
From: DonH <do...@us...> - 2006-09-19 19:55:36
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/header In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16979/test/message/header Modified Files: JMSMessageIDTest.java Log Message: add check before commit to not do commit for an XASession Index: JMSMessageIDTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/header/JMSMessageIDTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JMSMessageIDTest.java 16 Jun 2005 06:36:53 -0000 1.2 --- JMSMessageIDTest.java 19 Sep 2006 19:55:12 -0000 1.3 *************** *** 182,186 **** } ! if (session.getTransacted()) { session.commit(); } --- 182,186 ---- } ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } *************** *** 197,201 **** } ! if (session.getTransacted()) { session.commit(); } --- 197,201 ---- } ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } |
From: DonH <do...@us...> - 2006-09-19 19:55:18
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/clear In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16979/test/message/clear Modified Files: SendReceiveClearTest.java Log Message: add check before commit to not do commit for an XASession Index: SendReceiveClearTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/clear/SendReceiveClearTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SendReceiveClearTest.java 16 Jun 2005 06:36:52 -0000 1.10 --- SendReceiveClearTest.java 19 Sep 2006 19:55:12 -0000 1.11 *************** *** 218,222 **** Session session = context.getSession(); ! if (session.getTransacted()) { session.commit(); } --- 218,222 ---- Session session = context.getSession(); ! if (session.getTransacted() && !(session instanceof javax.jms.XASession)) { session.commit(); } |
From: DonH <do...@us...> - 2006-09-19 19:55:16
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16979/core Modified Files: EchoListener.java MessagingHelper.java SendReceiveTestInvoker.java Log Message: add check before commit to not do commit for an XASession Index: SendReceiveTestInvoker.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/SendReceiveTestInvoker.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SendReceiveTestInvoker.java 16 Jun 2005 08:10:52 -0000 1.5 --- SendReceiveTestInvoker.java 19 Sep 2006 19:55:12 -0000 1.6 *************** *** 193,197 **** if (!context.isInvalid()) { try { ! if (session.getTransacted()) { // flush any messages to help ensure that destroying the // destination doesn't cause too many problems --- 193,197 ---- if (!context.isInvalid()) { try { ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { // flush any messages to help ensure that destroying the // destination doesn't cause too many problems Index: EchoListener.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/EchoListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EchoListener.java 31 Jan 2004 13:44:24 -0000 1.3 --- EchoListener.java 19 Sep 2006 19:55:12 -0000 1.4 *************** *** 126,130 **** _sender.send(message, _count); if (_commit) { ! if (_session != null && _session.getTransacted()) { _session.commit(); } --- 126,130 ---- _sender.send(message, _count); if (_commit) { ! if (_session != null && !(_session instanceof javax.jms.XASession) && _session.getTransacted()) { _session.commit(); } Index: MessagingHelper.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/MessagingHelper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MessagingHelper.java 31 Jan 2004 13:44:24 -0000 1.4 --- MessagingHelper.java 19 Sep 2006 19:55:12 -0000 1.5 *************** *** 192,196 **** sender.send(message, 1); Session session = context.getSession(); ! if (session.getTransacted()) { session.commit(); } --- 192,196 ---- sender.send(message, 1); Session session = context.getSession(); ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } *************** *** 207,211 **** + " but got " + messages.size()); } ! if (session.getTransacted()) { session.commit(); } --- 207,211 ---- + " but got " + messages.size()); } ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } |
From: DonH <do...@us...> - 2006-09-19 19:55:16
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/copy In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16979/test/message/copy Modified Files: MessageCopyTest.java Log Message: add check before commit to not do commit for an XASession Index: MessageCopyTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/copy/MessageCopyTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MessageCopyTest.java 16 Jun 2005 06:36:53 -0000 1.7 --- MessageCopyTest.java 19 Sep 2006 19:55:12 -0000 1.8 *************** *** 177,181 **** expected.add(copy); } ! if (session.getTransacted()) { session.commit(); } --- 177,181 ---- expected.add(copy); } ! if (session.getTransacted() && !(session instanceof javax.jms.XASession)) { session.commit(); } |
From: DonH <do...@us...> - 2006-09-19 19:55:16
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/producer/ttl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16979/test/producer/ttl Modified Files: ExpirationTest.java TimeToLiveTestCase.java Log Message: add check before commit to not do commit for an XASession Index: ExpirationTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/producer/ttl/ExpirationTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExpirationTest.java 16 Jun 2005 06:36:54 -0000 1.4 --- ExpirationTest.java 19 Sep 2006 19:55:12 -0000 1.5 *************** *** 327,331 **** } ! if (session.getTransacted()) { session.commit(); } --- 327,331 ---- } ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } *************** *** 369,373 **** acknowledge(messages); } ! if (session.getTransacted()) { session.commit(); } --- 369,373 ---- acknowledge(messages); } ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } Index: TimeToLiveTestCase.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/producer/ttl/TimeToLiveTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TimeToLiveTestCase.java 16 Jun 2005 06:40:28 -0000 1.3 --- TimeToLiveTestCase.java 19 Sep 2006 19:55:12 -0000 1.4 *************** *** 122,126 **** Session session = context.getSession(); ! if (session.getTransacted()) { session.commit(); } --- 122,126 ---- Session session = context.getSession(); ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } |
From: DonH <do...@us...> - 2006-09-19 19:55:16
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16979/test/session Modified Files: MessageListenerTest.java Log Message: add check before commit to not do commit for an XASession Index: MessageListenerTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session/MessageListenerTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MessageListenerTest.java 16 Jun 2005 07:50:05 -0000 1.8 --- MessageListenerTest.java 19 Sep 2006 19:55:12 -0000 1.9 *************** *** 143,147 **** Session session = context.getSession(); ! if (session.getTransacted()) { session.commit(); } --- 143,147 ---- Session session = context.getSession(); ! if (!(session instanceof javax.jms.XASession) && session.getTransacted()) { session.commit(); } |
From: DonH <do...@us...> - 2006-09-19 19:53:19
|
Update of /cvsroot/jmscts/jmscts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16167 Modified Files: build.xml Log Message: set build to -source 1.4 Index: build.xml =================================================================== RCS file: /cvsroot/jmscts/jmscts/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 4 Feb 2004 03:46:05 -0000 1.4 --- build.xml 19 Sep 2006 19:53:14 -0000 1.5 *************** *** 219,223 **** debug="${debug}" deprecation="${deprecation}" ! optimize="${optimization}"> <src path="${generated-src.dir}"/> <src path="${java.dir}"/> --- 219,224 ---- debug="${debug}" deprecation="${deprecation}" ! optimize="${optimization}" ! source="1.4"> <src path="${generated-src.dir}"/> <src path="${java.dir}"/> *************** *** 294,298 **** <target name="providers" description="Build each provider adapter into an installable jar"> - <ant antfile="src/providers/openjms/build.xml"/> </target> --- 295,298 ---- |
From: Tim A. <tan...@us...> - 2005-06-16 08:14:11
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28816/src/java/org/exolab/jmscts/core Modified Files: ConnectionFactoryTypes.java TestFilter.java Log Message: removed ConnectionFactoryTypes.getType(ConnctionFactory) Index: ConnectionFactoryTypes.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/ConnectionFactoryTypes.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ConnectionFactoryTypes.java 31 Jan 2004 13:44:24 -0000 1.4 --- ConnectionFactoryTypes.java 16 Jun 2005 08:14:00 -0000 1.5 *************** *** 164,184 **** /** - * Helper to return the type that a particular factory implements - * - * @param factory the connection factory - * @return the type of the factory - */ - public static Class getType(ConnectionFactory factory) { - Class result = null; - for (int i = 0; i < TYPES.length; ++i) { - if (TYPES[i].isAssignableFrom(factory.getClass())) { - result = TYPES[i]; - break; - } - } - return result; - } - - /** * Helper to convert a factory name to a * <code>ConnectionFactoryTypes</code> instance --- 164,167 ---- Index: TestFilter.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/TestFilter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TestFilter.java 31 Jan 2004 13:44:24 -0000 1.7 --- TestFilter.java 16 Jun 2005 08:14:00 -0000 1.8 *************** *** 186,190 **** boolean result = false; FactoryType factory = (FactoryType) FACTORIES.get( ! ConnectionFactoryTypes.getType(context.getConnectionFactory())); SessionType session = (SessionType) SESSIONS.get(mode); --- 186,190 ---- boolean result = false; FactoryType factory = (FactoryType) FACTORIES.get( ! context.getConnectionFactoryType()); SessionType session = (SessionType) SESSIONS.get(mode); *************** *** 213,217 **** boolean result = false; FactoryType factory = (FactoryType) FACTORIES.get( ! ConnectionFactoryTypes.getType(context.getConnectionFactory())); SessionType session = (SessionType) SESSIONS.get(context.getAckType()); MessageType message = (MessageType) MESSAGES.get(messageType); --- 213,217 ---- boolean result = false; FactoryType factory = (FactoryType) FACTORIES.get( ! context.getConnectionFactoryType()); SessionType session = (SessionType) SESSIONS.get(context.getAckType()); MessageType message = (MessageType) MESSAGES.get(messageType); *************** *** 244,248 **** FactoryType factory = (FactoryType) FACTORIES.get( ! ConnectionFactoryTypes.getType(context.getConnectionFactory())); SessionType session = (SessionType) SESSIONS.get( --- 244,248 ---- FactoryType factory = (FactoryType) FACTORIES.get( ! context.getConnectionFactoryType()); SessionType session = (SessionType) SESSIONS.get( |
From: Tim A. <tan...@us...> - 2005-06-16 08:12:14
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28246/src/java/org/exolab/jmscts/core Modified Files: MessagingBehaviour.java Log Message: added timeToLive accessors Index: MessagingBehaviour.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/MessagingBehaviour.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MessagingBehaviour.java 31 Jan 2004 13:44:24 -0000 1.5 --- MessagingBehaviour.java 16 Jun 2005 08:12:04 -0000 1.6 *************** *** 91,94 **** --- 91,100 ---- /** + * The time-to-live for messages, in milliseconds. Zero indicates that + * messages don't expire + */ + private long _timeToLive = 0; + + /** * The default timeout */ *************** *** 131,134 **** --- 137,141 ---- _priority = behaviour.getPriority(); _timeout = behaviour.getTimeout(); + _timeToLive = behaviour.getTimeToLive(); } *************** *** 245,248 **** --- 252,275 ---- /** + * Set the default time to live for messages + * + * @param timeToLive the message time to live in milliseconds; zero is + * unlimited + */ + public void setTimeToLive(long timeToLive) { + _timeToLive = timeToLive; + } + + /** + * Returns the default time to live for messages + * + * @return the default message time to live in milliseconds; zero is + * unlimited + */ + public long getTimeToLive() { + return _timeToLive; + } + + /** * Returns a string representation of the messaging behaviour * *************** *** 259,262 **** --- 286,290 ---- result.append(", destination type="); result.append((_administered) ? "administered" : "temporary"); + result.append(", timeToLive=" + _timeToLive); if (_durable) { result.append(", using durable subscriber"); |
From: Tim A. <tan...@us...> - 2005-06-16 08:11:15
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28008/src/java/org/exolab/jmscts/core Modified Files: SendReceiveTestInvoker.java TestInvoker.java MessageTestInvoker.java Log Message: refactored TestInvoker to enable subsclasses to override behaviour Index: MessageTestInvoker.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/MessageTestInvoker.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MessageTestInvoker.java 31 Jan 2004 13:44:24 -0000 1.2 --- MessageTestInvoker.java 16 Jun 2005 08:10:52 -0000 1.3 *************** *** 101,104 **** --- 101,106 ---- */ protected void setUp(JMSTest test, TestContext context) throws Exception { + super.setUp(test, context); + MessageTestCase messageTest = (MessageTestCase) test; Index: TestInvoker.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/TestInvoker.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestInvoker.java 31 Jan 2004 13:44:24 -0000 1.3 --- TestInvoker.java 16 Jun 2005 08:10:52 -0000 1.4 *************** *** 82,85 **** --- 82,95 ---- private final TestFilter _filter; + /** + * Connection context allocated for this test. May be <code>null</code> + */ + private TestContext _connection; + + /** + * Session context allocated for this test. May be <code>null</code> + */ + private TestContext _session; + /** *************** *** 119,159 **** */ public void protect() throws Exception { ! JMSTest test = (JMSTest) _test; ! TestContext context = _context; ! boolean shared = true; ! ! if (test instanceof TestRunner) { ! ((TestRunner) test).setFilter(_filter); ! } ! ! TestContext connection = null; ! TestContext session = null; ! ! if (!test.share()) { ! // test case cannot share resources, so allocate a new set ! if (_context.getSession() != null) { ! session = TestContextHelper.createSessionContext(_context); ! connection = session.getParent(); ! context = session; ! } else if (context.getConnection() != null) { ! connection = TestContextHelper.createConnectionContext( ! _context); ! context = connection; ! } ! } ! ! try { ! setUp(test, context); ! _test.run(_result); ! tearDown(test, context); ! } finally { ! // if new contexts were allocated, close them ! if (session != null) { ! session.close(); ! } ! if (connection != null) { ! connection.close(); ! } ! } } --- 129,135 ---- */ public void protect() throws Exception { ! setUp(); ! _test.run(_result); ! tearDown(); } *************** *** 177,180 **** --- 153,185 ---- /** + * Sets up the test. If required, this allocates a new test context, + * before invoking {@link #setUp(JMSTest test, TestContext context)} + * + * @throws Exception for any error + */ + protected void setUp() throws Exception { + JMSTest test = (JMSTest) _test; + TestContext context = _context; + + if (test instanceof TestRunner) { + ((TestRunner) test).setFilter(_filter); + } + + if (!test.share()) { + // test case cannot share resources, so allocate a new set + if (_context.getSession() != null) { + _session = TestContextHelper.createSessionContext(_context); + _connection = _session.getParent(); + context = _session; + } else if (context.getConnection() != null) { + _connection = TestContextHelper.createConnectionContext( + _context); + context = _connection; + } + } + setUp(test, context); + } + + /** * Setup the test * *************** *** 188,191 **** --- 193,226 ---- /** + * Tears down the test. This invokes + * {@link #tearDown(JMSTest test, TestContext context)}, before + * destroying any allocated contexts + * + * @throws Exception for any error + */ + protected void tearDown() throws Exception { + JMSTest test = (JMSTest) _test; + TestContext context = _context; + if (_session != null) { + context = _session; + } else if (_connection != null) { + context = _connection; + } + try { + tearDown(test, context); + } finally { + // if new contexts were allocated, close them + if (_session != null) { + _session.close(); + _session = null; + } + if (_connection != null) { + _connection.close(); + _connection = null; + } + } + } + + /** * Tear down the test * Index: SendReceiveTestInvoker.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/SendReceiveTestInvoker.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SendReceiveTestInvoker.java 31 Jan 2004 13:44:24 -0000 1.4 --- SendReceiveTestInvoker.java 16 Jun 2005 08:10:52 -0000 1.5 *************** *** 158,161 **** --- 158,175 ---- /** + * Tears down the test. This invokes {@link #tearDown(JMSTest test, + * TestContext context)}, before destroying any allocated contexts + * + * @throws Exception for any error + */ + protected void tearDown() throws Exception { + try { + super.tearDown(); + } finally { + destroyDestinations(_destinations); + } + } + + /** * Tear down the test * *************** *** 187,191 **** // session has been closed } - destroyDestinations(_destinations); } } --- 201,204 ---- |
From: Tim A. <tan...@us...> - 2005-06-16 08:06:18
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25920/src/java/org/exolab/jmscts/core Modified Files: MessageSender.java Log Message: added support for setting a listener to be notified each time a message is sent Index: MessageSender.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/core/MessageSender.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MessageSender.java 3 Feb 2004 21:52:06 -0000 1.5 --- MessageSender.java 16 Jun 2005 08:06:08 -0000 1.6 *************** *** 48,51 **** --- 48,52 ---- import javax.jms.JMSException; import javax.jms.Message; + import javax.jms.MessageListener; *************** *** 111,114 **** --- 112,129 ---- /** + * Sets a listener to be notified each time a message is sent + * + * @param listener the listener + */ + void setMessageListener(MessageListener listener); + + /** + * Returns the listener for sent messages + * + * @return the listener, or <code>null</code> if no listener is set + */ + MessageListener getMessageListener(); + + /** * Close the underlying MessageProducer * |
From: Tim A. <tan...@us...> - 2005-06-16 08:04:50
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/topic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25039/src/java/org/exolab/jmscts/test/topic Modified Files: DurableSubscriberTest.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: DurableSubscriberTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/topic/DurableSubscriberTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DurableSubscriberTest.java 3 Feb 2004 21:52:12 -0000 1.9 --- DurableSubscriberTest.java 16 Jun 2005 08:04:35 -0000 1.10 *************** *** 45,51 **** package org.exolab.jmscts.test.topic; import javax.jms.Destination; - import javax.jms.Session; import javax.jms.TopicSession; import junit.framework.Test; --- 45,52 ---- package org.exolab.jmscts.test.topic; + import java.util.List; import javax.jms.Destination; import javax.jms.TopicSession; + import javax.jms.Message; import junit.framework.Test; *************** *** 53,57 **** import org.exolab.jmscts.core.AbstractSendReceiveTestCase; import org.exolab.jmscts.core.MessageReceiver; - import org.exolab.jmscts.core.MessagingHelper; import org.exolab.jmscts.core.SessionHelper; import org.exolab.jmscts.core.TestCreator; --- 54,57 ---- *************** *** 122,143 **** TestContext context = getContext(); Destination destination = getDestination(DESTINATIONS[0]); - Session session = context.getSession(); MessageReceiver subscriber = null; subscriber = SessionHelper.createReceiver(context, destination, name, null, false); ! MessagingHelper.send(context, destination, count); ! subscriber.close(); subscriber = SessionHelper.createReceiver(context, destination, name, null, false); ! MessagingHelper.receive(context, subscriber, count); ! ! if (session.getTransacted()) { ! // commit the session, as it is shared across test cases ! session.commit(); ! } ! subscriber.remove(); } --- 122,136 ---- TestContext context = getContext(); Destination destination = getDestination(DESTINATIONS[0]); MessageReceiver subscriber = null; subscriber = SessionHelper.createReceiver(context, destination, name, null, false); ! send(destination, count); subscriber.close(); subscriber = SessionHelper.createReceiver(context, destination, name, null, false); ! List messages = receive(subscriber, count); ! acknowledge(messages); subscriber.remove(); } *************** *** 157,167 **** Destination destination1 = getDestination(DESTINATIONS[0]); Destination destination2 = getDestination(DESTINATIONS[1]); - Session session = context.getSession(); MessageReceiver subscriber = null; subscriber = SessionHelper.createReceiver(context, destination1, name, null, false); ! MessagingHelper.send(context, destination1, count); ! subscriber.close(); --- 150,158 ---- Destination destination1 = getDestination(DESTINATIONS[0]); Destination destination2 = getDestination(DESTINATIONS[1]); MessageReceiver subscriber = null; subscriber = SessionHelper.createReceiver(context, destination1, name, null, false); ! send(context, destination1, count); subscriber.close(); *************** *** 170,182 **** // verify that the subscription has changed by ensuring that no // messages are received. ! MessagingHelper.receive(context, subscriber, 0); ! MessagingHelper.send(context, destination2, count); ! MessagingHelper.receive(context, subscriber, count); ! ! if (session.getTransacted()) { ! // commit the session, as it is shared across test cases ! session.commit(); ! } subscriber.remove(); } --- 161,169 ---- // verify that the subscription has changed by ensuring that no // messages are received. ! receive(context, subscriber, 0); ! send(context, destination2, count); + List messages = receive(subscriber, count); + acknowledge(messages); subscriber.remove(); } *************** *** 200,204 **** subscriber = SessionHelper.createReceiver(context, destination, name, null, false); ! MessagingHelper.send(context, destination, count); subscriber.close(); --- 187,191 ---- subscriber = SessionHelper.createReceiver(context, destination, name, null, false); ! send(context, destination, count); subscriber.close(); |
From: Tim A. <tan...@us...> - 2005-06-16 08:03:09
|
Update of /cvsroot/jmscts/jmscts/src/providers/openjms/org/exolab/jmscts/openjms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24390/src/providers/openjms/org/exolab/jmscts/openjms Modified Files: OpenJMSAdministrator.java Log Message: change to supply user and password if available, when constructing an InitialContext Index: OpenJMSAdministrator.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/providers/openjms/org/exolab/jmscts/openjms/OpenJMSAdministrator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OpenJMSAdministrator.java 27 Sep 2003 09:48:36 -0000 1.3 --- OpenJMSAdministrator.java 16 Jun 2005 08:03:01 -0000 1.4 *************** *** 74,78 **** /** - /** * This class provides methods for obtaining and manipulating administered * objects managed by OpenJMS.<br> --- 74,77 ---- *************** *** 88,97 **** /** ! * The cached initial context */ private Context _context = null; /** ! * The cached admin connection */ private JmsAdminServerIfc _admin = null; --- 87,96 ---- /** ! * The cached initial context. */ private Context _context = null; /** ! * The cached admin connection. */ private JmsAdminServerIfc _admin = null; *************** *** 99,103 **** /** ! * Returns the name of the QueueConnectionFactory bound in JNDI * * @return the default QueueConnectionFactory name --- 98,102 ---- /** ! * Returns the name of the QueueConnectionFactory bound in JNDI. * * @return the default QueueConnectionFactory name *************** *** 114,118 **** /** ! * Returns the name of the TopicConnectionFactory bound in JNDI * * @return the default TopicConnectionFactory name --- 113,117 ---- /** ! * Returns the name of the TopicConnectionFactory bound in JNDI. * * @return the default TopicConnectionFactory name *************** *** 129,133 **** /** ! * Returns the name of the XAQueueConnectionFactory bound in JNDI * * @return the default XAQueueConnectionFactory name --- 128,132 ---- /** ! * Returns the name of the XAQueueConnectionFactory bound in JNDI. * * @return the default XAQueueConnectionFactory name *************** *** 144,148 **** /** ! * Returns the name of the XATopicConnectionFactory bound in JNDI * * @return the default XATopicConnectionFactory name --- 143,147 ---- /** ! * Returns the name of the XATopicConnectionFactory bound in JNDI. * * @return the default XATopicConnectionFactory name *************** *** 159,163 **** /** ! * Look up the named administered object in JNDI * * @param name the name that the administered object is bound to --- 158,162 ---- /** ! * Look up the named administered object in JNDI. * * @param name the name that the administered object is bound to *************** *** 170,174 **** /** ! * Create an administered destination * * @param name the destination name --- 169,173 ---- /** ! * Create an administered destination. * * @param name the destination name *************** *** 185,189 **** /** ! * Destroy an administered destination * * @param name the destination name --- 184,188 ---- /** ! * Destroy an administered destination. * * @param name the destination name *************** *** 218,222 **** /** ! * Returns true if an administered destination exists * * @param name the destination name --- 217,221 ---- /** ! * Returns true if an administered destination exists. * * @param name the destination name *************** *** 241,245 **** /** * Return the OpenJMS administration interface specified by ! * {@link ConfigurationManager} * * @return the OpenJMS administration interface --- 240,244 ---- /** * Return the OpenJMS administration interface specified by ! * {@link ConfigurationManager}. * * @return the OpenJMS administration interface *************** *** 273,277 **** protected synchronized Context getContext() throws NamingException { if (_context == null) { ! ClassLoader loader = Thread.currentThread().getContextClassLoader(); --- 272,281 ---- protected synchronized Context getContext() throws NamingException { if (_context == null) { ! String user = TestProperties.getString("valid.username", null); ! String password = TestProperties.getString("valid.password", null); ! Configuration config = ConfigurationManager.getConfig(); ! Property[] properties = config.getJndiConfiguration().getProperty(); ! ! ClassLoader loader = Thread.currentThread().getContextClassLoader(); *************** *** 281,288 **** Thread.currentThread().setContextClassLoader( getClass().getClassLoader()); - - Configuration config = ConfigurationManager.getConfig(); - Property[] properties = - config.getJndiConfiguration().getProperty(); Hashtable env = new Hashtable(); --- 285,288 ---- *************** *** 291,294 **** --- 291,298 ---- env.put(property.getName(), property.getValue()); } + if (user != null) { + env.put(Context.SECURITY_PRINCIPAL, user); + env.put(Context.SECURITY_CREDENTIALS, password); + } _context = new InitialContext(env); } finally { *************** *** 299,301 **** } ! } //-- OpenJMSAdministrator --- 303,305 ---- } ! } |
From: Tim A. <tan...@us...> - 2005-06-16 07:59:15
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session/clientack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22151/src/java/org/exolab/jmscts/test/session/clientack Modified Files: SubscriberRedeliveredTest.java CloseTest.java ClientAcknowledgeTest.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: CloseTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session/clientack/CloseTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CloseTest.java 3 Feb 2004 21:52:12 -0000 1.8 --- CloseTest.java 16 Jun 2005 07:59:07 -0000 1.9 *************** *** 46,49 **** --- 46,50 ---- import javax.jms.Session; + import javax.jms.Message; import junit.framework.Test; *************** *** 136,140 **** boolean redelivered = context.isQueueConnectionFactory(); context2.getConnection().close(); ! receive(receivers, count, 1, redelivered); } finally { close(receivers); --- 137,142 ---- boolean redelivered = context.isQueueConnectionFactory(); context2.getConnection().close(); ! Message last = receive(receivers, count, 1, redelivered); ! last.acknowledge(); } finally { close(receivers); *************** *** 176,180 **** boolean redelivered = context.isQueueConnectionFactory(); session2.close(); ! receive(receivers, count, 1, redelivered); } finally { close(receivers); --- 178,183 ---- boolean redelivered = context.isQueueConnectionFactory(); session2.close(); ! Message last = receive(receivers, count, 1, redelivered); ! last.acknowledge(); } finally { close(receivers); Index: SubscriberRedeliveredTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session/clientack/SubscriberRedeliveredTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SubscriberRedeliveredTest.java 2 Feb 2004 05:38:07 -0000 1.1 --- SubscriberRedeliveredTest.java 16 Jun 2005 07:59:07 -0000 1.2 *************** *** 167,170 **** --- 167,171 ---- messages = receive(clientAckContext, subscriber2, count); checkJMSRedelivered(messages, true); + acknowledge(messages); // messages received by subscriber1 shouldn't have their *************** *** 172,175 **** --- 173,177 ---- messages = receive(context, subscriber1, count); checkJMSRedelivered(messages, false); + acknowledge(messages); } finally { close(subscriber1); *************** *** 198,201 **** } ! } ! --- 200,202 ---- } ! } \ No newline at end of file Index: ClientAcknowledgeTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session/clientack/ClientAcknowledgeTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ClientAcknowledgeTest.java 3 Feb 2004 21:52:12 -0000 1.10 --- ClientAcknowledgeTest.java 16 Jun 2005 07:59:07 -0000 1.11 *************** *** 238,242 **** receive(receivers, count, 1, false); session.recover(); ! receive(receivers, count, 1, true); } finally { close(receivers); --- 238,243 ---- receive(receivers, count, 1, false); session.recover(); ! Message last = receive(receivers, count, 1, true); ! last.acknowledge(); } finally { close(receivers); |
From: Tim A. <tan...@us...> - 2005-06-16 07:50:14
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18206/src/java/org/exolab/jmscts/test/session Modified Files: MessageListenerTest.java Log Message: changed to use helpers Index: MessageListenerTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session/MessageListenerTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MessageListenerTest.java 3 Feb 2004 21:52:11 -0000 1.7 --- MessageListenerTest.java 16 Jun 2005 07:50:05 -0000 1.8 *************** *** 127,155 **** final long sleep = 100; ! MessageConsumer[] consumers = new MessageConsumer[DESTINATIONS.length]; TestListener listener = new TestListener(expected, sleep); ! TestContext context = getContext(); ! MessagingBehaviour behaviour = context.getMessagingBehaviour(); ! for (int i = 0; i < DESTINATIONS.length; ++i) { ! Destination destination = getDestination(DESTINATIONS[i]); ! String name = null; ! if (behaviour.getDurable()) { ! name = SessionHelper.getSubscriberName(); ! } ! MessageConsumer consumer = SessionHelper.createConsumer( ! context, destination, name); ! consumer.setMessageListener(listener); ! consumers[i] = consumer; } Message message = context.getMessage(); ! for (int i = 0; i < DESTINATIONS.length; ++i) { ! Destination destination = getDestination(DESTINATIONS[i]); ! MessageSender sender = SessionHelper.createSender( ! context, destination); ! sender.send(message, send); ! sender.close(); } Session session = context.getSession(); if (session.getTransacted()) { --- 127,145 ---- final long sleep = 100; ! TestContext context = getContext(); TestListener listener = new TestListener(expected, sleep); + MessageConsumer[] consumers = createConsumers(); ! for (int i = 0; i < consumers.length; ++i) { ! consumers[i].setMessageListener(listener); } Message message = context.getMessage(); ! MessageSender[] senders = createSenders(); ! for (int i = 0; i < senders.length; ++i) { ! senders[i].send(message, send); } + close(senders); + Session session = context.getSession(); if (session.getTransacted()) { *************** *** 157,160 **** --- 147,151 ---- } + // wait for the messages to be received synchronized (listener) { if (listener.getReceived() != expected) { *************** *** 162,168 **** } } ! for (int i = 0; i < consumers.length; ++i) { ! consumers[i].close(); } if (listener.getFailures() != 0) { fail("The listener was not invoked serially"); --- 153,165 ---- } } ! close(consumers); ! ! // acknowledge the messages, so that the destinations can be destroyed ! // cleanly on test completion ! Message last = listener.getMessage(); ! if (last != null) { ! last.acknowledge(); } + if (listener.getFailures() != 0) { fail("The listener was not invoked serially"); *************** *** 204,207 **** --- 201,209 ---- private int _received = 0; + /** + * The last received message + */ + private Message _message; + /** *************** *** 223,226 **** --- 225,229 ---- public void onMessage(Message message) { synchronized (this) { + _message = message; if (_invoked) { _failures++; *************** *** 233,237 **** } try { ! Thread.currentThread().sleep(_sleep); } catch (InterruptedException ignore) { log.debug("TestListener interrupted while sleeping " --- 236,240 ---- } try { ! Thread.sleep(_sleep); } catch (InterruptedException ignore) { log.debug("TestListener interrupted while sleeping " *************** *** 244,248 **** /** ! * Returns the no. of times {@link #onMessage()} was invoked by * more than one thread * --- 247,251 ---- /** ! * Returns the no. of times {@link #onMessage} was invoked by * more than one thread * *************** *** 261,264 **** --- 264,276 ---- return _received; } + + /** + * Returns the last messsage received + * + * @return the last message received + */ + public Message getMessage() { + return _message; + } } |
From: Tim A. <tan...@us...> - 2005-06-16 07:50:14
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/connection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18206/src/java/org/exolab/jmscts/test/connection Modified Files: ListenerTest.java Log Message: changed to use helpers Index: ListenerTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/connection/ListenerTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ListenerTest.java 4 Jul 2004 12:09:03 -0000 1.8 --- ListenerTest.java 16 Jun 2005 07:50:05 -0000 1.9 *************** *** 46,50 **** import javax.jms.Connection; - import javax.jms.Destination; import javax.jms.MessageConsumer; --- 46,49 ---- *************** *** 58,62 **** import org.exolab.jmscts.core.MessageReceiver; import org.exolab.jmscts.core.MessageSender; - import org.exolab.jmscts.core.SessionHelper; import org.exolab.jmscts.core.TestContext; import org.exolab.jmscts.core.TestContextHelper; --- 57,60 ---- *************** *** 228,239 **** final int maxWaitTime = 5000; // 5000 ms Connection connection = context.getConnection(); - Destination request = getDestination(REQUEST); MessageConsumer consumer = null; - boolean durable = context.getMessagingBehaviour().getDurable(); try { // set up the listener ! String name = (durable) ? SessionHelper.getSubscriberName() : null; ! consumer = SessionHelper.createConsumer(context, request, name); MessageSender sender = createSender(context, REPLY); EchoListener replier = new EchoListener( --- 226,234 ---- final int maxWaitTime = 5000; // 5000 ms Connection connection = context.getConnection(); MessageConsumer consumer = null; try { // set up the listener ! consumer = createConsumer(context, REQUEST); MessageSender sender = createSender(context, REPLY); EchoListener replier = new EchoListener( |
From: Tim A. <tan...@us...> - 2005-06-16 06:40:43
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/producer/ttl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18809/src/java/org/exolab/jmscts/test/producer/ttl Modified Files: TimeToLiveTestCase.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: TimeToLiveTestCase.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/producer/ttl/TimeToLiveTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimeToLiveTestCase.java 3 Feb 2004 07:33:32 -0000 1.2 --- TimeToLiveTestCase.java 16 Jun 2005 06:40:28 -0000 1.3 *************** *** 50,53 **** --- 50,56 ---- import org.exolab.jmscts.core.AbstractSendReceiveTestCase; import org.exolab.jmscts.core.MessageReceiver; + import org.exolab.jmscts.core.TestContext; + import org.exolab.jmscts.core.MessagingBehaviour; + import org.exolab.jmscts.core.ReceiptType; *************** *** 116,121 **** throws Exception { long expected = message.getJMSExpiration(); ! Session session = getContext().getSession(); if (session.getTransacted()) { session.commit(); --- 119,125 ---- throws Exception { long expected = message.getJMSExpiration(); + TestContext context = getContext(); ! Session session = context.getSession(); if (session.getTransacted()) { session.commit(); *************** *** 125,128 **** --- 129,137 ---- assertEquals("JMSExpiration different to that on send", expected, received.getJMSExpiration()); + MessagingBehaviour behaviour = context.getMessagingBehaviour(); + ReceiptType type = behaviour.getReceiptType(); + if (!type.equals(ReceiptType.BROWSER)) { + received.acknowledge(); + } } |
From: Tim A. <tan...@us...> - 2005-06-16 06:40:43
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/selector In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18809/src/java/org/exolab/jmscts/test/selector Modified Files: AbstractSelectorTestCase.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: AbstractSelectorTestCase.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/selector/AbstractSelectorTestCase.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AbstractSelectorTestCase.java 3 Feb 2004 21:52:11 -0000 1.7 --- AbstractSelectorTestCase.java 16 Jun 2005 06:40:28 -0000 1.8 *************** *** 157,160 **** --- 157,161 ---- + selector + "\" but got " + received); } + acknowledge(result); } catch (InvalidSelectorException exception) { fail("InvalidSelectorException thrown for valid selector=\"" |
From: Tim A. <tan...@us...> - 2005-06-16 06:40:33
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18736/src/java/org/exolab/jmscts/test/session Modified Files: ListenerCloseTest.java Log Message: changed to use helpers Index: ListenerCloseTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/session/ListenerCloseTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ListenerCloseTest.java 4 Jul 2004 12:09:04 -0000 1.8 --- ListenerCloseTest.java 16 Jun 2005 06:40:15 -0000 1.9 *************** *** 45,49 **** package org.exolab.jmscts.test.session; - import javax.jms.Destination; import javax.jms.MessageConsumer; import javax.jms.Session; --- 45,48 ---- *************** *** 58,63 **** import org.exolab.jmscts.core.MessageReceiver; import org.exolab.jmscts.core.MessageSender; - import org.exolab.jmscts.core.MessagingBehaviour; - import org.exolab.jmscts.core.SessionHelper; import org.exolab.jmscts.core.TestContext; import org.exolab.jmscts.core.TestContextHelper; --- 57,60 ---- *************** *** 168,174 **** TestContext context = getContext(); Session session = context.getSession(); - MessagingBehaviour behaviour = context.getMessagingBehaviour(); - boolean durable = behaviour.getDurable(); - Destination request = getDestination(REQUEST); // set up a duplicate context, to enable a receiver to be created --- 165,168 ---- *************** *** 181,186 **** try { // set up the listener ! String name = (durable) ? SessionHelper.getSubscriberName() : null; ! consumer = SessionHelper.createConsumer(context, request, name); MessageSender sender = createSender(context, REPLY); EchoListener replier = new EchoListener(context.getSession(), --- 175,179 ---- try { // set up the listener ! consumer = createConsumer(context, REQUEST); MessageSender sender = createSender(context, REPLY); EchoListener replier = new EchoListener(context.getSession(), *************** *** 190,194 **** // send a message and start the connection ! send(request, 1); context.getConnection().start(); --- 183,187 ---- // send a message and start the connection ! send(REQUEST, 1); context.getConnection().start(); *************** *** 215,218 **** --- 208,214 ---- action.start(); session.close(); + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + throw exception; } finally { try { *************** *** 232,235 **** --- 228,234 ---- // verify that the listener sent a message receive(receiver, count); + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + throw exception; } finally { receiver.remove(); |
From: Tim A. <tan...@us...> - 2005-06-16 06:37:17
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/clear In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16808/src/java/org/exolab/jmscts/test/message/clear Modified Files: RecoverClearTest.java SendReceiveClearTest.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: RecoverClearTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/clear/RecoverClearTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RecoverClearTest.java 3 Feb 2004 21:52:09 -0000 1.10 --- RecoverClearTest.java 16 Jun 2005 06:36:52 -0000 1.11 *************** *** 39,43 **** * OF THE POSSIBILITY OF SUCH DAMAGE. * ! * Copyright 2001-2004 (C) Exoffice Technologies Inc. All Rights Reserved. * * $Id$ --- 39,43 ---- * OF THE POSSIBILITY OF SUCH DAMAGE. * ! * Copyright 2001-2005 (C) Exoffice Technologies Inc. All Rights Reserved. * * $Id$ *************** *** 78,82 **** /** ! * The destination used by this test case */ private static final String DESTINATION = "RecoverClearTest"; --- 78,82 ---- /** ! * The destination used by this test case. */ private static final String DESTINATION = "RecoverClearTest"; *************** *** 84,88 **** /** ! * Construct a new <code>RecoverClearTest</code> * * @param name the name of test case --- 84,88 ---- /** ! * Construct a new <code>RecoverClearTest</code>. * * @param name the name of test case *************** *** 93,97 **** /** ! * Sets up the test suite * * @return an instance of this class that may be run by --- 93,97 ---- /** ! * Sets up the test suite. * * @return an instance of this class that may be run by *************** *** 114,118 **** /** * Verifies that clearing the properties and bodies of received messages ! * doesn't affect the messages received after recovering the session * * @jmscts.requirement message.method.clearProperties --- 114,118 ---- /** * Verifies that clearing the properties and bodies of received messages ! * doesn't affect the messages received after recovering the session. * * @jmscts.requirement message.method.clearProperties *************** *** 155,159 **** Session session = context.getSession(); session.recover(); ! verify(receiver, properties, body, count); } finally { receiver.remove(); --- 155,160 ---- Session session = context.getSession(); session.recover(); ! messages = verify(receiver, properties, body, count); ! acknowledge(messages); } finally { receiver.remove(); *************** *** 162,166 **** /** ! * Receive messages, and verify them * * @param receiver the receiver --- 163,167 ---- /** ! * Receive messages, and verify them. * * @param receiver the receiver Index: SendReceiveClearTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/clear/SendReceiveClearTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SendReceiveClearTest.java 3 Feb 2004 07:31:02 -0000 1.9 --- SendReceiveClearTest.java 16 Jun 2005 06:36:52 -0000 1.10 *************** *** 142,145 **** --- 142,146 ---- Message received = sendReceive(message, DESTINATION); ClearHelper.checkClearProperties(received, body, true); + acknowledge(received); } *************** *** 228,231 **** --- 229,236 ---- body.verify(received); } + + // make sure messages are acknowledged, so the destination + // can be safely destroyed prior to session closure + acknowledge(messages); } finally { receiver.remove(); *************** *** 253,256 **** --- 258,262 ---- Message received = sendReceive(message, DESTINATION); ClearHelper.checkClearBody(received, properties); + acknowledge(received); } |
From: Tim A. <tan...@us...> - 2005-06-16 06:37:17
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/foreign In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16808/src/java/org/exolab/jmscts/test/message/foreign Modified Files: ForeignMessageTest.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: ForeignMessageTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/foreign/ForeignMessageTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ForeignMessageTest.java 3 Feb 2004 07:31:02 -0000 1.2 --- ForeignMessageTest.java 16 Jun 2005 06:36:53 -0000 1.3 *************** *** 125,128 **** --- 125,129 ---- Message received = sendReceive(message, DESTINATION); verifier.verify(received); + acknowledge(received); } |
From: Tim A. <tan...@us...> - 2005-06-16 06:37:17
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/copy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16808/src/java/org/exolab/jmscts/test/message/copy Modified Files: MessageCopyTest.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: MessageCopyTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/copy/MessageCopyTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MessageCopyTest.java 3 Feb 2004 07:31:02 -0000 1.6 --- MessageCopyTest.java 16 Jun 2005 06:36:53 -0000 1.7 *************** *** 210,213 **** --- 210,214 ---- } } + acknowledge(messages); } finally { receiver.remove(); |
From: Tim A. <tan...@us...> - 2005-06-16 06:37:04
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/producer/ttl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16808/src/java/org/exolab/jmscts/test/producer/ttl Modified Files: ExpirationTest.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: ExpirationTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/producer/ttl/ExpirationTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExpirationTest.java 3 Feb 2004 07:33:32 -0000 1.3 --- ExpirationTest.java 16 Jun 2005 06:36:54 -0000 1.4 *************** *** 64,71 **** import org.exolab.jmscts.core.TestCreator; import org.exolab.jmscts.core.TestProperties; /** ! * This class tests message expiration * * @author <a href="mailto:tm...@ne...">Tim Anderson</a> --- 64,72 ---- import org.exolab.jmscts.core.TestCreator; import org.exolab.jmscts.core.TestProperties; + import org.exolab.jmscts.core.ReceiptType; /** ! * This class tests message expiration. * * @author <a href="mailto:tm...@ne...">Tim Anderson</a> *************** *** 75,84 **** /** ! * The default destination */ private static final String DESTINATION = "ExpirationTest"; /** ! * The logger */ private static final Category log = Category.getInstance( --- 76,85 ---- /** ! * The default destination. */ private static final String DESTINATION = "ExpirationTest"; /** ! * The logger. */ private static final Category log = Category.getInstance( *************** *** 98,102 **** /** ! * Construct a new <code>ExpirationTest</code> * * @param name the name of test case --- 99,103 ---- /** ! * Construct a new <code>ExpirationTest</code>. * * @param name the name of test case *************** *** 107,111 **** /** ! * Sets up the test suite * * @return an instance of this class that may be run by --- 108,112 ---- /** ! * Sets up the test suite. * * @return an instance of this class that may be run by *************** *** 251,255 **** TestContext nondurable = TestContextHelper.createSendReceiveContext( context, false, behaviour); - try { subscribers[0] = createReceiver(DESTINATION); // durable subscriber --- 252,255 ---- *************** *** 258,262 **** } finally { close(subscribers); ! nondurable.close(); } } --- 258,263 ---- } finally { close(subscribers); ! // new session was allocated, so close it. ! nondurable.getParent().close(); } } *************** *** 267,271 **** * don't expire, and verifies that after sleeping * <code>timeToLive + EXPIRATION_INTERVAL</code> milliseconds, only the ! * non-expiring messages may be received * * @param timeToLive the time-to-live for the expiring messages --- 268,272 ---- * don't expire, and verifies that after sleeping * <code>timeToLive + EXPIRATION_INTERVAL</code> milliseconds, only the ! * non-expiring messages may be received. * * @param timeToLive the time-to-live for the expiring messages *************** *** 293,297 **** * don't expire, and verifies that after sleeping * <code>timeToLive + EXPIRATION_INTERVAL</code> milliseconds, only the ! * non-expiring messages may be received * * @param timeToLive the time-to-live for the expiring messages --- 294,298 ---- * don't expire, and verifies that after sleeping * <code>timeToLive + EXPIRATION_INTERVAL</code> milliseconds, only the ! * non-expiring messages may be received. * * @param timeToLive the time-to-live for the expiring messages *************** *** 343,347 **** log.debug("Sleeping for " + sleepTime + "ms to allow messages to expire"); ! Thread.currentThread().sleep(sleepTime); } catch (InterruptedException ignore) { // no-op --- 344,348 ---- log.debug("Sleeping for " + sleepTime + "ms to allow messages to expire"); ! Thread.sleep(sleepTime); } catch (InterruptedException ignore) { // no-op *************** *** 364,367 **** --- 365,374 ---- } } + // make sure messages are acknowledged, so the destination + // can be safely destroyed prior to session closure + acknowledge(messages); + } + if (session.getTransacted()) { + session.commit(); } } finally { |
From: Tim A. <tan...@us...> - 2005-06-16 06:37:04
|
Update of /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/header In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16808/src/java/org/exolab/jmscts/test/message/header Modified Files: JMSCorrelationIDTest.java JMSDestinationTest.java JMSMessageIDTest.java JMSReplyToTest.java Log Message: fix to ensure messages are acknowledged, before the destination is destroyed Index: JMSCorrelationIDTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/header/JMSCorrelationIDTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JMSCorrelationIDTest.java 3 Feb 2004 07:31:02 -0000 1.2 --- JMSCorrelationIDTest.java 16 Jun 2005 06:36:53 -0000 1.3 *************** *** 124,127 **** --- 124,128 ---- // send the message, and receive it from the same destination Message received = sendReceive(message, DESTINATION); + acknowledge(received); // make sure the correlation ID properties are the same *************** *** 172,175 **** --- 173,177 ---- assertNull("JMSCorrelationID on received message should be null", received2.getJMSCorrelationID()); + acknowledge(received2); } *************** *** 211,214 **** --- 213,217 ---- assertTrue(Arrays.equals( masterId, received.getJMSCorrelationIDAsBytes())); + acknowledge(received); } catch (UnsupportedOperationException ignore) { context.getCoverage().setUnsupported("message.correlation.bytes"); Index: JMSDestinationTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/header/JMSDestinationTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JMSDestinationTest.java 3 Feb 2004 00:56:55 -0000 1.1 --- JMSDestinationTest.java 16 Jun 2005 06:36:53 -0000 1.2 *************** *** 135,138 **** --- 135,139 ---- assertTrue("JMSDestination on receipt not equal to that when sent", DestinationHelper.equal(dest, receivedDest)); + acknowledge(received); } *************** *** 162,165 **** --- 163,167 ---- DestinationHelper.equal( dest2, received2.getJMSDestination())); + acknowledge(received2); } Index: JMSReplyToTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/header/JMSReplyToTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JMSReplyToTest.java 3 Feb 2004 00:56:55 -0000 1.1 --- JMSReplyToTest.java 16 Jun 2005 06:36:53 -0000 1.2 *************** *** 140,143 **** --- 140,144 ---- replyTo, received2.getJMSReplyTo())); + acknowledge(received2); } Index: JMSMessageIDTest.java =================================================================== RCS file: /cvsroot/jmscts/jmscts/src/java/org/exolab/jmscts/test/message/header/JMSMessageIDTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JMSMessageIDTest.java 3 Feb 2004 00:56:55 -0000 1.1 --- JMSMessageIDTest.java 16 Jun 2005 06:36:53 -0000 1.2 *************** *** 149,152 **** --- 149,153 ---- "JMSMessageID on received message not equal to that sent:", sentID2, receivedID2); + acknowledge(received2); } *************** *** 199,205 **** session.commit(); } - assertEquals("JMSMessageIDs of received messages don't match " + "those sent: ", messageIds, receivedIds); } finally { close(sender); --- 200,206 ---- session.commit(); } assertEquals("JMSMessageIDs of received messages don't match " + "those sent: ", messageIds, receivedIds); + acknowledge(messages); } finally { close(sender); |