camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1065963 [2/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
Modified: camel/trunk/tests/camel-itest-activemq-highvolume/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-activemq-highvolume/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-activemq-highvolume/pom.xml (original)
+++ camel/trunk/tests/camel-itest-activemq-highvolume/pom.xml Tue Feb  1 09:49:27 2011
@@ -17,22 +17,23 @@
 	limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-parent</artifactId>
-            <version>2.7-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>camel-itest-activemq-highvolume</artifactId>
-	<packaging>bundle</packaging>
-	<name>Camel :: ITest :: ActiveMq :: High Volume</name>
-	<description>Integration Test using ActiveMq with Camel to generate high volume messages</description>
-	
-	<properties>
+    <parent>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-parent</artifactId>
+        <version>2.7-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>camel-itest-activemq-highvolume</artifactId>
+    <packaging>bundle</packaging>
+    <name>Camel :: ITest :: ActiveMq :: High Volume</name>
+    <description>Integration Test using ActiveMq with Camel to generate high volume
messages</description>
+
+    <properties>
         <camel.osgi.import.pkg>
             org.apache.activemq.broker,
             org.apache.activemq.broker.region.policy,
@@ -40,95 +41,95 @@
             org.apache.activemq.usage,
             org.apache.activemq.util,
             org.apache.activemq.xbean,
-            org.springframework.jms.connection;version="3.0.3.RELEASE",
+            org.springframework.jms.connection;version="3.0.5.RELEASE",
             *
         </camel.osgi.import.pkg>
         <camel.osgi.private.pkg>
-        	org.apache.camel.itest.highvolume
+            org.apache.camel.itest.highvolume
         </camel.osgi.private.pkg>
         <camel.osgi.dynamic>
             *
         </camel.osgi.dynamic>
     </properties>
 
-	<dependencies>
-		<!-- Camel -->
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-spring</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-core-xml</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-jms</artifactId>
-		</dependency>
-		
-		<!-- Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-		</dependency>
-		
-		<!--  ActiveMq & activemq - camel -->
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-	      <!-- <version>5.4.0</version> -->
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-	      <!-- <version>5.4.0</version> -->
-		</dependency>
-	    <dependency>
-	      <groupId>org.apache.activemq</groupId>
-	      <artifactId>activemq-pool</artifactId>
-	      <version>5.3.2</version>
-	    </dependency>
-	    <dependency>
-	      <groupId>org.apache.xbean</groupId>
-	      <artifactId>xbean-spring</artifactId>
-	    </dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-camel</artifactId>
-		</dependency>
-	</dependencies>
-	
-   <build>
-    <plugins>
-
-      <!-- Allows the example to be run via 'mvn compile exec:java' -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <includePluginDependencies>false</includePluginDependencies>
-        </configuration>
-      </plugin>
+    <dependencies>
+        <!-- Camel -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jms</artifactId>
+        </dependency>
+
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+
+        <!--  ActiveMq & activemq - camel -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-pool</artifactId>
+            <version>5.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-camel</artifactId>
+        </dependency>
+
+        <!-- logging -->
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <!-- Allows the example to be run via 'mvn compile exec:java' -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <includePluginDependencies>false</includePluginDependencies>
+                </configuration>
+            </plugin>
+
+            <!-- Allows the routes to be run via 'mvn camel:run' -->
+            <plugin>
+                <groupId>org.apache.camel</groupId>
+                <artifactId>camel-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-      <!-- Allows the routes to be run via 'mvn camel:run' -->
-      <plugin>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-	
 </project>

Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Tue Feb  1 09:49:27 2011
@@ -20,8 +20,8 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultRouteContext;
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.osgi.CamelContextFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.ops4j.pax.exam.Inject;
@@ -40,7 +40,7 @@ import static org.ops4j.pax.exam.contain
 
 public abstract class AbstractFeatureTest {
 
-    protected final transient Log log = LogFactory.getLog(getClass());
+    protected final transient Logger log = LoggerFactory.getLogger(getClass());
 
     @Inject
     protected BundleContext bundleContext;
@@ -179,4 +179,4 @@ public abstract class AbstractFeatureTes
 
     
 
-}
\ No newline at end of file
+}

Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Tue Feb  1 09:49:27 2011
@@ -191,13 +191,18 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-persistence-jdbc</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa-persistence-jdbc</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Tue Feb  1 09:49:27 2011
@@ -19,8 +19,8 @@ package org.apache.camel.itest.osgi;
 import org.apache.camel.CamelContext;
 import org.apache.camel.osgi.CamelContextFactory;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.ops4j.pax.exam.Inject;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
