CAMEL-10629: Add more details to component level options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/47a50bcd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/47a50bcd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/47a50bcd Branch: refs/heads/master Commit: 47a50bcd288fea8b8e14b6083d518313ea24e852 Parents: 1a3e441 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 21 15:17:32 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 21 15:17:32 2016 +0100 ---------------------------------------------------------------------- .../http/springboot/NettyHttpComponentConfiguration.java | 2 +- .../netty/springboot/NettyComponentConfiguration.java | 6 +++++- .../camel-nagios/src/main/docs/nagios-component.adoc | 4 ++-- .../apache/camel/component/nagios/NagiosComponent.java | 2 ++ .../camel/component/nagios/NagiosConfiguration.java | 4 ++-- components/camel-nats/src/main/docs/nats-component.adoc | 2 +- .../apache/camel/component/nats/NatsConfiguration.java | 10 +++++----- .../camel/component/netty/http/NettyHttpComponent.java | 4 ++++ .../org/apache/camel/component/netty/NettyComponent.java | 6 +++++- .../apache/camel/component/netty/NettyConfiguration.java | 2 ++ .../netty/NettyServerBootstrapConfiguration.java | 2 +- .../camel/component/netty4/http/NettyHttpComponent.java | 4 ++++ .../apache/camel/component/netty4/NettyComponent.java | 5 +++++ .../netty4/NettyServerBootstrapConfiguration.java | 2 +- .../camel/component/openshift/OpenShiftComponent.java | 3 +++ .../camel/component/openshift/OpenShiftEndpoint.java | 4 ++-- .../camel/component/openstack/cinder/CinderEndpoint.java | 8 ++++---- .../camel/component/openstack/glance/GlanceEndpoint.java | 6 +++--- .../component/openstack/keystone/KeystoneEndpoint.java | 6 +++--- .../component/openstack/neutron/NeutronEndpoint.java | 8 ++++---- .../camel/component/openstack/nova/NovaEndpoint.java | 8 ++++---- .../camel/component/openstack/swift/SwiftEndpoint.java | 8 ++++---- components/camel-paho/src/main/docs/paho-component.adoc | 2 +- .../org/apache/camel/component/paho/PahoComponent.java | 2 ++ .../org/apache/camel/component/paho/PahoEndpoint.java | 4 ++-- .../camel-pgevent/src/main/docs/pgevent-component.adoc | 4 ++-- .../apache/camel/component/pgevent/PgEventEndpoint.java | 4 ++-- .../camel-quartz/src/main/docs/quartz-component.adoc | 4 ++-- .../apache/camel/component/quartz/QuartzComponent.java | 10 +++++++++- .../apache/camel/component/quartz/QuartzEndpoint.java | 4 ++-- .../apache/camel/component/quartz2/QuartzComponent.java | 11 +++++++++-- .../camel/component/quickfixj/QuickfixjComponent.java | 7 ++++++- 32 files changed, 104 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java index 68348c6..74ea7e2 100644 --- a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java +++ b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java @@ -58,7 +58,7 @@ public class NettyHttpComponentConfiguration { * The core pool size for the ordered thread pool if its in use. The default * value is 16. */ - private Integer maximumPoolSize; + private Integer maximumPoolSize = 16; public NettyHttpBinding getNettyHttpBinding() { return nettyHttpBinding; http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java index 8720056..6d316e3 100644 --- a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java +++ b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java @@ -51,7 +51,7 @@ public class NettyComponentConfiguration { * The core pool size for the ordered thread pool if its in use. The default * value is 16. */ - private Integer maximumPoolSize; + private Integer maximumPoolSize = 16; public NettyConfigurationNestedConfiguration getConfiguration() { return configuration; @@ -189,6 +189,7 @@ public class NettyComponentConfiguration { * To use a custom ClientPipelineFactory */ private ClientPipelineFactory clientPipelineFactory; + @Deprecated private Integer maximumPoolSize; /** * Whether to use ordered thread pool, to ensure events are processed @@ -597,10 +598,13 @@ public class NettyComponentConfiguration { this.clientPipelineFactory = clientPipelineFactory; } + @Deprecated + @DeprecatedConfigurationProperty public Integer getMaximumPoolSize() { return maximumPoolSize; } + @Deprecated public void setMaximumPoolSize(Integer maximumPoolSize) { this.maximumPoolSize = maximumPoolSize; } http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-nagios/src/main/docs/nagios-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-nagios/src/main/docs/nagios-component.adoc b/components/camel-nagios/src/main/docs/nagios-component.adoc index 2e44d29..cdd5ca3 100644 --- a/components/camel-nagios/src/main/docs/nagios-component.adoc +++ b/components/camel-nagios/src/main/docs/nagios-component.adoc @@ -73,11 +73,11 @@ The Nagios component supports 8 endpoint options which are listed below: | host | producer | | String | *Required* This is the address of the Nagios host where checks should be send. | port | producer | | int | *Required* The port number of the host. | connectionTimeout | producer | 5000 | int | Connection timeout in millis. -| encryptionMethod | producer | | NagiosEncryptionMethod | To specify an encryption method. -| password | producer | | String | Password to be authenticated when sending checks to Nagios. | sendSync | producer | true | boolean | Whether or not to use synchronous when sending a passive check. Setting it to false will allow Camel to continue routing the message and the passive check message will be send asynchronously. | timeout | producer | 5000 | int | Sending timeout in millis. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| encryptionMethod | security | | NagiosEncryptionMethod | To specify an encryption method. +| password | security | | String | Password to be authenticated when sending checks to Nagios. |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java index c86e347..46c4856 100644 --- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java +++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; /** @@ -28,6 +29,7 @@ import org.apache.camel.util.ObjectHelper; */ public class NagiosComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private NagiosConfiguration configuration; public NagiosComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java index e4d29ef..73e9172 100644 --- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java +++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java @@ -43,9 +43,9 @@ public class NagiosConfiguration implements Cloneable { private int connectionTimeout = 5000; @UriParam(defaultValue = "5000") private int timeout = 5000; - @UriParam + @UriParam(label = "security", secret = true) private String password; - @UriParam + @UriParam(label = "security") private NagiosEncryptionMethod encryptionMethod; /** http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-nats/src/main/docs/nats-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-nats/src/main/docs/nats-component.adoc b/components/camel-nats/src/main/docs/nats-component.adoc index 3965ef7..b859c9e 100644 --- a/components/camel-nats/src/main/docs/nats-component.adoc +++ b/components/camel-nats/src/main/docs/nats-component.adoc @@ -59,7 +59,6 @@ The Nats component supports 23 endpoint options which are listed below: | pingInterval | common | 4000 | int | Ping interval to be aware if connection is still alive (in milliseconds) | reconnect | common | true | boolean | Whether or not using reconnection feature | reconnectTimeWait | common | 2000 | int | Waiting time before attempts reconnection (in milliseconds) -| ssl | common | false | boolean | Whether or not using SSL | topic | common | | String | *Required* The name of topic we want to use | verbose | common | false | boolean | Whether or not running in verbose mode | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. @@ -71,6 +70,7 @@ The Nats component supports 23 endpoint options which are listed below: | replySubject | producer | | String | the subject to which subscribers should send response | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | secure | security | false | boolean | Set secure option indicating TLS is required +| ssl | security | false | boolean | Whether or not using SSL | sslContextParameters | security | | SSLContextParameters | To configure security using SSLContextParameters | tlsDebug | security | false | boolean | TLS Debug it will add additional console output |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java index dab069e..3e6fd20 100644 --- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java +++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java @@ -35,11 +35,11 @@ public class NatsConfiguration { private String topic; @UriParam(defaultValue = "true") private boolean reconnect = true; - @UriParam(defaultValue = "false") + @UriParam private boolean pedantic; - @UriParam(defaultValue = "false") + @UriParam private boolean verbose; - @UriParam(defaultValue = "false") + @UriParam(label = "security") private boolean ssl; @UriParam(defaultValue = "2000") private int reconnectTimeWait = 2000; @@ -49,7 +49,7 @@ public class NatsConfiguration { private int pingInterval = 4000; @UriParam(label = "producer") private String replySubject; - @UriParam(defaultValue = "false") + @UriParam private boolean noRandomizeServers; @UriParam(label = "consumer") private String queueName; @@ -65,7 +65,7 @@ public class NatsConfiguration { private boolean secure; @UriParam(label = "security") private boolean tlsDebug; - @UriParam(label = "security", description = "SSL configuration") + @UriParam(label = "security") private SSLContextParameters sslContextParameters; /** http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java index 2fccfcd..74bc025 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java @@ -31,6 +31,7 @@ import org.apache.camel.component.netty.NettyServerBootstrapConfiguration; import org.apache.camel.component.netty.http.handlers.HttpServerMultiplexChannelHandler; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RestApiConsumerFactory; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestConsumerFactory; @@ -54,8 +55,11 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt // factories which is created by this component and therefore manage their lifecycles private final Map<Integer, HttpServerConsumerChannelFactory> multiplexChannelHandlers = new HashMap<Integer, HttpServerConsumerChannelFactory>(); private final Map<String, HttpServerBootstrapFactory> bootstrapFactories = new HashMap<String, HttpServerBootstrapFactory>(); + @Metadata(label = "advanced") private NettyHttpBinding nettyHttpBinding; + @Metadata(label = "advanced") private HeaderFilterStrategy headerFilterStrategy; + @Metadata(label = "security") private NettyHttpSecurityConfiguration securityConfiguration; public NettyHttpComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java index 9565000..719bcb8 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.concurrent.CamelThreadFactory; import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; @@ -34,9 +35,12 @@ import org.jboss.netty.util.Timer; public class NettyComponent extends UriEndpointComponent { // use a shared timer for Netty (see javadoc for HashedWheelTimer) private Timer timer; + private volatile OrderedMemoryAwareThreadPoolExecutor executorService; + + @Metadata(label = "advanced") private NettyConfiguration configuration; + @Metadata(label = "advanced", defaultValue = "16") private int maximumPoolSize = 16; - private volatile OrderedMemoryAwareThreadPoolExecutor executorService; public NettyComponent() { super(NettyEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java index 2a28d7c..f7606e8 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java @@ -484,10 +484,12 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem /** * The core pool size for the ordered thread pool, if its in use. */ + @Deprecated public int getMaximumPoolSize() { return maximumPoolSize; } + @Deprecated public void setMaximumPoolSize(int maximumPoolSize) { this.maximumPoolSize = maximumPoolSize; } http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java index 7b4834c..9b61b8b 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java @@ -93,7 +93,7 @@ public class NettyServerBootstrapConfiguration implements Cloneable { protected String securityProvider = "SunX509"; @UriParam(defaultValue = DEFAULT_ENABLED_PROTOCOLS, label = "security") protected String enabledProtocols = DEFAULT_ENABLED_PROTOCOLS; - @UriParam(label = "security") + @UriParam(label = "security", secret = true) protected String passphrase; @UriParam(label = "consumer,advanced") protected BossPool bossPool; http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java index 48c6686..d5d4ec2 100644 --- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java +++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java @@ -32,6 +32,7 @@ import org.apache.camel.component.netty4.NettyServerBootstrapConfiguration; import org.apache.camel.component.netty4.http.handlers.HttpServerMultiplexChannelHandler; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RestApiConsumerFactory; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestConsumerFactory; @@ -56,8 +57,11 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt // factories which is created by this component and therefore manage their lifecycles private final Map<Integer, HttpServerConsumerChannelFactory> multiplexChannelHandlers = new HashMap<Integer, HttpServerConsumerChannelFactory>(); private final Map<String, HttpServerBootstrapFactory> bootstrapFactories = new HashMap<String, HttpServerBootstrapFactory>(); + @Metadata(label = "advanced") private NettyHttpBinding nettyHttpBinding; + @Metadata(label = "advanced") private HeaderFilterStrategy headerFilterStrategy; + @Metadata(label = "security") private NettyHttpSecurityConfiguration securityConfiguration; public NettyHttpComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java index f515c94..376f394 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java @@ -27,12 +27,17 @@ import io.netty.util.concurrent.EventExecutorGroup; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.concurrent.CamelThreadFactory; public class NettyComponent extends UriEndpointComponent { + + @Metadata(label = "advanced") private NettyConfiguration configuration; + @Metadata(label = "advanced", defaultValue = "16") private int maximumPoolSize = 16; + @Metadata(label = "advanced") private volatile EventExecutorGroup executorService; public NettyComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java index a6de4f4..3b27409 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java @@ -91,7 +91,7 @@ public class NettyServerBootstrapConfiguration implements Cloneable { protected String securityProvider; @UriParam(defaultValue = DEFAULT_ENABLED_PROTOCOLS, label = "security") protected String enabledProtocols = DEFAULT_ENABLED_PROTOCOLS; - @UriParam(label = "security") + @UriParam(label = "security", secret = true) protected String passphrase; @UriParam(label = "advanced") protected boolean nativeTransport; http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java index 215742b..687f4a1 100644 --- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java +++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java @@ -20,10 +20,13 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; public class OpenShiftComponent extends UriEndpointComponent { + @Metadata(label = "security", secret = true) private String username; + @Metadata(label = "security", secret = true) private String password; private String domain; private String server; http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java index f505be5..ae21df8 100644 --- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java +++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java @@ -37,9 +37,9 @@ public class OpenShiftEndpoint extends ScheduledPollEndpoint { @UriPath @Metadata(required = "true") private String clientId; - @UriParam @Metadata(required = "true") + @UriParam @Metadata(required = "true", secret = true) private String username; - @UriParam @Metadata(required = "true") + @UriParam @Metadata(required = "true", secret = true) private String password; @UriParam private String domain; http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java index 215452e..ab9e854 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java @@ -32,7 +32,7 @@ import org.openstack4j.core.transport.Config; @UriEndpoint(scheme = "openstack-cinder", title = "OpenStack Cinder", syntax = "openstack-cinder:host", label = "cloud,paas", producerOnly = true) public class CinderEndpoint extends AbstractOpenstackEndpoint { - @UriParam(enums = "snapshots, volumes") + @UriParam(enums = "snapshots,volumes") @Metadata(required = "true") String subsystem; @UriPath @@ -48,17 +48,17 @@ public class CinderEndpoint extends AbstractOpenstackEndpoint { private String operation; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String username; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String password; @UriParam private Config config; - @UriParam(defaultValue = V3, enums = "V2, V3") + @UriParam(defaultValue = V3, enums = "V2,V3") private String apiVersion = V3; public CinderEndpoint(String uri, CinderComponent component) { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java index b78eb2c..bf812f1 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java @@ -45,17 +45,17 @@ public class GlanceEndpoint extends AbstractOpenstackEndpoint { private String operation; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String username; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String password; @UriParam private Config config; - @UriParam(defaultValue = V3, enums = "V2, V3") + @UriParam(defaultValue = V3, enums = "V2,V3") private String apiVersion = V3; public GlanceEndpoint(String uri, GlanceComponent component) { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java index 8dbecfd..1b2861b 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java @@ -35,7 +35,7 @@ import org.openstack4j.core.transport.Config; @UriEndpoint(scheme = "openstack-keystone", title = "OpenStack Keystone", syntax = "openstack-keystone:host", label = "cloud,paas", producerOnly = true) public class KeystoneEndpoint extends AbstractOpenstackEndpoint { - @UriParam(enums = "regions, domains, projects, users, groups") + @UriParam(enums = "regions,domains,projects,users,groups") @Metadata(required = "true") String subsystem; @UriPath @@ -52,11 +52,11 @@ public class KeystoneEndpoint extends AbstractOpenstackEndpoint { private String operation; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String username; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String password; @UriParam http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java index 576f4ea..f14c3aa 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java @@ -34,7 +34,7 @@ import org.openstack4j.core.transport.Config; @UriEndpoint(scheme = "openstack-neutron", title = "OpenStack Neutron", syntax = "openstack-neutron:host", label = "cloud,paas", producerOnly = true) public class NeutronEndpoint extends AbstractOpenstackEndpoint { - @UriParam(enums = "networks, subnets, ports, routers") + @UriParam(enums = "networks,subnets,ports,routers") @Metadata(required = "true") String subsystem; @UriPath @@ -51,17 +51,17 @@ public class NeutronEndpoint extends AbstractOpenstackEndpoint { private String operation; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String username; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String password; @UriParam private Config config; - @UriParam(defaultValue = V3, enums = "V2, V3") + @UriParam(defaultValue = V3, enums = "V2,V3") private String apiVersion = V3; public NeutronEndpoint(String uri, NeutronComponent component) { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java index 0f32f5f..0abd381 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java @@ -33,7 +33,7 @@ import org.openstack4j.core.transport.Config; @UriEndpoint(scheme = "openstack-nova", title = "OpenStack Nova", syntax = "openstack-nova:host", label = "cloud,paas", producerOnly = true) public class NovaEndpoint extends AbstractOpenstackEndpoint { - @UriParam(enums = "flavors, servers, keypairs") + @UriParam(enums = "flavors,servers,keypairs") @Metadata(required = "true") String subsystem; @UriPath @@ -50,17 +50,17 @@ public class NovaEndpoint extends AbstractOpenstackEndpoint { private String operation; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String username; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String password; @UriParam private Config config; - @UriParam(defaultValue = V3, enums = "V2, V3") + @UriParam(defaultValue = V3, enums = "V2,V3") private String apiVersion = V3; public NovaEndpoint(String uri, NovaComponent component) { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java index b651e59..39bb837 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java @@ -32,7 +32,7 @@ import org.openstack4j.core.transport.Config; @UriEndpoint(scheme = "openstack-swift", title = "OpenStack Swift", syntax = "openstack-swift:host", label = "cloud,paas", producerOnly = true) public class SwiftEndpoint extends AbstractOpenstackEndpoint { - @UriParam(enums = "objects, containers") + @UriParam(enums = "objects,containers") @Metadata(required = "true") String subsystem; @UriPath @@ -48,17 +48,17 @@ public class SwiftEndpoint extends AbstractOpenstackEndpoint { private String operation; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String username; @UriParam - @Metadata(required = "true") + @Metadata(required = "true", secret = true) private String password; @UriParam private Config config; - @UriParam(defaultValue = V3, enums = "V2, V3") + @UriParam(defaultValue = V3, enums = "V2,V3") private String apiVersion = V3; public SwiftEndpoint(String uri, SwiftComponent component) { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-paho/src/main/docs/paho-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-paho/src/main/docs/paho-component.adoc b/components/camel-paho/src/main/docs/paho-component.adoc index 21acf5e..adcfe9b 100644 --- a/components/camel-paho/src/main/docs/paho-component.adoc +++ b/components/camel-paho/src/main/docs/paho-component.adoc @@ -156,7 +156,7 @@ The Paho component supports 12 endpoint options which are listed below: | brokerUrl | common | tcp://localhost:1883 | String | The URL of the MQTT broker. | clientId | common | | String | MQTT client identifier. | connectOptions | common | | MqttConnectOptions | Client connection options -| filePersistenceDirectory | common | Current directory | String | Base directory used by the file persistence provider. +| filePersistenceDirectory | common | | String | Base directory used by the file persistence provider. | persistence | common | MEMORY | PahoPersistence | Client persistence to be used - memory or file. | qos | common | 2 | int | Client quality of service level (0-2). | retained | common | false | boolean | Retain option http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java index acc2d20..1a8e4a5 100644 --- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java +++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java @@ -20,6 +20,7 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; /** @@ -29,6 +30,7 @@ public class PahoComponent extends UriEndpointComponent { private String brokerUrl; private String clientId; + @Metadata(label = "advanced") private MqttConnectOptions connectOptions; public PahoComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java index 250943c..82ae19e 100644 --- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java +++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java @@ -55,11 +55,11 @@ public class PahoEndpoint extends DefaultEndpoint { private String brokerUrl = PahoConstants.DEFAULT_BROKER_URL; @UriParam(defaultValue = "2") private int qos = PahoConstants.DEFAULT_QOS; - @UriParam(defaultValue = "false") + @UriParam private boolean retained; @UriParam(defaultValue = "MEMORY") private PahoPersistence persistence = PahoPersistence.MEMORY; - @UriParam(description = "Base directory used by file persistence.", defaultValue = "Current directory") + @UriParam(description = "Base directory used by file persistence. Will by default use current directory.") private String filePersistenceDirectory; // Collaboration members http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-pgevent/src/main/docs/pgevent-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-pgevent/src/main/docs/pgevent-component.adoc b/components/camel-pgevent/src/main/docs/pgevent-component.adoc index bbd9e05..c31ccb2 100644 --- a/components/camel-pgevent/src/main/docs/pgevent-component.adoc +++ b/components/camel-pgevent/src/main/docs/pgevent-component.adoc @@ -56,12 +56,12 @@ The PostgresSQL Event component supports 11 endpoint options which are listed be | database | common | | String | *Required* The database name | channel | common | | String | *Required* The channel name | datasource | common | | DataSource | To connect using the given javax.sql.DataSource instead of using hostname and port. -| pass | common | | String | Password for login -| user | common | postgres | String | Username for login | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. | exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| pass | security | | String | Password for login +| user | security | postgres | String | Username for login |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java index 8e2e285..12f07c2 100644 --- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java +++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java @@ -57,9 +57,9 @@ public class PgEventEndpoint extends DefaultEndpoint { private String database; @UriPath @Metadata(required = "true") private String channel; - @UriParam(defaultValue = "postgres") + @UriParam(defaultValue = "postgres", label = "security", secret = true) private String user = "postgres"; - @UriParam + @UriParam(label = "security", secret = true) private String pass; @UriParam private DataSource datasource; http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-quartz/src/main/docs/quartz-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/main/docs/quartz-component.adoc b/components/camel-quartz/src/main/docs/quartz-component.adoc index c4218b5..6970c6a 100644 --- a/components/camel-quartz/src/main/docs/quartz-component.adoc +++ b/components/camel-quartz/src/main/docs/quartz-component.adoc @@ -85,15 +85,15 @@ The Quartz component supports 15 endpoint options which are listed below: | cron | consumer | | String | Specifies a cron expression to define when to trigger. | deleteJob | consumer | true | boolean | If set to true then the trigger automatically delete when route stop. Else if set to false it will remain in scheduler. When set to false it will also mean user may reuse pre-configured trigger with camel Uri. Just ensure the names match. Notice you cannot have both deleteJob and pauseJob set to true. | fireNow | consumer | false | boolean | Whether to fire the scheduler asap when its started using the simple trigger (this option does not support cron) -| jobParameters | consumer | | Map | To configure additional options on the job. | pauseJob | consumer | false | boolean | If set to true then the trigger automatically pauses when route stop. Else if set to false it will remain in scheduler. When set to false it will also mean user may reuse pre-configured trigger with camel Uri. Just ensure the names match. Notice you cannot have both deleteJob and pauseJob set to true. | startDelayedSeconds | consumer | | int | Seconds to wait before starting the quartz scheduler. | stateful | consumer | false | boolean | Uses a Quartz StatefulJob instead of the default job. -| triggerParameters | consumer | | Map | To configure additional options on the trigger. | usingFixedCamelContextName | consumer | false | boolean | If it is true JobDataMap uses the CamelContext name directly to reference the CamelContext if it is false JobDataMap uses use the CamelContext management name which could be changed during the deploy time. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. | exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange. +| jobParameters | advanced | | Map | To configure additional options on the job. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| triggerParameters | advanced | | Map | To configure additional options on the trigger. |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java index 9e8b13c..2e75499 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java @@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.camel.CamelContext; import org.apache.camel.StartupListener; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.EndpointHelper; import org.apache.camel.util.IOHelper; import org.apache.camel.util.IntrospectionSupport; @@ -52,13 +53,20 @@ import org.slf4j.LoggerFactory; */ public class QuartzComponent extends UriEndpointComponent implements StartupListener { private static final Logger LOG = LoggerFactory.getLogger(QuartzComponent.class); - private Scheduler scheduler; + private final transient List<JobToAdd> jobsToAdd = new ArrayList<JobToAdd>(); + + @Metadata(label = "advanced") + private Scheduler scheduler; + @Metadata(label = "advanced") private SchedulerFactory factory; private Properties properties; private String propertiesFile; + @Metadata(label = "scheduler") private int startDelayedSeconds; + @Metadata(defaultValue = "true") private boolean autoStartScheduler = true; + @Metadata(defaultValue = "true") private boolean enableJmx = true; private static final class JobToAdd { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java index 9254806..b2c2e1d 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java @@ -72,9 +72,9 @@ public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableServi private int startDelayedSeconds; @UriParam private boolean usingFixedCamelContextName; - @UriParam(prefix = "trigger.", multiValue = true) + @UriParam(label = "advanced", prefix = "trigger.", multiValue = true) private Map<String, Object> triggerParameters; - @UriParam(prefix = "job.", multiValue = true) + @UriParam(label = "advanced", prefix = "job.", multiValue = true) private Map<String, Object> jobParameters; public QuartzEndpoint(final String endpointUri, final QuartzComponent component) { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java index 99ec275..8bf6822 100644 --- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java +++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java @@ -27,6 +27,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.StartupListener; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.IOHelper; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -50,14 +51,20 @@ import org.slf4j.LoggerFactory; */ public class QuartzComponent extends UriEndpointComponent implements StartupListener { private static final Logger LOG = LoggerFactory.getLogger(QuartzComponent.class); - private SchedulerFactory schedulerFactory; + @Metadata(label = "advanced") private Scheduler scheduler; + @Metadata(label = "advanced") + private SchedulerFactory schedulerFactory; private Properties properties; private String propertiesFile; + @Metadata(label = "scheduler") private int startDelayedSeconds; + @Metadata(label = "scheduler", defaultValue = "true") private boolean autoStartScheduler = true; - private boolean prefixJobNameWithEndpointId; + @Metadata(defaultValue = "true") private boolean enableJmx = true; + private boolean prefixJobNameWithEndpointId; + @Metadata(defaultValue = "true") private boolean prefixInstanceName = true; public QuartzComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/47a50bcd/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java index 5fd9557..7598161 100644 --- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java +++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java @@ -24,6 +24,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.StartupListener; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import quickfix.LogFactory; @@ -40,10 +41,14 @@ public class QuickfixjComponent extends UriEndpointComponent implements StartupL private final Map<String, QuickfixjEngine> provisionalEngines = new HashMap<String, QuickfixjEngine>(); private final Map<String, QuickfixjEndpoint> endpoints = new HashMap<String, QuickfixjEndpoint>(); + private Map<String, QuickfixjConfiguration> configurations = new HashMap<String, QuickfixjConfiguration>(); + + @Metadata(label = "advanced") private MessageStoreFactory messageStoreFactory; + @Metadata(label = "advanced") private LogFactory logFactory; + @Metadata(label = "advanced") private MessageFactory messageFactory; - private Map<String, QuickfixjConfiguration> configurations = new HashMap<String, QuickfixjConfiguration>(); private boolean lazyCreateEngines; public QuickfixjComponent() {
