camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1065963 [1/2] - in /camel/trunk: examples/ examples/camel-example-aggregate/ examples/camel-example-aggregate/src/main/resources/ examples/camel-example-axis/ examples/camel-example-axis/src/main/resources/ examples/camel-example-axis/src/...
Date Tue, 01 Feb 2011 09:49:30 GMT
Author: davsclaus
Date: Tue Feb  1 09:49:27 2011
New Revision: 1065963

URL: http://svn.apache.org/viewvc?rev=1065963&view=rev
Log:
CAMEL-3605: Switching to slf4j. Migrated tests, examples and tooling.

Added:
    camel/trunk/examples/camel-example-jms-file/src/test/resources/
Removed:
    camel/trunk/examples/camel-example-cxf-proxy/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-cxf/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-etl/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-loan-broker/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-loan-broker/src/test/resources/logging.properties
    camel/trunk/examples/camel-example-management/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-osgi/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-pojo-messaging/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-reportincident/src/test/resources/log4j.properties
Modified:
    camel/trunk/examples/camel-example-aggregate/pom.xml
    camel/trunk/examples/camel-example-aggregate/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-axis/pom.xml
    camel/trunk/examples/camel-example-axis/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-axis/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-bam/pom.xml
    camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-cafe/pom.xml
    camel/trunk/examples/camel-example-cafe/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-cxf-proxy/pom.xml
    camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-cxf/pom.xml
    camel/trunk/examples/camel-example-cxf/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-docs/pom.xml
    camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-etl/pom.xml
    camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
    camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-guice-jms/pom.xml
    camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-jms-file/pom.xml
    camel/trunk/examples/camel-example-jms-file/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-jmx/pom.xml
    camel/trunk/examples/camel-example-jmx/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-loadbalancing-mina/pom.xml
    camel/trunk/examples/camel-example-loadbalancing-mina/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-loan-broker/pom.xml
    camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
    camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
    camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/CreditAgency.java
    camel/trunk/examples/camel-example-loan-broker/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-management/pom.xml
    camel/trunk/examples/camel-example-management/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-osgi/pom.xml
    camel/trunk/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java
    camel/trunk/examples/camel-example-pojo-messaging/pom.xml
    camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-reportincident/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-route-throttling/pom.xml
    camel/trunk/examples/camel-example-route-throttling/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-simplejirabot/pom.xml
    camel/trunk/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
    camel/trunk/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-spring-jms/pom.xml
    camel/trunk/examples/camel-example-spring-jms/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-spring-security/pom.xml
    camel/trunk/examples/camel-example-spring-security/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-spring-ws/pom.xml
    camel/trunk/examples/camel-example-spring-ws/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-spring-xquery/pom.xml
    camel/trunk/examples/camel-example-spring-xquery/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-spring/pom.xml
    camel/trunk/examples/camel-example-spring/src/main/resources/log4j.properties
    camel/trunk/examples/camel-example-tracer/pom.xml
    camel/trunk/examples/camel-example-tracer/src/main/resources/log4j.properties
    camel/trunk/examples/common_build.xml
    camel/trunk/tests/camel-itest-activemq-highvolume/   (props changed)
    camel/trunk/tests/camel-itest-activemq-highvolume/pom.xml
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
    camel/trunk/tests/camel-itest-osgi/pom.xml
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpServerBean.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletProcessor.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
    camel/trunk/tests/camel-itest-spring-2.0/pom.xml
    camel/trunk/tests/camel-itest-spring-2.5/pom.xml
    camel/trunk/tests/camel-itest-standalone/pom.xml
    camel/trunk/tests/camel-itest/pom.xml
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareRequest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
    camel/trunk/tests/camel-partial-classpath-test/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java
    camel/trunk/tooling/maven/   (props changed)
    camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
    camel/trunk/tooling/maven/guice-maven-plugin/pom.xml
    camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml
    camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
    camel/trunk/tooling/maven/pom.xml

Modified: camel/trunk/examples/camel-example-aggregate/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-aggregate/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-aggregate/pom.xml (original)
+++ camel/trunk/examples/camel-example-aggregate/pom.xml Tue Feb  1 09:49:27 2011
@@ -54,6 +54,10 @@
 
         <!-- for logging using log4j.properties in src/main/resources -->
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>

