You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/07/15 07:09:57 UTC
[4/4] camel git commit: Fixed CS. Added test to SB. This fixes #1071
Fixed CS. Added test to SB. This fixes #1071
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f496aac7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f496aac7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f496aac7
Branch: refs/heads/master
Commit: f496aac76098600313248a8a4c62c75efedf1830
Parents: 12dcc56
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jul 15 09:09:45 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jul 15 09:09:45 2016 +0200
----------------------------------------------------------------------
components/camel-lumberjack/pom.xml | 107 +++++++++----------
.../src/main/docs/lumberjack.adoc | 8 +-
.../lumberjack/LumberjackComponent.java | 2 +-
.../lumberjack/LumberjackConsumer.java | 4 +-
.../lumberjack/LumberjackEndpoint.java | 11 +-
.../src/test/resources/log4j.properties | 6 +-
.../itest/springboot/CamelLumberjackTest.java | 48 +++++++++
7 files changed, 117 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/pom.xml b/components/camel-lumberjack/pom.xml
index 1e69023..38029d7 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -20,65 +20,64 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.18-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.18-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-lumberjack</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Lumberjack</name>
- <description>Camel Lumberjack log streaming component</description>
+ <artifactId>camel-lumberjack</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Lumberjack</name>
+ <description>Camel Lumberjack log streaming component</description>
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.lumberjack.*</camel.osgi.export.pkg>
- <camel.osgi.export.service>
- org.apache.camel.spi.ComponentResolver;component=lumberjack,
- org.apache.camel.spi.ComponentResolver;component=lumberjacks
- </camel.osgi.export.service>
- </properties>
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.lumberjack.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>
+ org.apache.camel.spi.ComponentResolver;component=lumberjack
+ </camel.osgi.export.service>
+ </properties>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>${netty-version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty-version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson-version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson-version}</version>
+ </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/src/main/docs/lumberjack.adoc
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack.adoc b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
index 8d87a21..bc92bbd 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
@@ -47,6 +47,7 @@ The Lumberjack component has no options.
+
// endpoint options: START
The Lumberjack component supports 7 endpoint options which are listed below:
@@ -54,10 +55,10 @@ The Lumberjack component supports 7 endpoint options which are listed below:
[width="100%",cols="2s,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| host | common | | String | *Required* Network interface on which to listen for Lumberjack
-| port | common | 5044 | int | Network port on which to listen for Lumberjack
-| sslContextParameters | common | | SSLContextParameters | SSL configuration
+| host | consumer | | String | *Required* Network interface on which to listen for Lumberjack
+| port | consumer | 5044 | int | Network port on which to listen for Lumberjack
| 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.
+| sslContextParameters | consumer | | SSLContextParameters | SSL configuration
| 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 | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
@@ -68,6 +69,7 @@ The Lumberjack component supports 7 endpoint options which are listed below:
+
[[Lumberjack-Result]]
Result
^^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
index 83e9e4e..096d10f 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
@@ -24,7 +24,7 @@ import org.apache.camel.impl.UriEndpointComponent;
/**
* The class is the Camel component for the Lumberjack server
*/
-public final class LumberjackComponent extends UriEndpointComponent {
+public class LumberjackComponent extends UriEndpointComponent {
static final int DEFAULT_PORT = 5044;
public LumberjackComponent() {
http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
index fd3fc78..48c5010 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
@@ -26,10 +26,10 @@ import org.apache.camel.component.lumberjack.io.LumberjackServer;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.util.concurrent.CamelThreadFactory;
-final class LumberjackConsumer extends DefaultConsumer {
+public class LumberjackConsumer extends DefaultConsumer {
private final LumberjackServer lumberjackServer;
- LumberjackConsumer(LumberjackEndpoint endpoint, Processor processor, String host, int port, SSLContext sslContext) {
+ public LumberjackConsumer(LumberjackEndpoint endpoint, Processor processor, String host, int port, SSLContext sslContext) {
super(endpoint, processor);
lumberjackServer = new LumberjackServer(host, port, sslContext, getThreadFactory(), this::onMessageReceived);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
index 0db9dbd..a86fe14 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,8 +27,9 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.jsse.SSLContextParameters;
-@UriEndpoint(scheme = "lumberjack", title = "Lumberjack", syntax = "lumberjack:host:port", consumerClass = LumberjackConsumer.class, label = "log")
-final class LumberjackEndpoint extends DefaultEndpoint {
+@UriEndpoint(scheme = "lumberjack", title = "Lumberjack", syntax = "lumberjack:host:port",
+ consumerOnly = true, consumerClass = LumberjackConsumer.class, label = "log")
+public class LumberjackEndpoint extends DefaultEndpoint {
@UriPath(description = "Network interface on which to listen for Lumberjack")
@Metadata(required = "true")
private final String host;
http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/test/resources/log4j.properties b/components/camel-lumberjack/src/test/resources/log4j.properties
index 4321049..6827323 100644
--- a/components/camel-lumberjack/src/test/resources/log4j.properties
+++ b/components/camel-lumberjack/src/test/resources/log4j.properties
@@ -16,14 +16,12 @@
## ------------------------------------------------------------------------
#
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used for testing
#
log4j.rootLogger=INFO, file
# uncomment the following to enable camel debugging
-log4j.logger.org.apache.camel.component.lucene=DEBUG
-#log4j.logger.org.apache.camel=DEBUG
-#log4j.logger.org.apache.commons.net=TRACE
+log4j.logger.org.apache.camel.component.lumberjack=DEBUG
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelLumberjackTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelLumberjackTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelLumberjackTest.java
new file mode 100644
index 0000000..1deb8fd
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelLumberjackTest.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelLumberjackTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelLumberjackTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ this.runComponentTest(config);
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}