Author: davsclaus
Date: Mon Dec 17 06:31:21 2012
New Revision: 1422765
URL: http://svn.apache.org/viewvc?rev=1422765&view=rev
Log:
CAMEL-5863: camel-jms - renamed the persistent reply classes to indicate they
may not be persistent but essentially they are just regular queues.
Added:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusiveQueueMessageListenerContainer.java
- copied, changed from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusivePersistentQueueMessageListenerContainer.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyHandler.java
- copied, changed from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyHandler.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
- copied, changed from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java
- copied, changed from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedPersistentQueueMessageListenerContainer.java
Removed:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusivePersistentQueueMessageListenerContainer.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyHandler.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedPersistentQueueMessageListenerContainer.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManager.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=1422765&r1=1422764&r2=1422765&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Mon Dec 17 06:31:21 2012
@@ -30,7 +30,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.component.jms.JmsConfiguration.CamelJmsTemplate;
-import org.apache.camel.component.jms.reply.PersistentQueueReplyManager;
+import org.apache.camel.component.jms.reply.QueueReplyManager;
import org.apache.camel.component.jms.reply.ReplyManager;
import org.apache.camel.component.jms.reply.TemporaryQueueReplyManager;
import
org.apache.camel.component.jms.reply.UseMessageIdAsCorrelationIdMessageSentCallback;
@@ -506,8 +506,8 @@ public class JmsProducer extends Default
}
protected ReplyManager createReplyManager(String replyTo) throws Exception
{
- // use a persistent queue
- ReplyManager replyManager = new
PersistentQueueReplyManager(getEndpoint().getCamelContext());
+ // use a regular queue
+ ReplyManager replyManager = new
QueueReplyManager(getEndpoint().getCamelContext());
replyManager.setEndpoint(getEndpoint());
String name = "JmsReplyManagerTimeoutChecker[" + replyTo + "]";
Copied:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusiveQueueMessageListenerContainer.java
(from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusivePersistentQueueMessageListenerContainer.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusiveQueueMessageListenerContainer.java?p2=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusiveQueueMessageListenerContainer.java&p1=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusivePersistentQueueMessageListenerContainer.java&r1=1422751&r2=1422765&rev=1422765&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusivePersistentQueueMessageListenerContainer.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusiveQueueMessageListenerContainer.java
Mon Dec 17 06:31:21 2012
@@ -20,23 +20,23 @@ import org.apache.camel.component.jms.De
import org.apache.camel.component.jms.JmsEndpoint;
/**
- * This {@link
org.springframework.jms.listener.DefaultMessageListenerContainer} is used for
persistent reply queues
+ * This {@link
org.springframework.jms.listener.DefaultMessageListenerContainer} is used for
reply queues
* which are exclusive.
* <p/>
- * Mind that exclusive persistent reply queues is per producer, so if you run
in a clustered environment then
+ * Mind that exclusive reply queues is per producer, so if you run in a
clustered environment then
* each producer should use an unique reply queue destination name. If not
then other nodes may steal reply
- * messages which was intended for another. For clustered environments it may
be safer to use shared persistent queues
+ * messages which was intended for another. For clustered environments it may
be safer to use shared queues
* as each node will only consume reply messages which are intended for itself.
* <p/>
* See more details at <a href="http://camel.apache.org/jms";>camel-jms</a>.
*
- * @see SharedPersistentQueueMessageListenerContainer
+ * @see SharedQueueMessageListenerContainer
*/
-public class ExclusivePersistentQueueMessageListenerContainer extends
DefaultJmsMessageListenerContainer {
+public class ExclusiveQueueMessageListenerContainer extends
DefaultJmsMessageListenerContainer {
// no need to override any methods currently
- public ExclusivePersistentQueueMessageListenerContainer(JmsEndpoint
endpoint) {
+ public ExclusiveQueueMessageListenerContainer(JmsEndpoint endpoint) {
super(endpoint);
}
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java?rev=1422765&r1=1422764&r2=1422765&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java
Mon Dec 17 06:31:21 2012
@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* A creator which can build the JMS message selector query string to use
- * with a shared persistent reply-to queue, so we can select the correct
messages we expect as replies.
+ * with a shared reply-to queue, so we can select the correct messages we
expect as replies.
*/
public class MessageSelectorCreator implements CorrelationListener {
protected static final Logger LOG =
LoggerFactory.getLogger(MessageSelectorCreator.class);
Copied:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyHandler.java
(from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyHandler.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyHandler.java?p2=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyHandler.java&p1=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyHandler.java&r1=1422751&r2=1422765&rev=1422765&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyHandler.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyHandler.java
Mon Dec 17 06:31:21 2012
@@ -20,14 +20,14 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
/**
- * {@link ReplyHandler} to handle processing replies when using persistent
queues.
+ * {@link ReplyHandler} to handle processing replies when using regular queues.
*
* @version
*/
-public class PersistentQueueReplyHandler extends TemporaryQueueReplyHandler {
+public class QueueReplyHandler extends TemporaryQueueReplyHandler {
- public PersistentQueueReplyHandler(ReplyManager replyManager, Exchange
exchange, AsyncCallback callback,
- String originalCorrelationId, String
correlationId, long timeout) {
+ public QueueReplyHandler(ReplyManager replyManager, Exchange exchange,
AsyncCallback callback,
+ String originalCorrelationId, String
correlationId, long timeout) {
super(replyManager, exchange, callback, originalCorrelationId,
correlationId, timeout);
}
Copied:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
(from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java?p2=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java&p1=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java&r1=1422751&r2=1422765&rev=1422765&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
Mon Dec 17 06:31:21 2012
@@ -33,23 +33,23 @@ import org.springframework.jms.listener.
import org.springframework.jms.support.destination.DestinationResolver;
/**
- * A {@link ReplyManager} when using persistent queues.
+ * A {@link ReplyManager} when using regular queues.
*
* @version
*/
-public class PersistentQueueReplyManager extends ReplyManagerSupport {
+public class QueueReplyManager extends ReplyManagerSupport {
private String replyToSelectorValue;
private MessageSelectorCreator dynamicMessageSelector;
- public PersistentQueueReplyManager(CamelContext camelContext) {
+ public QueueReplyManager(CamelContext camelContext) {
super(camelContext);
}
public String registerReply(ReplyManager replyManager, Exchange exchange,
AsyncCallback callback,
String originalCorrelationId, String
correlationId, long requestTimeout) {
// add to correlation map
- PersistentQueueReplyHandler handler = new
PersistentQueueReplyHandler(replyManager, exchange, callback,
+ QueueReplyHandler handler = new QueueReplyHandler(replyManager,
exchange, callback,
originalCorrelationId, correlationId, requestTimeout);
correlation.put(correlationId, handler, requestTimeout);
return correlationId;
@@ -105,7 +105,7 @@ public class PersistentQueueReplyManager
public Destination resolveDestinationName(Session session, String
destinationName,
boolean pubSubDomain) throws
JMSException {
- synchronized (PersistentQueueReplyManager.this) {
+ synchronized (QueueReplyManager.this) {
// resolve the reply to destination
if (destination == null) {
destination = delegate.resolveDestinationName(session,
destinationName, pubSubDomain);
@@ -121,7 +121,7 @@ public class PersistentQueueReplyManager
ReplyToType type = endpoint.getConfiguration().getReplyToType();
if (type == null) {
- // use shared by default for persistent reply queues
+ // use shared by default for reply queues
type = ReplyToType.Shared;
}
@@ -129,17 +129,17 @@ public class PersistentQueueReplyManager
// shared reply to queues support either a fixed or dynamic JMS
message selector
String replyToSelectorName =
endpoint.getReplyToDestinationSelectorName();
if (replyToSelectorName != null) {
- // create a random selector value we will use for the
persistent reply queue
+ // create a random selector value we will use for the reply
queue
replyToSelectorValue = "ID:" + new BigInteger(24 * 8, new
Random()).toString(16);
String fixedMessageSelector = replyToSelectorName + "='" +
replyToSelectorValue + "'";
- answer = new
SharedPersistentQueueMessageListenerContainer(endpoint, fixedMessageSelector);
+ answer = new SharedQueueMessageListenerContainer(endpoint,
fixedMessageSelector);
// must use cache level consumer for fixed message selector
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
log.debug("Using shared queue: " + endpoint.getReplyTo() + "
with fixed message selector [" + fixedMessageSelector + "] as reply listener: "
+ answer);
} else {
// use a dynamic message selector which will select the
message we want to receive as reply
dynamicMessageSelector = new
MessageSelectorCreator(correlation);
- answer = new
SharedPersistentQueueMessageListenerContainer(endpoint, dynamicMessageSelector);
+ answer = new SharedQueueMessageListenerContainer(endpoint,
dynamicMessageSelector);
// must use cache level session for dynamic message selector,
// as otherwise the dynamic message selector will not be
updated on-the-fly
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_SESSION);
@@ -149,12 +149,12 @@ public class PersistentQueueReplyManager
log.warn("{} is using a shared reply queue, which is not as fast
as alternatives."
+ " See more detail at the section 'Request-reply over
JMS' at http://camel.apache.org/jms";, endpoint);
} else if (ReplyToType.Exclusive == type) {
- answer = new
ExclusivePersistentQueueMessageListenerContainer(endpoint);
+ answer = new ExclusiveQueueMessageListenerContainer(endpoint);
// must use cache level consumer for exclusive as there is no
message selector
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
log.debug("Using exclusive queue:" + endpoint.getReplyTo() + " as
reply listener: " + answer);
} else {
- throw new IllegalArgumentException("ReplyToType " + type + " is
not supported for persistent reply queues");
+ throw new IllegalArgumentException("ReplyToType " + type + " is
not supported for reply queues");
}
String replyToCacheLevelName =
endpoint.getConfiguration().getReplyToCacheLevelName();
@@ -200,7 +200,7 @@ public class PersistentQueueReplyManager
if (endpoint.getErrorHandler() != null) {
answer.setErrorHandler(endpoint.getErrorHandler());
} else {
- answer.setErrorHandler(new
DefaultSpringErrorHandler(PersistentQueueReplyManager.class,
endpoint.getErrorHandlerLoggingLevel(),
endpoint.isErrorHandlerLogStackTrace()));
+ answer.setErrorHandler(new
DefaultSpringErrorHandler(QueueReplyManager.class,
endpoint.getErrorHandlerLoggingLevel(),
endpoint.isErrorHandlerLogStackTrace()));
}
if (endpoint.getReceiveTimeout() >= 0) {
answer.setReceiveTimeout(endpoint.getReceiveTimeout());
@@ -217,7 +217,7 @@ public class PersistentQueueReplyManager
}
// setup a bean name which is used ny Spring JMS as the thread name
- String name = "PersistentQueueReplyManager[" +
answer.getDestinationName() + "]";
+ String name = "QueueReplyManager[" + answer.getDestinationName() + "]";
answer.setBeanName(name);
if (answer.getConcurrentConsumers() > 1) {
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManager.java?rev=1422765&r1=1422764&r2=1422765&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManager.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManager.java
Mon Dec 17 06:31:21 2012
@@ -57,7 +57,7 @@ public interface ReplyManager extends Me
Destination getReplyTo();
/**
- * To be used when a persistent reply queue is used with a custom JMS
selector is being used.
+ * To be used when a reply queue is used with a custom JMS selector is
being used.
*/
void setReplyToSelectorHeader(org.apache.camel.Message camelMessage,
Message jmsMessage) throws JMSException;
Copied:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java
(from r1422751,
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedPersistentQueueMessageListenerContainer.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java?p2=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java&p1=camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedPersistentQueueMessageListenerContainer.java&r1=1422751&r2=1422765&rev=1422765&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedPersistentQueueMessageListenerContainer.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java
Mon Dec 17 06:31:21 2012
@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.jms.listener.DefaultMessageListenerContainer;
/**
- * This {@link DefaultMessageListenerContainer} is used for persistent reply
queues which are shared.
+ * This {@link DefaultMessageListenerContainer} is used for reply queues which
are shared.
* <p/>
* This implementation supports using a fixed or dynamic JMS Message Selector
to pickup the
* designated reply messages from the shared queue. Since the queue is shared,
then we can only
@@ -32,11 +32,11 @@ import org.springframework.jms.listener.
* <p/>
* See more details at <a href="http://camel.apache.org/jms";>camel-jms</a>.
*
- * @see ExclusivePersistentQueueMessageListenerContainer
+ * @see ExclusiveQueueMessageListenerContainer
*/
-public class SharedPersistentQueueMessageListenerContainer extends
DefaultJmsMessageListenerContainer {
+public class SharedQueueMessageListenerContainer extends
DefaultJmsMessageListenerContainer {
- private static final Logger LOG =
LoggerFactory.getLogger(SharedPersistentQueueMessageListenerContainer.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(SharedQueueMessageListenerContainer.class);
private String fixedMessageSelector;
private MessageSelectorCreator creator;
@@ -47,7 +47,7 @@ public class SharedPersistentQueueMessag
* @param endpoint the endpoint
* @param fixedMessageSelector the fixed selector
*/
- public SharedPersistentQueueMessageListenerContainer(JmsEndpoint endpoint,
String fixedMessageSelector) {
+ public SharedQueueMessageListenerContainer(JmsEndpoint endpoint, String
fixedMessageSelector) {
super(endpoint);
this.fixedMessageSelector = fixedMessageSelector;
}
@@ -58,7 +58,7 @@ public class SharedPersistentQueueMessag
* @param endpoint the endpoint
* @param creator the create to create the dynamic selector
*/
- public SharedPersistentQueueMessageListenerContainer(JmsEndpoint endpoint,
MessageSelectorCreator creator) {
+ public SharedQueueMessageListenerContainer(JmsEndpoint endpoint,
MessageSelectorCreator creator) {
super(endpoint);
this.creator = creator;
}
