switch TRACE log to INFO
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8526fab4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8526fab4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8526fab4 Branch: refs/heads/master Commit: 8526fab4b71859666eed858890beafd32b9feec0 Parents: d09bc33 Author: Fabrizio Spataro <fabrizio.spat...@bizmate.it> Authored: Tue Sep 20 10:30:41 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Sep 20 11:07:35 2016 +0200 ---------------------------------------------------------------------- .../DockerComponentConfiguration.java | 182 ------------------- .../src/main/docs/docker-component.adoc | 27 +-- .../src/test/resources/log4j2.properties | 2 +- 3 files changed, 7 insertions(+), 204 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8526fab4/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java index 8bd7748..b430775 100644 --- a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java +++ b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java @@ -16,9 +16,7 @@ */ package org.apache.camel.component.docker.springboot; -import java.util.Map; import org.apache.camel.component.docker.DockerConfiguration; -import org.apache.camel.component.docker.DockerOperation; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -34,66 +32,6 @@ public class DockerComponentConfiguration { * configuration can also be set individually. */ private DockerConfiguration configuration; - /** - * Docker host - */ - private String host; - /** - * Docker port - */ - private Integer port; - /** - * User name to authenticate with - */ - private String username; - /** - * Password to authenticate with - */ - private String password; - /** - * Email address associated with the user - */ - private String email; - /** - * Server address for docker registry. - */ - private String serverAddress; - /** - * Request timeout for response (in seconds) - */ - private Integer requestTimeout; - /** - * Use HTTPS communication - */ - private Boolean secure; - /** - * Location containing the SSL certificate chain - */ - private String certPath; - /** - * Maximum total connections - */ - private Integer maxTotalConnections; - /** - * Maximum route connections - */ - private Integer maxPerRouteConnections; - /** - * Whether to use logging filter - */ - private Boolean loggingFilter; - /** - * Whether to follow redirect filter - */ - private Boolean followRedirectFilter; - /** - * Additional configuration parameters as key/value pairs - */ - private Map<String, Object> parameters; - /** - * Which operation to use - */ - private DockerOperation operation; public DockerConfiguration getConfiguration() { return configuration; @@ -102,124 +40,4 @@ public class DockerComponentConfiguration { public void setConfiguration(DockerConfiguration configuration) { this.configuration = configuration; } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getServerAddress() { - return serverAddress; - } - - public void setServerAddress(String serverAddress) { - this.serverAddress = serverAddress; - } - - public Integer getRequestTimeout() { - return requestTimeout; - } - - public void setRequestTimeout(Integer requestTimeout) { - this.requestTimeout = requestTimeout; - } - - public Boolean getSecure() { - return secure; - } - - public void setSecure(Boolean secure) { - this.secure = secure; - } - - public String getCertPath() { - return certPath; - } - - public void setCertPath(String certPath) { - this.certPath = certPath; - } - - public Integer getMaxTotalConnections() { - return maxTotalConnections; - } - - public void setMaxTotalConnections(Integer maxTotalConnections) { - this.maxTotalConnections = maxTotalConnections; - } - - public Integer getMaxPerRouteConnections() { - return maxPerRouteConnections; - } - - public void setMaxPerRouteConnections(Integer maxPerRouteConnections) { - this.maxPerRouteConnections = maxPerRouteConnections; - } - - public Boolean getLoggingFilter() { - return loggingFilter; - } - - public void setLoggingFilter(Boolean loggingFilter) { - this.loggingFilter = loggingFilter; - } - - public Boolean getFollowRedirectFilter() { - return followRedirectFilter; - } - - public void setFollowRedirectFilter(Boolean followRedirectFilter) { - this.followRedirectFilter = followRedirectFilter; - } - - public Map<String, Object> getParameters() { - return parameters; - } - - public void setParameters(Map<String, Object> parameters) { - this.parameters = parameters; - } - - public DockerOperation getOperation() { - return operation; - } - - public void setOperation(DockerOperation operation) { - this.operation = operation; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/8526fab4/components/camel-docker/src/main/docs/docker-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/docs/docker-component.adoc b/components/camel-docker/src/main/docs/docker-component.adoc index 9113cbd..0a14fc4 100644 --- a/components/camel-docker/src/main/docs/docker-component.adoc +++ b/components/camel-docker/src/main/docs/docker-component.adoc @@ -30,7 +30,7 @@ General Options ^^^^^^^^^^^^^^^ // component options: START -The Docker component supports 16 options which are listed below. +The Docker component supports 1 options which are listed below. @@ -39,28 +39,13 @@ The Docker component supports 16 options which are listed below. |======================================================================= | Name | Java Type | Description | configuration | DockerConfiguration | To use the shared docker configuration. Properties of the shared configuration can also be set individually. -| host | String | Docker host -| port | Integer | Docker port -| username | String | User name to authenticate with -| password | String | Password to authenticate with -| email | String | Email address associated with the user -| serverAddress | String | Server address for docker registry. -| requestTimeout | Integer | Request timeout for response (in seconds) -| secure | boolean | Use HTTPS communication -| certPath | String | Location containing the SSL certificate chain -| maxTotalConnections | Integer | Maximum total connections -| maxPerRouteConnections | Integer | Maximum route connections -| loggingFilter | boolean | Whether to use logging filter -| followRedirectFilter | boolean | Whether to follow redirect filter -| parameters | Map | Additional configuration parameters as key/value pairs -| operation | DockerOperation | Which operation to use |======================================================================= {% endraw %} // component options: END // endpoint options: START -The Docker component supports 18 endpoint options which are listed below: +The Docker component supports 20 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] @@ -69,9 +54,9 @@ The Docker component supports 18 endpoint options which are listed below: | operation | common | | DockerOperation | *Required* Which operation to use | certPath | common | | String | Location containing the SSL certificate chain | email | common | | String | Email address associated with the user -| followRedirectFilter | common | false | boolean | *Deprecated since 2.18* Whether to follow redirect filter +| followRedirectFilter | common | false | boolean | Whether to follow redirect filter | host | common | localhost | String | *Required* Docker host -| loggingFilter | common | false | boolean | *Deprecated since 2.18* Whether to use logging filter +| loggingFilter | common | false | boolean | Whether to use logging filter | maxPerRouteConnections | common | 100 | Integer | Maximum route connections | maxTotalConnections | common | 100 | Integer | Maximum total connections | password | common | | String | Password to authenticate with @@ -79,13 +64,13 @@ The Docker component supports 18 endpoint options which are listed below: | requestTimeout | common | | Integer | Request timeout for response (in seconds) | secure | common | false | boolean | Use HTTPS communication | serverAddress | common | https://index.docker.io/v1/ | String | Server address for docker registry. +| socket | common | true | boolean | Socket connection mode +| tlsVerify | common | false | boolean | Check TLS | username | common | | String | User name to authenticate with | 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). -| tlsVerify | boolean | *from 2.18* TLS Verify flag -| socket | boolean | *from 2.18* Connection mode, true docker client use socket otherwise tcp |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/8526fab4/components/camel-docker/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/resources/log4j2.properties b/components/camel-docker/src/test/resources/log4j2.properties index 5dfbe01..b3e097f 100644 --- a/components/camel-docker/src/test/resources/log4j2.properties +++ b/components/camel-docker/src/test/resources/log4j2.properties @@ -24,5 +24,5 @@ appender.file.name = file appender.file.fileName = target/camel-docker-test.log appender.file.layout.type = PatternLayout appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n -rootLogger.level = TRACE +rootLogger.level = INFO rootLogger.appenderRef.file.ref = file
