You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/01/31 18:40:29 UTC
svn commit: r1065694 [5/5] - in /camel/trunk/components:
camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/
camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/
camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/ ca...
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java Mon Jan 31 17:40:24 2011
@@ -22,8 +22,8 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -33,7 +33,7 @@ import org.springframework.test.context.
*/
@ContextConfiguration
public class SpringRemotingWithOneWayTest extends AbstractJUnit38SpringContextTests {
- private static final Log LOG = LogFactory.getLog(SpringRemotingWithOneWayTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SpringRemotingWithOneWayTest.class);
@Autowired
protected IAsyncService myService;
@@ -57,4 +57,4 @@ public class SpringRemotingWithOneWayTes
}
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml Mon Jan 31 17:40:24 2011
@@ -38,7 +38,7 @@
<route id="baz">
<from uri="direct:baz"/>
- <log message="Me Got ${body}" loggingLevel="FATAL" logName="cool"/>
+ <log message="Me Got ${body}" loggingLevel="ERROR" logName="cool"/>
<to uri="mock:baz"/>
</route>
Modified: camel/trunk/components/camel-stream/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/pom.xml?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/pom.xml (original)
+++ camel/trunk/components/camel-stream/pom.xml Mon Jan 31 17:40:24 2011
@@ -50,8 +50,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/components/camel-test/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/pom.xml?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-test/pom.xml (original)
+++ camel/trunk/components/camel-test/pom.xml Mon Jan 31 17:40:24 2011
@@ -15,53 +15,54 @@
See the License for the specific language governing permissions and
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>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <artifactId>camel-test</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Test</name>
- <description>Camel Testing Library</description>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.test.*</camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <!-- optional dependencies for running tests -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.7-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-test</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Test</name>
+ <description>Camel Testing Library</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.test.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <!-- optional dependencies for running tests -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>