Modified: camel/trunk/examples/camel-example-aggregate/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-aggregate/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-aggregate/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-aggregate/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 
@@ -24,7 +24,6 @@ log4j.rootLogger=INFO, out
 # uncomment the following line to enable debugging of Camel
 #
 #log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.springframework=WARN
 
 log4j.appender.out=org.apache.log4j.ConsoleAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout

Modified: camel/trunk/examples/camel-example-axis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-axis/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-axis/pom.xml (original)
+++ camel/trunk/examples/camel-example-axis/pom.xml Tue Feb  1 09:49:27 2011
@@ -76,6 +76,12 @@
 		    <version>0.4</version>
 		</dependency> 
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-axis/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-axis/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-axis/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-axis/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -18,21 +18,15 @@
 #
 # The logging properties used for eclipse testing, We want to see INFO output on the console.
 #
-log4j.rootLogger=INFO, file
+log4j.rootLogger=INFO, out
 
-# uncomment the next line to debug Camel
+#
+# uncomment the following line to enable debugging of Camel
+#
 #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=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-example-axis.log
-log4j.appender.file.append=true
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
 
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-axis/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-axis/src/test/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-axis/src/test/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-axis/src/test/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -21,7 +21,7 @@
 log4j.rootLogger=INFO, file
 
 # uncomment the next line to debug Camel
-log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
 
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender

Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Tue Feb  1 09:49:27 2011
@@ -63,8 +63,8 @@
 
     <!-- lets use log4j -->
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties
 #
 log4j.rootLogger=INFO, stdout
 
@@ -24,21 +24,8 @@ log4j.rootLogger=INFO, stdout
 #log4j.logger.org.apache.camel.bam=DEBUG
 #log4j.logger.org.apache.camel=DEBUG
 
-log4j.logger.org.apache.camel.impl.converter=INFO
-log4j.logger.org.apache.camel.util.ResolverUtil=INFO
-log4j.logger.org.springframework=WARN
-log4j.logger.org.hibernate=WARN
-
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-example-bam.log
-log4j.appender.out.append=true
-
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer

Modified: camel/trunk/examples/camel-example-cafe/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cafe/pom.xml (original)
+++ camel/trunk/examples/camel-example-cafe/pom.xml Tue Feb  1 09:49:27 2011
@@ -36,23 +36,28 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-spring</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-test</artifactId>
-			<scope>test</scope>
+			<artifactId>camel-spring</artifactId>
 		</dependency>
 
+        <!-- lets use log4j -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 		</dependency>
 
 		<!-- for testing -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

Modified: camel/trunk/examples/camel-example-cafe/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cafe/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-cafe/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 

Modified: camel/trunk/examples/camel-example-cxf-proxy/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-proxy/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-proxy/pom.xml Tue Feb  1 09:49:27 2011
@@ -41,9 +41,7 @@
 			org.apache.camel.example.reportincident
      </camel.osgi.private.pkg>
 		<!-- to avoid us import bunch of cxf package -->
-		<camel.osgi.dynamic>
-			*
-     </camel.osgi.dynamic>
+		<camel.osgi.dynamic>*</camel.osgi.dynamic>
 	</properties>
 
     <dependencies>

Modified: camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -18,23 +18,13 @@
 # default properties to initialise log4j
 log4j.rootLogger=INFO, console
 
+# Camel logging
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.cxf=DEBUG
+
 # Console appender
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
 
-# File appender
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-example-cxf-proxy.log
-log4j.appender.file.append=true
-
-# settings for specific packages
-#log4j.logger.org.springframework=WARN
-#log4j.logger.org.apache.cxf=WARN
-
-# Camel logging
-#log4j.logger.org.apache.camel=DEBUG
-
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -18,23 +18,12 @@
 # default properties to initialise log4j
 log4j.rootLogger=INFO, console
 
