camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [6/8] camel git commit: Use log4j v2
Date Tue, 01 Nov 2016 16:06:37 GMT
Use log4j v2


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e0c04d12
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0c04d12
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0c04d12

Branch: refs/heads/master
Commit: e0c04d12131aed0310c453e0b586b7667a8799c7
Parents: ff285e4
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Nov 1 08:59:48 2016 -0400
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Nov 1 08:59:48 2016 -0400

----------------------------------------------------------------------
 components/camel-bonita/pom.xml                 | 15 ++++++++++
 .../src/main/docs/bonita-component.adoc         |  8 +++---
 .../src/test/resources/log4j.properties         | 29 --------------------
 .../src/test/resources/log4j2.properties        | 28 +++++++++++++++++++
 4 files changed, 47 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e0c04d12/components/camel-bonita/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 427b86d..7a14536 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -105,6 +105,21 @@
       <version>${wiremock.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/e0c04d12/components/camel-bonita/src/main/docs/bonita-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/docs/bonita-component.adoc b/components/camel-bonita/src/main/docs/bonita-component.adoc
index 4518c1d..bb14dd7 100644
--- a/components/camel-bonita/src/main/docs/bonita-component.adoc
+++ b/components/camel-bonita/src/main/docs/bonita-component.adoc
@@ -33,11 +33,11 @@ The bonita component supports 10 endpoint options which are listed below:
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| operation | common |  | BonitaOperation | *Required* Operation to use
-| hostname | common | localhost | String | Hostname where Bonita engine runs
-| port | common | 8080 | String | Port of the server hosting Bonita engine
-| processName | common |  | String | Name of the process involved in the operation
+| operation | consumer |  | BonitaOperation | *Required* Operation to use
 | 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.
+| hostname | consumer | localhost | String | Hostname where Bonita engine runs
+| port | consumer | 8080 | String | Port of the server hosting Bonita engine
+| processName | consumer |  | String | Name of the process involved in the operation
 | 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).

http://git-wip-us.apache.org/repos/asf/camel/blob/e0c04d12/components/camel-bonita/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/resources/log4j.properties b/components/camel-bonita/src/test/resources/log4j.properties
deleted file mode 100644
index 23a8d97..0000000
--- a/components/camel-bonita/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# 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.
-#
-# The logging properties used
-#
-log4j.rootLogger=INFO, out
-
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-

http://git-wip-us.apache.org/repos/asf/camel/blob/e0c04d12/components/camel-bonita/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/resources/log4j2.properties b/components/camel-bonita/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..dda507c
--- /dev/null
+++ b/components/camel-bonita/src/test/resources/log4j2.properties
@@ -0,0 +1,28 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-bonita-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+rootLogger.level = INFO
+rootLogger.appenderRef.file.ref = file


Mime
View raw message