Repository: camel Updated Branches: refs/heads/master 5532ae98f -> 0531cd7d6
Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0531cd7d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0531cd7d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0531cd7d Branch: refs/heads/master Commit: 0531cd7d6623021ee32437fe1ddc68a79cd76344 Parents: 5532ae9 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jan 17 10:12:14 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jan 17 10:24:15 2016 +0100 ---------------------------------------------------------------------- .../camel/component/jms/JmsConfiguration.java | 13 +++++++ .../apache/camel/component/jms/JmsEndpoint.java | 37 +++++++++----------- 2 files changed, 30 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0531cd7d/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java index fafe09a..c9a7117 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java @@ -195,6 +195,8 @@ public class JmsConfiguration implements Cloneable { @UriParam(defaultValue = "true", label = "consumer", description = "Specifies whether to use persistent delivery by default for replies.") private boolean replyToDeliveryPersistent = true; + @UriParam(label = "consumer", description = "Sets the JMS selector to use") + private String selector; @UriParam(defaultValue = "-1", label = "producer", description = "When sending messages, specifies the time-to-live of the message (in milliseconds).") private long timeToLive = -1; @@ -1944,4 +1946,15 @@ public class JmsConfiguration implements Cloneable { public void setMessageCreatedStrategy(MessageCreatedStrategy messageCreatedStrategy) { this.messageCreatedStrategy = messageCreatedStrategy; } + + public String getSelector() { + return selector; + } + + /** + * Sets the JMS selector to use + */ + public void setSelector(String selector) { + this.selector = selector; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/0531cd7d/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java index e65762a..b1c0038 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java @@ -74,15 +74,14 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy private final AtomicInteger runningMessageListeners = new AtomicInteger(); private boolean pubSubDomain; private JmsBinding binding; - @UriPath(defaultValue = "queue", enums = "queue,topic,temp:queue,temp:topic") + @UriPath(defaultValue = "queue", enums = "queue,topic,temp:queue,temp:topic", description = "The kind of destination to use") private String destinationType; - @UriPath @Metadata(required = "true") + @UriPath(description = "Name of the queue or topic to use as destination") + @Metadata(required = "true") private String destinationName; private Destination destination; - @UriParam(label = "advanced") + @UriParam(label = "advanced", description = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.") private HeaderFilterStrategy headerFilterStrategy; - @UriParam(label = "consumer") - private String selector; @UriParam private JmsConfiguration configuration; @@ -228,7 +227,7 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy } else { // do nothing, as we're working with a DefaultJmsMessageListenerContainer with an explicit DefaultTaskExecutorType, // so DefaultJmsMessageListenerContainer#createDefaultTaskExecutor will handle the creation - log.debug("Deferring creation of TaskExecutor for listener container: {} as per policy: {}", + log.debug("Deferring creation of TaskExecutor for listener container: {} as per policy: {}", listenerContainer, configuration.getDefaultTaskExecutorType()); } @@ -319,7 +318,7 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy public String getThreadName() { return "JmsConsumer[" + getEndpointConfiguredDestinationName() + "]"; } - + // Properties // ------------------------------------------------------------------------- @@ -405,17 +404,6 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy this.configuration = configuration; } - public String getSelector() { - return selector; - } - - /** - * Sets the JMS selector to use - */ - public void setSelector(String selector) { - this.selector = selector; - } - public boolean isSingleton() { return true; } @@ -572,11 +560,11 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy public ErrorHandler getErrorHandler() { return getConfiguration().getErrorHandler(); } - + public LoggingLevel getErrorHandlerLoggingLevel() { return getConfiguration().getErrorHandlerLoggingLevel(); } - + @ManagedAttribute public boolean isErrorHandlerLogStackTrace() { return getConfiguration().isErrorHandlerLogStackTrace(); @@ -1249,6 +1237,15 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy return runningMessageListeners.get(); } + @ManagedAttribute + public String getSelector() { + return configuration.getSelector(); + } + + public void setSelector(String selector) { + configuration.setSelector(selector); + } + // Implementation methods //-------------------------------------------------------------------------