+# settings for specific packages
+#log4j.logger.org.apache.cxf=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
+
 # Console appender
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-example-cxf-tomcat.log
-log4j.appender.file.append=true
-
-# settings for specific packages
-#log4j.logger.org.springframework=WARN
-#log4j.logger.org.apache.cxf=WARN
-
-# Camel logging
-#log4j.logger.org.apache.camel=DEBUG
-
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf/pom.xml Tue Feb  1 09:49:27 2011
@@ -45,9 +45,7 @@
 			org.apache.hello_world_soap_http.types
      </camel.osgi.private.pkg>
 		<!-- to avoid us import bunch of cxf package -->
-		<camel.osgi.dynamic>
-			*
-     </camel.osgi.dynamic>
+		<camel.osgi.dynamic>*</camel.osgi.dynamic>
 	</properties>
 
 	<dependencies>
@@ -61,7 +59,6 @@
 			<artifactId>camel-spring</artifactId>
 		</dependency>
 
-
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-cxf</artifactId>
@@ -102,11 +99,6 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-
-		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
 			<version>2.0.0</version>
@@ -129,13 +121,22 @@
 			<artifactId>xercesImpl</artifactId>
 		</dependency>
 
+        <!-- logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+
 		<!-- testing -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-test</artifactId>
@@ -322,5 +323,4 @@
 		</plugins>
 	</build>
 
-
 </project>

Modified: camel/trunk/examples/camel-example-cxf/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 

Modified: camel/trunk/examples/camel-example-docs/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-docs/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-docs/pom.xml (original)
+++ camel/trunk/examples/camel-example-docs/pom.xml Tue Feb  1 09:49:27 2011
@@ -38,10 +38,10 @@
 		</dependency>
 
 		<!-- let's use log4j -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 
@@ -27,6 +27,4 @@ log4j.rootLogger=INFO, out
 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
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-etl/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ camel/trunk/examples/camel-example-etl/pom.xml Tue Feb  1 09:49:27 2011
@@ -60,14 +60,15 @@
 		</dependency>
 
 		<!-- lets use log4j -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>

Modified: camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java (original)
+++ camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java Tue Feb  1 09:49:27 2011
@@ -21,8 +21,8 @@ import java.util.List;
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.util.CastUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.util.ClassUtils;
 
