Repository: camel Updated Branches: refs/heads/camel-2.16.x 7eb78c9d6 -> f06c7995b refs/heads/master 4010b76e1 -> 9dc14070c
Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9dc14070 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9dc14070 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9dc14070 Branch: refs/heads/master Commit: 9dc14070ca5151392c9368a0e61a34e2cfab6e13 Parents: 4010b76 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jan 15 18:05:27 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jan 15 18:21:52 2016 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/jms/JmsConfiguration.java | 3 ++- .../camel/component/printer/PrinterConfiguration.java | 4 ++-- .../camel/component/routebox/RouteboxConfiguration.java | 10 ++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9dc14070/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 3950ecd..b516408 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 @@ -176,7 +176,7 @@ public class JmsConfiguration implements Cloneable { private boolean replyToSameDestinationAllowed; @UriParam(enums = "Bytes,Map,Object,Stream,Text") private JmsMessageType jmsMessageType; - @UriParam(label = "advanced", enums = "default,passthrough") + @UriParam(label = "advanced", enums = "default,passthrough", javaType = "java.lang.String") private JmsKeyFormatStrategy jmsKeyFormatStrategy; @UriParam(label = "advanced") private boolean transferExchange; @@ -206,6 +206,7 @@ public class JmsConfiguration implements Cloneable { private String replyToCacheLevelName; @UriParam(defaultValue = "true", label = "producer,advanced") private boolean allowNullBody = true; + @UriParam(label = "advanced") private MessageListenerContainerFactory messageListenerContainerFactory; @UriParam(label = "producer,advanced") private boolean includeSentJMSMessageID; http://git-wip-us.apache.org/repos/asf/camel/blob/9dc14070/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java index 263f8dc..85cbd55 100644 --- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java +++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java @@ -40,9 +40,9 @@ public class PrinterConfiguration { @UriPath @Metadata(required = "true") private String hostname; - @UriPath @Metadata(required = "true") + @UriPath private int port; - @UriPath @Metadata(required = "true") + @UriPath private String printername; @UriParam private String printerPrefix; http://git-wip-us.apache.org/repos/asf/camel/blob/9dc14070/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java b/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java index dec6eb1..0f7c3f1 100644 --- a/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java +++ b/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java @@ -39,10 +39,8 @@ import org.slf4j.LoggerFactory; public class RouteboxConfiguration { private static final Logger LOG = LoggerFactory.getLogger(RouteboxConfiguration.class); - private CamelContext innerContext; private URI uri; private String authority; - private ProducerTemplate innerProducerTemplate; @UriPath @Metadata(required = "true") private String routeboxName; @@ -65,7 +63,11 @@ public class RouteboxConfiguration { @UriParam(label = "producer", defaultValue = "true") private boolean sendToConsumer = true; @UriParam(label = "advanced") + private CamelContext innerContext; + @UriParam(label = "advanced") private Registry innerRegistry; + @UriParam(label = "advanced") + private ProducerTemplate innerProducerTemplate; @UriParam(label = "advanced", javaType = "java.lang.String") private List<RouteBuilder> routeBuilders = new ArrayList<RouteBuilder>(); @@ -174,6 +176,10 @@ public class RouteboxConfiguration { return innerContext; } + /** + * A string representing a key in the Camel Registry matching an object value of the type org.apache.camel.CamelContext. + * If a CamelContext is not provided by the user a CamelContext is automatically created for deployment of inner routes. + */ public void setInnerContext(CamelContext innerContext) { this.innerContext = innerContext; }
