Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

switched to slf4j

  • Loading branch information...
commit c25e7e844eb0c99cef50b000c356437d7e68f3b9 1 parent ee2ad80
Adrian Cole authored
View
15 camel-notifications/pom.xml
@@ -36,8 +36,6 @@
<properties>
<camel.version>2.9.0</camel.version>
<jclouds.version>1.3.1</jclouds.version>
- <log4j.version>1.2.16</log4j.version>
- <slf4j.version>1.6.1</slf4j.version>
</properties>
<dependencies>
@@ -81,7 +79,7 @@
<!-- Jclouds Dependencies -->
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
+ <artifactId>jclouds-slf4j</artifactId>
<version>${jclouds.version}</version>
</dependency>
@@ -99,14 +97,9 @@
<!-- Logging -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.0</version>
</dependency>
</dependencies>
View
4 camel-notifications/src/main/resources/META-INF/spring/camel-context.xml
@@ -55,7 +55,7 @@
<setBody>
<groovy>request.body.collect { it.id }</groovy>
</setBody>
- <to uri="smtps://{{smtp.username}}@{{smtp.server}}?password={{smtp.password}}"/>
+ <to uri="smtps://{{smtp.server}}?username={{smtp.username}}&amp;password={{smtp.password}}"/>
</filter>
</route>
@@ -80,7 +80,7 @@
<constructor-arg name="credential" value="${jclouds.credential}"/>
<constructor-arg name="modules">
<list>
- <bean class="org.jclouds.logging.log4j.config.Log4JLoggingModule"/>
+ <bean class="org.jclouds.logging.slf4j.config.SLF4JLoggingModule"/>
</list>
</constructor-arg>
<constructor-arg name="overrides">
View
19 camel-notifications/src/main/resources/log4j.properties
@@ -1,19 +0,0 @@
-
-#
-# The logging properties used
-#
-log4j.rootLogger=INFO, out
-
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
-
-log4j.logger.org.springframework=WARN
-
-
-# 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
-
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
View
20 camel-notifications/src/main/resources/logback.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>- %msg%n</pattern>
+ </encoder>
+ </appender>
+ <root level="info">
+ <appender-ref ref="STDOUT"/>
+ </root>
+ <logger name="jclouds.compute" level="debug"/>
+ <logger name="net.schmizz" level="warn"/>
+ <logger name="org.springframework" level="warn"/>
+<!--
+ <logger name="org.apache.camel" level="debug"/>
+ <logger name="jclouds.wire" level="debug"/>
+ <logger name="jclouds.headers" level="debug"/>
+ <logger name="jclouds.ssh" level="debug"/>
+-->
+</configuration>
Please sign in to comment.
Something went wrong with that request. Please try again.