@@ -35,7 +35,7 @@ import org.springframework.util.ClassUti
 @Converter
 public class CustomerTransformer {
 
-    private static final transient Log LOG = LogFactory.getLog(CustomerTransformer.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(CustomerTransformer.class);
 
     /**
      * A transformation method to convert a person document into a customer

Modified: camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 
@@ -33,19 +33,12 @@ log4j.category.openjpa.jdbc.JDBC=WARN
 log4j.category.openjpa.jdbc.Schema=WARN
 
 # uncomment the next line to debug Camel
-log4j.logger.org.apache.camel=DEBUG
-
-log4j.logger.org.apache.camel.impl.converter=INFO
-log4j.logger.org.apache.camel.util.ResolverUtil=INFO
-
-log4j.logger.org.springframework=WARN
-log4j.logger.org.hibernate=WARN
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.hibernate=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
 

Modified: camel/trunk/examples/camel-example-guice-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-guice-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-guice-jms/pom.xml Tue Feb  1 09:49:27 2011
@@ -71,6 +71,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- lets use log4j -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 
@@ -28,5 +28,4 @@ log4j.rootLogger=INFO, out
 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.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-jms-file/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jms-file/pom.xml (original)
+++ camel/trunk/examples/camel-example-jms-file/pom.xml Tue Feb  1 09:49:27 2011
@@ -75,11 +75,22 @@
 			</exclusions>
 		</dependency>
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+
 	</dependencies>
 
 	<profiles>

Modified: camel/trunk/examples/camel-example-jms-file/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jms-file/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-jms-file/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,25 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 
-#log4j.logger.org.apache.activemq=DEBUG
-
 # uncomment the next line to debug Camel
-log4j.logger.org.apache.camel=DEBUG
-
-log4j.logger.org.apache.camel.impl.converter=INFO
-log4j.logger.org.apache.camel.util.ResolverUtil=INFO
-
-log4j.logger.org.springframework=WARN
-log4j.logger.org.hibernate=WARN
+#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
-
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-jmx/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jmx/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jmx/pom.xml (original)
+++ camel/trunk/examples/camel-example-jmx/pom.xml Tue Feb  1 09:49:27 2011
@@ -34,14 +34,15 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-spring</artifactId>
-		</dependency>
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
 
 		<dependency>
 			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-core</artifactId>
+			<artifactId>camel-spring</artifactId>
 		</dependency>
 
 		<dependency>
@@ -49,6 +50,11 @@
 			<artifactId>camel-jmx</artifactId>
 		</dependency>
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-jmx/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jmx/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jmx/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-jmx/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,28 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, stdout
 
 # uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-log4j.logger.org.apache.camel.impl.converter=INFO
-log4j.logger.org.apache.camel.util.ResolverUtil=INFO
-log4j.logger.org.springframework=WARN
-log4j.logger.org.hibernate=WARN
-
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-example-jmx.log
-log4j.appender.out.append=true
-
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-loadbalancing-mina/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loadbalancing-mina/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loadbalancing-mina/pom.xml (original)
+++ camel/trunk/examples/camel-example-loadbalancing-mina/pom.xml Tue Feb  1 09:49:27 2011
@@ -33,6 +33,7 @@
 	<description>An example that show loadbalancing messaging with mina servers (TCP/IP)</description>
 
 	<dependencies>
+
 	    <dependency>
 	      <groupId>org.apache.camel</groupId>
 	      <artifactId>camel-core</artifactId>
@@ -45,18 +46,17 @@
 	      <groupId>org.apache.camel</groupId>
 	      <artifactId>camel-mina</artifactId>
 	    </dependency>
+
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 	    <dependency>
 	      <groupId>log4j</groupId> 
 	      <artifactId>log4j</artifactId> 
 	    </dependency>
-		<dependency>
-		  <groupId>org.slf4j</groupId>
-		  <artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-		  <groupId>org.slf4j</groupId>
-		  <artifactId>slf4j-simple</artifactId>
-		</dependency>
+
 	</dependencies>
   
   	<profiles>
@@ -107,4 +107,5 @@
 	    </plugin>
     </plugins>
   </build>
+
 </project>

Modified: camel/trunk/examples/camel-example-loadbalancing-mina/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loadbalancing-mina/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loadbalancing-mina/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-loadbalancing-mina/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -1,22 +1,30 @@
+## ------------------------------------------------------------------------
+## 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 for eclipse testing, We want to see debug output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-# uncomment the following line to turn on Camel debugging
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-# uncomment the following line to turn on ActiveMQ debugging
-#log4j.logger.org.apache.activemq=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
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Tue Feb  1 09:49:27 2011
@@ -40,6 +40,7 @@
 	</properties>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-core</artifactId>
@@ -79,6 +80,8 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+        <!-- logging -->
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
@@ -87,6 +90,7 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 		</dependency>
+
 		<!-- testing -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -98,6 +102,7 @@
 			<artifactId>camel-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
 	</dependencies>
 
 	<build>

Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java Tue Feb  1 09:49:27 2011
@@ -19,12 +19,12 @@ package org.apache.camel.loanbroker.queu
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 //START SNIPPET: bank
 public class Bank implements Processor {
-    private static final transient Log LOG = LogFactory.getLog(Bank.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(Bank.class);
     private String bankName;
     private double primeRate;
 
@@ -51,4 +51,4 @@ public class Bank implements Processor {
     }
 
 }
-//END SNIPPET: bank
\ No newline at end of file
+//END SNIPPET: bank

Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java Tue Feb  1 09:49:27 2011
@@ -19,12 +19,12 @@ package org.apache.camel.loanbroker.queu
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 //START SNIPPET: aggregation
 public class BankResponseAggregationStrategy implements AggregationStrategy {    
-    private static final transient Log LOG = LogFactory.getLog(BankResponseAggregationStrategy.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(BankResponseAggregationStrategy.class);
     
     // Here we put the bank response together
     public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
@@ -56,4 +56,4 @@ public class BankResponseAggregationStra
     }
 
 }
-// END SNIPPET: aggregation
\ No newline at end of file
+// END SNIPPET: aggregation

Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/CreditAgency.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/CreditAgency.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/CreditAgency.java (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/CreditAgency.java Tue Feb  1 09:49:27 2011
@@ -18,12 +18,12 @@ package org.apache.camel.loanbroker.queu
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 //START SNIPPET: creditAgency
 public class CreditAgency implements Processor {
-    private static final transient Log LOG = LogFactory.getLog(CreditAgency.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(CreditAgency.class);
 
     public void process(Exchange exchange) throws Exception {
         LOG.info("Receiving credit agency request");
@@ -37,4 +37,4 @@ public class CreditAgency implements Pro
     }
 
 }
-//END SNIPPET: creditAgency
\ No newline at end of file
+//END SNIPPET: creditAgency

Modified: camel/trunk/examples/camel-example-loan-broker/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,25 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used
 #
-log4j.rootLogger=WARN, out
+log4j.rootLogger=INFO, stdout
 
-log4j.logger.org.apache.camel=INFO
-
-# uncomment the following line to turn on Camel debugging
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-# uncomment the following line to turn on ActiveMQ debugging
-#log4j.logger.org.apache.activemq=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.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-management/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-management/pom.xml (original)
+++ camel/trunk/examples/camel-example-management/pom.xml Tue Feb  1 09:49:27 2011
@@ -38,6 +38,7 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring</artifactId>
@@ -51,6 +52,11 @@
             <artifactId>activemq-camel</artifactId>
         </dependency>
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-management/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-management/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-management/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, out
 
@@ -28,5 +28,4 @@ log4j.rootLogger=INFO, out
 log4j.appender.out=org.apache.log4j.ConsoleAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
 log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-osgi/pom.xml Tue Feb  1 09:49:27 2011
@@ -36,24 +36,28 @@
 	</properties>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-spring</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
+			<artifactId>camel-core</artifactId>
 		</dependency>
-		<!-- for testing -->
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-spring</artifactId>
 		</dependency>
 
+        <!-- used for mvn camel:run -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+
 	</dependencies>
 
 	<build>
+
+        <!-- to include the features.xml in the artifact -->
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>
@@ -95,6 +99,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<!-- Allows the routes to be run via 'mvn camel:run' -->
 			<plugin>
 				<groupId>org.apache.camel</groupId>
@@ -105,14 +110,4 @@
 
 	</build>
 
-	<reporting>
-		<plugins>
-			<!-- lets generate nice PNG / SVG diagrams from our routes -->
-			<plugin>
-				<groupId>org.apache.camel</groupId>
-				<artifactId>camel-maven-plugin</artifactId>
-				<version>${project.version}</version>
-			</plugin>
-		</plugins>
-	</reporting>
 </project>

Modified: camel/trunk/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java (original)
+++ camel/trunk/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java Tue Feb  1 09:49:27 2011
@@ -18,14 +18,14 @@ package org.apache.camel.example.osgi;
 
 import java.util.Date;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public class MyTransform  {
-    private static final transient Log LOG = LogFactory.getLog(MyTransform.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(MyTransform.class);
     private boolean verbose = true;
     private String prefix = "MyTransform";
 

Modified: camel/trunk/examples/camel-example-pojo-messaging/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-pojo-messaging/pom.xml (original)
+++ camel/trunk/examples/camel-example-pojo-messaging/pom.xml Tue Feb  1 09:49:27 2011
@@ -63,10 +63,10 @@
 		</dependency>
 
 		<!-- lets use log4j -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -1,22 +1,30 @@
+## ------------------------------------------------------------------------
+## 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 for eclipse testing, We want to see debug output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-# uncomment the following line to turn on Camel debugging
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-# uncomment the following line to turn on ActiveMQ debugging
-#log4j.logger.org.apache.activemq=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.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -15,28 +15,16 @@
 ## limitations under the License.
 ## ------------------------------------------------------------------------
 
-# default properties to initialise log4j
-log4j.rootLogger=INFO, console
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, stdout
 
-# Console appender
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-example-reportincident-wssecurity.log
-log4j.appender.file.append=true
-
-# settings for specific packages
-log4j.logger.org.springframework=WARN
-
-# Camel logging
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-# Cxf logging
-#log4j.logger.org.apache.cxf=DEBUG
-
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-reportincident/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-reportincident/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -15,26 +15,16 @@
 ## limitations under the License.
 ## ------------------------------------------------------------------------
 
-# default properties to initialise log4j
-log4j.rootLogger=INFO, console
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, stdout
 
-# Console appender
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-example-reportincident.log
-log4j.appender.file.append=true
-
-# settings for specific packages
-#log4j.logger.org.springframework=WARN
-#log4j.logger.org.apache.cxf=WARN
-
-# Camel logging
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-route-throttling/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-route-throttling/pom.xml (original)
+++ camel/trunk/examples/camel-example-route-throttling/pom.xml Tue Feb  1 09:49:27 2011
@@ -62,6 +62,10 @@
 
         <!-- for logging using log4j.properties in src/main/resources -->
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
@@ -72,6 +76,11 @@
           <artifactId>camel-test</artifactId>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <scope>test</scope>
+        </dependency>
 
     </dependencies>
   

Modified: camel/trunk/examples/camel-example-route-throttling/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-route-throttling/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-route-throttling/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,18 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-#
-# uncomment the following line to enable debugging of Camel
-#
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.springframework=WARN
-
-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
 
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, stdout
 
@@ -27,12 +27,4 @@ log4j.rootLogger=INFO, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-example-simplejirabot.log
-log4j.appender.out.append=true
-
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-simplejirabot/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-simplejirabot/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-simplejirabot/pom.xml (original)
+++ camel/trunk/examples/camel-example-simplejirabot/pom.xml Tue Feb  1 09:49:27 2011
@@ -61,6 +61,11 @@
             <artifactId>camel-irc</artifactId>
         </dependency>
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, stdout
 
@@ -27,12 +27,4 @@ log4j.rootLogger=INFO, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-example-simplejirabot.log
-log4j.appender.out.append=true
-
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/pom.xml Tue Feb  1 09:49:27 2011
@@ -41,7 +41,7 @@
                 </camel.osgi.import>
 		<!-- avoid to import the bunch of spring related package -->
 		<camel.osgi.dynamic>*</camel.osgi.dynamic>
-		<spring-version>3.0.3.RELEASE</spring-version>
+		<spring-version>3.0.5.RELEASE</spring-version>
 		<junit-version>4.8.1</junit-version>
 	</properties>
 
@@ -104,6 +104,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
@@ -118,6 +123,7 @@
 		</dependency>
 
 	</dependencies>
+
 	<build>
 		<resources>
 			<resource>
@@ -192,4 +198,5 @@
 			</plugin>
 		</plugins>
 	</reporting>
+
 </project>

Modified: camel/trunk/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,17 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-#
-# uncomment the following line to enable debugging of Camel
-#
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-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
-
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-jms/pom.xml Tue Feb  1 09:49:27 2011
@@ -91,6 +91,10 @@
 
         <!-- for logging using log4j.properties in src/main/resources -->
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>

Modified: camel/trunk/examples/camel-example-spring-jms/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-spring-jms/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,18 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-#
-# uncomment the following line to enable debugging of Camel
-#
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.springframework=WARN
-
-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
 
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring-security/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-security/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-security/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-security/pom.xml Tue Feb  1 09:49:27 2011
@@ -31,8 +31,8 @@
 	<name>Camel :: Example :: Spring Security</name>
 	<description>An example showing how to work with Camel and Spring Security</description>
 
-
 	<dependencies>
+
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-spring</artifactId>
@@ -59,6 +59,11 @@
             <artifactId>spring-web</artifactId>
         </dependency>
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
@@ -123,4 +128,5 @@
 			</plugin>
 		</plugins>
 	</reporting>
+
 </project>

Modified: camel/trunk/examples/camel-example-spring-security/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-security/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-security/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-spring-security/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,17 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-#
-# uncomment the following line to enable debugging of Camel
-#
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-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
-
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring-ws/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-ws/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-ws/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-ws/pom.xml Tue Feb  1 09:49:27 2011
@@ -30,8 +30,8 @@
 	<name>Camel :: Example :: Spring Web Services</name>
 	<description>An example showing how to work with Camel and Spring Web Services</description>
 
-
 	<dependencies>
+
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-spring-ws</artifactId>
@@ -51,6 +51,12 @@
 			<artifactId>spring-webmvc</artifactId>
 			<version>${spring-version}</version>
 		</dependency>
+
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
@@ -62,6 +68,7 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -114,4 +121,5 @@
 			</plugin>
 		</plugins>
 	</reporting>
+
 </project>
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring-ws/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-ws/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-ws/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-spring-ws/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,20 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-log4j.logger.org.springframework.ws.server.endpoint=DEBUG
-
-#
-# uncomment the following line to enable debugging of Camel
-#
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-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.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
-
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring-xquery/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-xquery/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-xquery/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-xquery/pom.xml Tue Feb  1 09:49:27 2011
@@ -59,6 +59,16 @@
       <artifactId>activemq-core</artifactId>
     </dependency>
 
+    <!-- logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
     <!-- for testing -->
     <dependency>
       <groupId>junit</groupId>
@@ -136,4 +146,5 @@
       </plugin>
     </plugins>
   </reporting>
+
 </project>

Modified: camel/trunk/examples/camel-example-spring-xquery/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-xquery/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-xquery/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-spring-xquery/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,22 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
-
-#
-# uncomment the following line to enable debugging of Camel
-#
-#log4j.logger.org.apache.activemq=DEBUG
+log4j.rootLogger=INFO, stdout
 
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.apache.camel.impl.converter=INFO
 
 # 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.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring/pom.xml Tue Feb  1 09:49:27 2011
@@ -52,6 +52,11 @@
 			<artifactId>activemq-core</artifactId>
 		</dependency>
 
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>

Modified: camel/trunk/examples/camel-example-spring/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-spring/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,17 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
 
-#
-# uncomment the following line to enable debugging of Camel
-#
+# uncomment the next line to debug Camel
 #log4j.logger.org.apache.camel=DEBUG
 
-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
-
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-tracer/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/pom.xml (original)
+++ camel/trunk/examples/camel-example-tracer/pom.xml Tue Feb  1 09:49:27 2011
@@ -35,7 +35,9 @@
     <properties>
       <camel.osgi.export.pkg>org.apache.camel.example.tracer</camel.osgi.export.pkg>
     </properties>
+
     <dependencies>
+
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-jpa</artifactId>
@@ -47,8 +49,8 @@
 
         <!-- lets use log4j -->
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
@@ -79,6 +81,7 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -155,4 +158,5 @@
             </plugin>
         </plugins>
     </reporting>
+
 </project>

Modified: camel/trunk/examples/camel-example-tracer/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/src/main/resources/log4j.properties?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/src/main/resources/log4j.properties (original)
+++ camel/trunk/examples/camel-example-tracer/src/main/resources/log4j.properties Tue Feb  1 09:49:27 2011
@@ -16,29 +16,15 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
+# The logging properties used
 #
 log4j.rootLogger=INFO, stdout
 
 # uncomment the next line to debug Camel
-#log4j.logger.org.apache.camel.bam=DEBUG
 #log4j.logger.org.apache.camel=DEBUG
 
-log4j.logger.org.apache.camel.impl.converter=INFO
-log4j.logger.org.apache.camel.util.ResolverUtil=INFO
-log4j.logger.org.springframework=WARN
-log4j.logger.org.hibernate=WARN
-
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-example-tracer.log
-log4j.appender.out.append=true
-
 log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Modified: camel/trunk/examples/common_build.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/common_build.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/examples/common_build.xml (original)
+++ camel/trunk/examples/common_build.xml Tue Feb  1 09:49:27 2011
@@ -117,7 +117,7 @@
   <path id="camel.core.classpath">
     <fileset dir="${camel.lib}">
       <include name="**/camel-core-*.jar"/>
-      <include name="**/commons-logging-*.jar"/>
+      <include name="**/slf4j-*.jar"/>
       <include name="**/commons-management-*.jar"/>
       <include name="**/spring/spring-*.jar"/>
       <include name="**/jdk15/*.jar"/>

Propchange: camel/trunk/tests/camel-itest-activemq-highvolume/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb  1 09:49:27 2011
@@ -0,0 +1,9 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??
+classes



Mime
View raw message