@@ -37,7 +37,7 @@ import static org.ops4j.pax.exam.contain
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 public class OSGiIntegrationTestSupport extends CamelTestSupport {
-    protected static final transient Log LOG = LogFactory.getLog(OSGiIntegrationTestSupport.class);
+    protected static final transient Logger LOG = LoggerFactory.getLogger(OSGiIntegrationTestSupport.class);
     @Inject
     protected BundleContext bundleContext;
     

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpServerBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpServerBean.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpServerBean.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpServerBean.java
Tue Feb  1 09:49:27 2011
@@ -19,8 +19,8 @@ package org.apache.camel.itest.osgi.ftp;
 import java.net.URL;
 
 import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ftpserver.FtpServer;
 import org.apache.ftpserver.FtpServerFactory;
 import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
@@ -32,7 +32,7 @@ import org.apache.ftpserver.usermanager.
 public final class FtpServerBean {
 
     public static final String FTP_ROOT_DIR = "./res/home/";
-    private static final transient Log LOG = LogFactory.getLog(FtpServerBean.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(FtpServerBean.class);
 
     private static FtpServer ftpServer;
     private static int port;

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletProcessor.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletProcessor.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletProcessor.java
Tue Feb  1 09:49:27 2011
@@ -18,11 +18,11 @@ package org.apache.camel.itest.osgi.serv
 
 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;
 
 public class ServletProcessor implements Processor {
-    private static final transient Log LOG = LogFactory.getLog(ServletProcessor.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(ServletProcessor.class);
 
     public void process(Exchange exchange) throws Exception {
         String request = exchange.getIn().getBody(String.class);

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
Tue Feb  1 09:49:27 2011
@@ -22,8 +22,8 @@ import java.util.Hashtable;
 import javax.servlet.Servlet;
 
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -32,7 +32,7 @@ import org.osgi.service.http.HttpService
 import org.springframework.osgi.context.BundleContextAware;
 
 public final class ServletActivator implements BundleActivator, BundleContextAware {
-    private static final transient Log LOG = LogFactory.getLog(ServletActivator.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(ServletActivator.class);
     private static boolean registerService;
     
     /**

Modified: camel/trunk/tests/camel-itest-spring-2.0/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring-2.0/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-spring-2.0/pom.xml (original)
+++ camel/trunk/tests/camel-itest-spring-2.0/pom.xml Tue Feb  1 09:49:27 2011
@@ -80,12 +80,12 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<scope>test</scope>

Modified: camel/trunk/tests/camel-itest-spring-2.5/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring-2.5/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-spring-2.5/pom.xml (original)
+++ camel/trunk/tests/camel-itest-spring-2.5/pom.xml Tue Feb  1 09:49:27 2011
@@ -81,8 +81,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: camel/trunk/tests/camel-itest-standalone/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-standalone/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-standalone/pom.xml (original)
+++ camel/trunk/tests/camel-itest-standalone/pom.xml Tue Feb  1 09:49:27 2011
@@ -17,7 +17,8 @@
   limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,6 +45,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>test</scope>

Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Tue Feb  1 09:49:27 2011
@@ -172,11 +172,6 @@
         </dependency>
         <dependency>
           <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
           <scope>test</scope>
         </dependency>

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
Tue Feb  1 09:49:27 2011
@@ -25,15 +25,15 @@ import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultAsyncProducer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public class MyAsyncProducer extends DefaultAsyncProducer {
 
-    private static final Log LOG = LogFactory.getLog(MyAsyncProducer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MyAsyncProducer.class);
     private final ExecutorService executor = Executors.newCachedThreadPool();
     private final AtomicInteger counter = new AtomicInteger();
 

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
Tue Feb  1 09:49:27 2011
@@ -23,8 +23,8 @@ import javax.xml.ws.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.test.junit4.CamelSpringTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -33,7 +33,7 @@ import org.springframework.context.suppo
 
 public class CamelFileGreeterOneWayTest extends CamelSpringTestSupport {
     
-    private static final transient Log LOG = LogFactory.getLog(CamelGreeterTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(CamelGreeterTest.class);
     
     private static Endpoint endpoint;
     private static GreeterImpl greeterImpl;

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
Tue Feb  1 09:49:27 2011
@@ -25,8 +25,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.cxf.CxfConstants;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTru
 
 @ContextConfiguration
 public class CamelGreeterTest extends AbstractJUnit4SpringContextTests {
-    private static final transient Log LOG = LogFactory.getLog(CamelGreeterTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(CamelGreeterTest.class);
     
     private static Endpoint endpoint;
     @Autowired

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareRequest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareRequest.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareRequest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareRequest.java
Tue Feb  1 09:49:27 2011
@@ -22,11 +22,11 @@ import java.util.List;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.cxf.CxfConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrepareRequest implements Processor {
-    private static final transient Log LOG = LogFactory.getLog(PrepareRequest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(PrepareRequest.class);
 
     public void process(Exchange exchange) throws Exception {
         List<String> params = new ArrayList<String>();
@@ -37,4 +37,4 @@ public class PrepareRequest implements P
         exchange.getOut().setHeader(CxfConstants.OPERATION_NAME, operation);
     }
 
-}
\ No newline at end of file
+}

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
Tue Feb  1 09:49:27 2011
@@ -26,8 +26,8 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.jndi.JndiContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,7 +37,7 @@ import org.springframework.context.suppo
  * @version $Revision:520964 $
  */
 public class JmsPerformanceTest extends CamelTestSupport {
-    private static final transient Log LOG = LogFactory.getLog(JmsPerformanceTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(JmsPerformanceTest.class);
     protected MyBean myBean = new MyBean();
     protected int messageCount = 1000;
     protected CountDownLatch receivedCountDown = new CountDownLatch(messageCount);
@@ -156,4 +156,4 @@ public class JmsPerformanceTest extends 
             receivedCountDown.countDown();            
         }
     }
-}
\ No newline at end of file
+}

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
Tue Feb  1 09:49:27 2011
@@ -32,14 +32,14 @@ import org.apache.camel.component.mock.M
 import org.apache.camel.model.config.BatchResequencerConfig;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.jndi.JndiContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Before;
 import org.junit.Test;
 
 public class JmsResequencerTest extends CamelTestSupport  {
     
-    private static final transient Log LOG = LogFactory.getLog(JmsResequencerTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(JmsResequencerTest.class);
     private ReusableBean b1 = new ReusableBean("myBean1");
     private ReusableBean b2 = new ReusableBean("myBean2");
     private ReusableBean b3 = new ReusableBean("myBean3");

Modified: camel/trunk/tests/camel-partial-classpath-test/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-partial-classpath-test/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tests/camel-partial-classpath-test/pom.xml (original)
+++ camel/trunk/tests/camel-partial-classpath-test/pom.xml Tue Feb  1 09:49:27 2011
@@ -33,6 +33,7 @@
   <description>Performs integration tests with incomplete classpaths</description>
 
   <dependencies>
+
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -65,8 +66,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -74,5 +75,7 @@
       <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
+
 </project>

Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java
Tue Feb  1 09:49:27 2011
@@ -19,14 +19,14 @@ package ${packageName};
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultConsumer;
 import org.apache.camel.impl.DefaultProducer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The HelloWorld producer.
  */
 public class HelloWorldProducer extends DefaultProducer {
-    private static final transient Log LOG = LogFactory.getLog(HelloWorldProducer.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(HelloWorldProducer.class);
     private HelloWorldEndpoint endpoint;
 
     public HelloWorldProducer(HelloWorldEndpoint endpoint) {

Propchange: camel/trunk/tooling/maven/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb  1 09:49:27 2011
@@ -1 +1,9 @@
+.project
+.checkstyle
+.pmd
+.classpath
 target
+.settings
+eclipse-classes
+*.i??
+classes

Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Tue Feb  1 09:49:27 2011
@@ -49,16 +49,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>1.5.6</version>
@@ -72,12 +62,12 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>2.0.9</version>
+      <version>${maven-plugin-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0.4.1</version>
+      <version>2.0.5</version>
     </dependency>
 
     <!-- add some logging to the classpath -->
@@ -86,8 +76,8 @@
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
     </dependency>
 
   </dependencies>

Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Tue Feb  1 09:49:27 2011
@@ -46,16 +46,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>1.5.6</version>
@@ -69,12 +59,12 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>2.0.9</version>
+      <version>${maven-plugin-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0.4.1</version>
+      <version>2.0.5</version>
     </dependency>
 
     <!-- add some logging to the classpath -->
@@ -83,8 +73,8 @@
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
     </dependency>
 
   </dependencies>

Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original)
+++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Tue Feb  1 09:49:27 2011
@@ -43,17 +43,6 @@
       <artifactId>plexus-utils</artifactId>
       <version>1.5.6</version>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-    
+
   </dependencies>
 </project>

Modified: camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
(original)
+++ camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
Tue Feb  1 09:49:27 2011
@@ -29,7 +29,6 @@ import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 
-import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import org.apache.camel.converter.jaxp.XmlConverter;
@@ -44,8 +43,6 @@ import org.codehaus.plexus.util.cli.Comm
 import org.codehaus.plexus.util.cli.Commandline.Argument;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
-
-
 /**
  * Goal which extracts the content div from the html page and converts to PDF
  * using Prince

Modified: camel/trunk/tooling/maven/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1065963&r1=1065962&r2=1065963&view=diff
==============================================================================
--- camel/trunk/tooling/maven/pom.xml (original)
+++ camel/trunk/tooling/maven/pom.xml Tue Feb  1 09:49:27 2011
@@ -31,6 +31,10 @@
   <description>Camel Maven Plugins</description>
   <packaging>pom</packaging>
 
+  <properties>
+    <maven-plugin-version>2.2.1</maven-plugin-version>
+  </properties>
+
   <modules>
     <module>camel-maven-plugin</module>
     <module>guice-maven-plugin</module>
@@ -38,19 +42,26 @@
   </modules>
 
   <dependencies>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.9</version>
+      <version>${maven-plugin-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>${maven-plugin-version}</version>
     </dependency>
   </dependencies>
 
   <reporting>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.0.9</version>
+        <version>${maven-plugin-version}</version>
       </plugin>
 
       <plugin>



Mime
View raw message