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/02/01 08:41:10 UTC
svn commit: r1065931 [5/6] - in /camel/trunk/components: camel-amqp/
camel-atom/ camel-atom/src/main/java/org/apache/camel/component/atom/
camel-atom/src/test/java/org/apache/camel/component/atom/
camel-aws/src/main/java/org/apache/camel/component/aws/...
Modified: camel/trunk/components/camel-soap/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Tue Feb 1 07:41:02 2011
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- 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.
- -->
-<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">
+<!--
+ 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.
+-->
+<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>
@@ -33,7 +34,8 @@
<properties>
<camel.osgi.import.before.defaults>javax.xml.ws;version="[0.0,3)"</camel.osgi.import.before.defaults>
- <camel.osgi.export.pkg>org.apache.camel.dataformat.soap.*, org.xmlsoap.schemas.soap.envelope.*</camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>org.apache.camel.dataformat.soap.*, org.xmlsoap.schemas.soap.envelope.*
+ </camel.osgi.export.pkg>
</properties>
<dependencies>
@@ -42,18 +44,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jaxb</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
@@ -62,8 +58,8 @@
<artifactId>jaxb-impl</artifactId>
</dependency>
- <!-- JAXWS api jars -->
- <dependency>
+ <!-- JAXWS api jars -->
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<version>1.1.2</version>
@@ -102,8 +98,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>
@@ -123,9 +119,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -180,13 +176,19 @@
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<wsdlOptions>
<wsdlOption>
- <wsdl>${basedir}/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl</wsdl>
+ <wsdl>
+ ${basedir}/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
+ </wsdl>
<bindingFiles>
- <bindingFile>${basedir}/src/test/resources/org/apache/camel/dataformat/soap/binding.xml</bindingFile>
+ <bindingFile>
+ ${basedir}/src/test/resources/org/apache/camel/dataformat/soap/binding.xml
+ </bindingFile>
</bindingFiles>
</wsdlOption>
<wsdlOption>
- <wsdl>${basedir}/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl</wsdl>
+ <wsdl>
+ ${basedir}/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
+ </wsdl>
</wsdlOption>
</wsdlOptions>
</configuration>
Modified: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java (original)
+++ camel/trunk/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java Tue Feb 1 07:41:02 2011
@@ -26,12 +26,12 @@ import com.example.customerservice.GetCu
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class ServiceInterfaceStrategyTest {
- private static final Log LOG = LogFactory.getLog(ServiceInterfaceStrategyTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServiceInterfaceStrategyTest.class);
@Test
public void testServiceInterfaceStrategyWithClient() {
Modified: camel/trunk/components/camel-soap/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-soap/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -18,12 +18,10 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=DEBUG, file
+log4j.rootLogger=INFO, file
# uncomment this to turn on debug of camel
-log4j.logger.org.apache.camel=DEBUG
-
-log4j.logger.org.apache.activemq.spring=WARN
+#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -34,5 +32,5 @@ log4j.appender.stdout.layout.ConversionP
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-jaxb-test.log
+log4j.appender.file.file=target/camel-soap-test.log
log4j.appender.file.append=true
Modified: camel/trunk/components/camel-spring-integration/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ camel/trunk/components/camel-spring-integration/pom.xml Tue Feb 1 07:41:02 2011
@@ -15,128 +15,133 @@
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>
- <artifactId>components</artifactId>
- <groupId>org.apache.camel</groupId>
- <version>2.7-SNAPSHOT</version>
- </parent>
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.7-SNAPSHOT</version>
+ </parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-integration</artifactId>
- <name>Camel :: Spring Integration</name>
- <description>Camel Spring Integration support</description>
- <packaging>bundle</packaging>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
- <camel.osgi.import.before.defaults>org.springframework.integration.*;version="[1,2)"</camel.osgi.import.before.defaults>
- </properties>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>./src/main/resources/schema/camel-spring-integration.xsd</file>
- <type>xsd</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <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>org.springframework.integration</groupId>
- <artifactId>spring-integration-core</artifactId>
- <version>${spring-integration-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.transaction</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-integration</artifactId>
+ <name>Camel :: Spring Integration</name>
+ <description>Camel Spring Integration support</description>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
+ <camel.osgi.import.before.defaults>org.springframework.integration.*;version="[1,2)"
+ </camel.osgi.import.before.defaults>
+ </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>org.springframework.integration</groupId>
+ <artifactId>spring-integration-core</artifactId>
+ <version>${spring-integration-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.transaction</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <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>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>./src/main/resources/schema/camel-spring-integration.xsd</file>
+ <type>xsd</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java Tue Feb 1 07:41:02 2011
@@ -23,8 +23,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.spring.integration.SpringIntegrationBinding;
-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.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.channel.DirectChannel;
@@ -40,7 +40,7 @@ import org.springframework.integration.m
* @version $Revision$
*/
public class CamelSourceAdapter extends AbstractCamelAdapter implements InitializingBean, DisposableBean {
- private static final Log LOG = LogFactory.getLog(CamelSourceAdapter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAdapter.class);
private Consumer consumer;
private Endpoint camelEndpoint;
Modified: camel/trunk/components/camel-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/pom.xml (original)
+++ camel/trunk/components/camel-spring-javaconfig/pom.xml Tue Feb 1 07:41:02 2011
@@ -99,6 +99,8 @@
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<version>2.1_3_6</version>
</dependency>
+
+ <!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -116,8 +118,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>
@@ -127,17 +129,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- TODO FixMe -->
- <!--<exclude>**/FilterTest.*</exclude>-->
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java (original)
+++ camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java Tue Feb 1 07:41:02 2011
@@ -20,8 +20,8 @@ package org.apache.camel.spring.javaconf
import java.util.ArrayList;
import java.util.Arrays;
-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.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -57,7 +57,7 @@ import org.springframework.test.context.
*/
public class JavaConfigContextLoader implements ContextLoader {
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = LoggerFactory.getLogger(getClass());
/**
* Simply returns the supplied <var>locations</var> unchanged.
Modified: camel/trunk/components/camel-spring-javaconfig/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-spring-javaconfig/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -20,7 +20,6 @@
#
log4j.rootLogger=INFO, file
-log4j.logger.org.springframework=WARN
#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
@@ -33,4 +32,4 @@ log4j.appender.out.layout.ConversionPatt
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
-log4j.appender.file.file=target/camel-spring-test.log
+log4j.appender.file.file=target/camel-spring-javaconfig-test.log
Modified: camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java (original)
+++ camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java Tue Feb 1 07:41:02 2011
@@ -29,8 +29,8 @@ import org.apache.camel.model.ProcessorD
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.spi.AuthorizationPolicy;
import org.apache.camel.spi.RouteContext;
-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.InitializingBean;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
@@ -47,7 +47,7 @@ import org.springframework.security.core
import org.springframework.util.Assert;
public class SpringSecurityAuthorizationPolicy extends IdentifiedType implements AuthorizationPolicy, InitializingBean, ApplicationEventPublisherAware {
- private static final transient Log LOG = LogFactory.getLog(SpringSecurityAuthorizationPolicy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SpringSecurityAuthorizationPolicy.class);
private AccessDecisionManager accessDecisionManager;
private AuthenticationManager authenticationManager;
private AuthenticationAdapter authenticationAdapter;
Modified: camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java (original)
+++ camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java Tue Feb 1 07:41:02 2011
@@ -32,8 +32,8 @@ import org.apache.camel.converter.jaxp.X
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.ws.WebServiceMessageFactory;
import org.springframework.ws.client.core.WebServiceTemplate;
import org.springframework.ws.transport.WebServiceMessageSender;
@@ -44,7 +44,7 @@ import org.springframework.xml.xpath.XPa
* Apache Camel component for working with Spring Web Services (a.k.a Spring-WS).
*/
public class SpringWebserviceComponent extends DefaultComponent {
- private static final Log LOG = LogFactory.getLog(SpringWebserviceComponent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SpringWebserviceComponent.class);
public SpringWebserviceComponent() {
super();
Modified: camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java (original)
+++ camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java Tue Feb 1 07:41:02 2011
@@ -24,15 +24,15 @@ import org.w3c.dom.Document;
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;
/**
* Generates static response on StockQuote webservice requests
*/
public class StockQuoteResponseProcessor implements Processor {
- private static final Log LOG = LogFactory.getLog(StockQuoteResponseProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StockQuoteResponseProcessor.class);
public void process(Exchange exchange) throws Exception {
LOG.info("Crafting standard response in StockQuoteResponseProcessor");
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java Tue Feb 1 07:41:02 2011
@@ -37,15 +37,15 @@ import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.impl.DefaultMessage;
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;
/**
* Consumer that can read from streams
*/
public class StreamConsumer extends DefaultConsumer implements Runnable {
- private static final transient Log LOG = LogFactory.getLog(StreamConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(StreamConsumer.class);
private static final String TYPES = "in,file,url";
private static final String INVALID_URI = "Invalid uri, valid form: 'stream:{" + TYPES + "}'";
private static final List<String> TYPES_LIST = Arrays.asList(TYPES.split(","));
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java Tue Feb 1 07:41:02 2011
@@ -23,11 +23,11 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class StreamEndpoint extends DefaultEndpoint {
- private static final transient Log LOG = LogFactory.getLog(StreamEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(StreamEndpoint.class);
private String fileName;
private boolean scanStream;
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java Tue Feb 1 07:41:02 2011
@@ -33,15 +33,15 @@ import org.apache.camel.CamelExchangeExc
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
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;
/**
* Producer that can write to streams
*/
public class StreamProducer extends DefaultProducer {
- private static final transient Log LOG = LogFactory.getLog(StreamProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(StreamProducer.class);
private static final String TYPES = "out,err,file,header,url";
private static final String INVALID_URI = "Invalid uri, valid form: 'stream:{" + TYPES + "}'";
private static final List<String> TYPES_LIST = Arrays.asList(TYPES.split(","));
Modified: camel/trunk/components/camel-stringtemplate/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/pom.xml (original)
+++ camel/trunk/components/camel-stringtemplate/pom.xml Tue Feb 1 07:41:02 2011
@@ -57,10 +57,9 @@
<artifactId>camel-test</artifactId>
<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-stringtemplate/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-stringtemplate/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -20,8 +20,7 @@
#
log4j.rootLogger=INFO, out
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.camel.component.stringtemplate=DEBUG
+#log4j.logger.org.apache.camel.component.stringtemplate=DEBUG
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -32,5 +31,5 @@ log4j.appender.stdout.layout.ConversionP
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-test.log
+log4j.appender.out.file=target/camel-stringtemplate-test.log
log4j.appender.out.append=true
Modified: camel/trunk/components/camel-syslog/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-syslog/pom.xml (original)
+++ camel/trunk/components/camel-syslog/pom.xml Tue Feb 1 07:41:02 2011
@@ -35,6 +35,7 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
@@ -43,17 +44,6 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
@@ -64,12 +54,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-mina</artifactId>
<scope>test</scope>
</dependency>
@@ -89,11 +73,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java (original)
+++ camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java Tue Feb 1 07:41:02 2011
@@ -27,12 +27,12 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.Converter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class Rfc3164SyslogConverter {
- private static final transient Log LOG = LogFactory.getLog(Rfc3164SyslogConverter.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(Rfc3164SyslogConverter.class);
private static enum MONTHS {
jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec
Modified: camel/trunk/components/camel-syslog/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-syslog/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-syslog/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -20,6 +20,9 @@
#
log4j.rootLogger=INFO, file
+# debug loging for Camel
+#log4j.logger.org.apache.camel.component.syslog=DEBUG
+
# CONSOLE appender not used by default
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
@@ -31,5 +34,3 @@ log4j.appender.file.layout=org.apache.lo
log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
log4j.appender.file.file=target/camel-syslog-test.log
-# debug loging for Camel
-log4j.logger.org.apache.camel.component.syslog=DEBUG
Modified: camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java (original)
+++ camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java Tue Feb 1 07:41:02 2011
@@ -37,8 +37,8 @@ import org.apache.camel.CamelException;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
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.ccil.cowan.tagsoup.HTMLSchema;
import org.ccil.cowan.tagsoup.Parser;
import org.ccil.cowan.tagsoup.Schema;
@@ -56,7 +56,7 @@ public class TidyMarkupDataFormat implem
/*
* Our Logger
*/
- private static final transient Log LOG = LogFactory.getLog(TidyMarkupDataFormat.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TidyMarkupDataFormat.class);
private static final String NO = "no";
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java Tue Feb 1 07:41:02 2011
@@ -40,8 +40,8 @@ import org.apache.camel.impl.DefaultExch
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.PredicateAssertHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A bunch of useful testing methods
@@ -49,8 +49,8 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class TestSupport extends TestCase {
- private static final Log LOG = LogFactory.getLog(TestSupport.class);
- protected transient Log log = LogFactory.getLog(getClass());
+ private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
+ protected transient Logger log = LoggerFactory.getLogger(getClass());
/**
* Runs the bare test sequence only if this platform is supported
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java Tue Feb 1 07:41:02 2011
@@ -39,8 +39,8 @@ import org.apache.camel.impl.DefaultExch
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.PredicateAssertHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
/**
@@ -49,8 +49,8 @@ import org.junit.Assert;
* @version $Revision$
*/
public abstract class TestSupport extends Assert {
- private static final Log LOG = LogFactory.getLog(TestSupport.class);
- protected transient Log log = LogFactory.getLog(getClass());
+ private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
+ protected transient Logger log = LoggerFactory.getLogger(getClass());
// Builder methods for expressions used when testing
// -------------------------------------------------------------------------
Modified: camel/trunk/components/camel-velocity/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-velocity/pom.xml (original)
+++ camel/trunk/components/camel-velocity/pom.xml Tue Feb 1 07:41:02 2011
@@ -15,62 +15,64 @@
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-velocity</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Velocity</name>
- <description>Camel Velocity support</description>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.velocity.*</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>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>${velocity-version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.7-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-velocity</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Velocity</name>
+ <description>Camel Velocity support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.velocity.*</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>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${velocity-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: camel/trunk/components/camel-velocity/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-velocity/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-velocity/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -20,8 +20,7 @@
#
log4j.rootLogger=INFO, out
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.camel.component.velocity=DEBUG
+#log4j.logger.org.apache.camel.component.velocity=DEBUG
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Tue Feb 1 07:41:02 2011
@@ -83,10 +83,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
@@ -146,62 +142,29 @@
<version>${logback-version}</version>
</dependency>
-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+
+ <!-- log4j needed by mvn jetty:run -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
-
- <!-- log4j needed by mvn jetty:run -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
<!-- testing web framework -->
- <!--
- <dependency> <groupId>com.google</groupId>
- <artifactId>jetty</artifactId>
- <version>${webdriver-version}</version> <scope>test</scope>
- </dependency>
- -->
- <!--
- <dependency> <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId> <version>2.4</version>
- </dependency> <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit-core-js</artifactId> <version>2.4</version>
- </dependency>
- -->
<dependency>
- <!--
- <groupId>org.openqa.selenium.webdriver</groupId>
- -->
<groupId>org.seleniumhq.webdriver</groupId>
<artifactId>webdriver-htmlunit</artifactId>
<version>${webdriver-version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <!--
- <groupId>org.openqa.selenium.webdriver</groupId>
- -->
<groupId>org.seleniumhq.webdriver</groupId>
<artifactId>webdriver-support</artifactId>
<version>${webdriver-version}</version>
<scope>test</scope>
- <!--
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- </exclusion>
- </exclusions>
- -->
</dependency>
<!-- testing web container -->
@@ -644,15 +607,15 @@
javax.xml.bind.util;resolution:=optional,
javax.xml.namespace;resolution:=optional,
javax.xml.parsers;resolution:=optional,
- org.apache.camel;version="[2.5, 3.0)",
- org.apache.camel.builder;version="[2.5, 3.0)",
- org.apache.camel.impl;version="[2.5, 3.0)",
- org.apache.camel.impl.converter;version="[2.5, 3.0)",
- org.apache.camel.model;version="[2.5, 3.0)",
- org.apache.camel.spi;version="[2.5, 3.0)",
- org.apache.camel.spring;version="[2.5, 3.0)",
- org.apache.camel.osgi;version="[2.5, 3.0)",
- org.apache.camel.util;version="[2.5, 3.0)",
+ org.apache.camel;version="[2.6, 3.0)",
+ org.apache.camel.builder;version="[2.6, 3.0)",
+ org.apache.camel.impl;version="[2.6, 3.0)",
+ org.apache.camel.impl.converter;version="[2.6, 3.0)",
+ org.apache.camel.model;version="[2.6, 3.0)",
+ org.apache.camel.spi;version="[2.6, 3.0)",
+ org.apache.camel.spring;version="[2.6, 3.0)",
+ org.apache.camel.osgi;version="[2.6, 3.0)",
+ org.apache.camel.util;version="[2.6, 3.0)",
org.apache.camel.web.resources;resolution:=optional,
org.apache.commons.logging;resolution:=optional,
org.osgi.service.http;version="[1.0.0,2.0.0)",
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A useful base class for any sub resource of the root {@link org.apache.camel.web.resources.CamelContextResource}
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
*/
@ImplicitProduces(Constants.HTML_MIME_TYPES)
public class CamelChildResourceSupport {
- private static final transient Log LOG = LogFactory.getLog(CamelChildResourceSupport.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CamelChildResourceSupport.class);
private final CamelContext camelContext;
private final ProducerTemplate template;
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java Tue Feb 1 07:41:02 2011
@@ -36,8 +36,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.spi.HasId;
import org.apache.camel.web.model.EndpointLink;
import org.apache.camel.web.model.Endpoints;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The active endpoints in Camel
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class EndpointsResource extends CamelChildResourceSupport {
- private static final transient Log LOG = LogFactory.getLog(EndpointsResource.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(EndpointsResource.class);
private String error = "";
private String newUri = "mock:someName";
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java Tue Feb 1 07:41:02 2011
@@ -48,8 +48,8 @@ import org.apache.camel.impl.DefaultCame
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.RouteDotGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A single Camel Route which is used to implement one or more
@@ -59,7 +59,7 @@ import org.apache.commons.logging.LogFac
*/
public class RouteResource extends CamelChildResourceSupport {
public static final String LANGUAGE_XML = "Xml";
- private static final transient Log LOG = LogFactory.getLog(RouteResource.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteResource.class);
private RouteDefinition route;
private String error = "";
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java Tue Feb 1 07:41:02 2011
@@ -47,8 +47,8 @@ import org.apache.camel.model.RoutesDefi
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.RouteDotGenerator;
import org.apache.camel.web.model.Route;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The active routes in Camel which are used to implement one or more <a
@@ -58,7 +58,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class RoutesResource extends CamelChildResourceSupport {
- private static final transient Log LOG = LogFactory.getLog(RoutesResource.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RoutesResource.class);
private String error = "";
public RoutesResource(CamelContextResource contextResource) {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JMXRouteStatistics.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JMXRouteStatistics.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JMXRouteStatistics.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JMXRouteStatistics.java Tue Feb 1 07:41:02 2011
@@ -26,8 +26,8 @@ import javax.management.ObjectName;
import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedManagementStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Gathers {@link RouteStatistics} from JMX.
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
*/
public class JMXRouteStatistics implements RouteStatistics {
- private static final Log LOG = LogFactory.getLog(JMXRouteStatistics.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JMXRouteStatistics.class);
@SuppressWarnings("unchecked")
public Object getRouteStatistic(CamelContext camelContext, String routeID, String attribute) {
Modified: camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml (original)
+++ camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml Tue Feb 1 07:41:02 2011
@@ -100,7 +100,7 @@
.footer_l
.footer_r
%div
- Copyright 2005-2009 The Apache Software Foundation.
+ Copyright 2005-2011 The Apache Software Foundation.
(
%a{:href => "?printable=true"}> printable version
)
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java Tue Feb 1 07:41:02 2011
@@ -20,8 +20,8 @@ import java.util.List;
import org.apache.camel.web.htmlunit.pages.EndpointsPage;
import org.apache.camel.web.htmlunit.pages.SendMessagePage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.openqa.selenium.WebElement;
import static org.hamcrest.Matchers.containsString;
@@ -37,7 +37,7 @@ import static org.openqa.selenium.lift.M
* @version $Revision$
*/
public class CreateEndpointTest extends HtmlTestSupport {
- private static final transient Log LOG = LogFactory.getLog(CreateEndpointTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CreateEndpointTest.class);
protected String newEndpointUri = "mock:myNewlyCreatedEndpoint";
protected String messageBody = "hello world!";
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import com.sun.jersey.api.client.WebReso
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import org.apache.camel.web.Main;
-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.Assert;
import org.junit.Before;
@@ -31,7 +31,7 @@ import org.junit.Before;
* @version $Revision$
*/
public class TestSupport extends Assert {
- private static final transient Log LOG = LogFactory.getLog(TestSupport.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TestSupport.class);
protected ClientConfig clientConfig;
protected Client client;
Modified: camel/trunk/components/camel-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlbeans/pom.xml (original)
+++ camel/trunk/components/camel-xmlbeans/pom.xml Tue Feb 1 07:41:02 2011
@@ -67,8 +67,8 @@
</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-xmlsecurity/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlsecurity/pom.xml (original)
+++ camel/trunk/components/camel-xmlsecurity/pom.xml Tue Feb 1 07:41:02 2011
@@ -15,95 +15,83 @@
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>components</artifactId>
+ <version>2.7-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-xmlsecurity</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: XML Security</name>
+ <description>Camel Partial XML Encryption/Decryption support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.dataformat.xmlsecurity.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>${xmlsec-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalan-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- to allow Spring annotations (jmx) to be tested -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <optional>true</optional>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.7-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-xmlsecurity</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: XML Security</name>
- <description>Camel Partial XML Encryption/Decryption support</description>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.dataformat.xmlsecurity.*</camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec-version}</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces-version}</version>
- </dependency>
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- to allow Spring annotations (jmx) to be tested -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <excludes>
- <exclude>**/FooTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java (original)
+++ camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java Tue Feb 1 07:41:02 2011
@@ -64,7 +64,7 @@ public class XMLSecurityDataFormatTest e
exchange.setProperty(Exchange.CHARSET_NAME, "UTF-8");
Message in = exchange.getIn();
in.setBody(XML_FRAGMENT);
- System.out.println("xmlFragment: " + XML_FRAGMENT);
+ log.info("xmlFragment: " + XML_FRAGMENT);
}
});
@@ -75,7 +75,6 @@ public class XMLSecurityDataFormatTest e
*/
@Test
public void testFullPayloadXMLEncryption() throws Exception {
- System.out.println("\n***--------- Test: testFullPayloadXMLEncryption ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML().process(new EncryptedXMLMessageProcessor());
@@ -88,7 +87,6 @@ public class XMLSecurityDataFormatTest e
@Test
public void testPartialPayloadXMLContentEncryption() throws Exception {
- System.out.println("\n***--------- Test: testPartialPayloadXMLContentEncryption ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("//cheesesites/italy/cheese", true).process(new EncryptedXMLMessageProcessor());
@@ -101,7 +99,6 @@ public class XMLSecurityDataFormatTest e
@Test
public void testPartialPayloadMultiNodeXMLContentEncryption() throws Exception {
- System.out.println("\n***--------- Test: testPartialPayloadMultiNodeXMLContentEncryption ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("//cheesesites/*/cheese", true).process(new EncryptedXMLMessageProcessor());
@@ -114,7 +111,6 @@ public class XMLSecurityDataFormatTest e
@Test
public void testPartialPayloadXMLElementEncryptionWithKey() throws Exception {
- System.out.println("\n***--------- Test: testPartialPayloadXMLElementEncryptionWithKey ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("//cheesesites/france/cheese", false, "Just another 24 Byte key").process(new EncryptedXMLMessageProcessor());
@@ -134,7 +130,6 @@ public class XMLSecurityDataFormatTest e
(byte) 0x14, (byte) 0x15, (byte) 0x16, (byte) 0x17};
final String passCode = new String(bits128);
- System.out.println("\n***--------- Test: testPartialPayloadXMLElementEncryptionWithKeyAndAlgorithm ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("//cheesesites/netherlands", false, passCode, XMLCipher.AES_128).process(new EncryptedXMLMessageProcessor());
@@ -150,7 +145,6 @@ public class XMLSecurityDataFormatTest e
*/
@Test
public void testFullPayloadXMLDecryption() throws Exception {
- System.out.println("\n***--------- Test: testFullPayloadXMLDecryption ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML().unmarshal().secureXML().process(new DecryptedXMLMessageProcessor());
@@ -163,7 +157,6 @@ public class XMLSecurityDataFormatTest e
@Test
public void testPartialPayloadXMLContentDecryption() throws Exception {
- System.out.println("\n***--------- Test: testPartialPayloadXMLContentDecryption ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("//cheesesites/italy/cheese", true).
@@ -177,7 +170,6 @@ public class XMLSecurityDataFormatTest e
@Test
public void testPartialPayloadMultiNodeXMLContentDecryption() throws Exception {
- System.out.println("\n***--------- Test: testPartialPayloadMultiNodeXMLContentDecryption ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("//cheesesites/*/cheese", true).
@@ -191,7 +183,6 @@ public class XMLSecurityDataFormatTest e
@Test
public void testPartialPayloadXMLElementDecryptionWithKey() throws Exception {
- System.out.println("\n***--------- Test: testPartialPayloadXMLElementDecryptionWithKey ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("//cheesesites/france/cheese", false, "Just another 24 Byte key").
@@ -211,7 +202,6 @@ public class XMLSecurityDataFormatTest e
(byte) 0x10, (byte) 0x11, (byte) 0x12, (byte) 0x13,
(byte) 0x14, (byte) 0x15, (byte) 0x16, (byte) 0x17};
final String passCode = new String(bits128);
- System.out.println("\n***--------- Test: testPartialPayloadXMLContentDecryptionWithKeyAndAlgorithm ----------***\n");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start").marshal().secureXML("cheese", true, passCode, XMLCipher.AES_128).
@@ -234,7 +224,6 @@ public class XMLSecurityDataFormatTest e
// write to a string
XmlConverter converter = new XmlConverter();
String xmlStr = converter.toString(d, exchange);
- System.out.println("\n\nIn EncryptedXMLMessageProcessor:" + xmlStr);
NodeList nodeList = d.getElementsByTagNameNS("http://www.w3.org/2001/04/xmlenc#", "EncryptedData");
if (nodeList.getLength() >= 0) {
@@ -255,8 +244,6 @@ public class XMLSecurityDataFormatTest e
// write to a string
XmlConverter converter = new XmlConverter();
String xmlStr = converter.toString(d, exchange);
-
- System.out.println("\n\nIn DecryptedXMLMessageProcessor:" + xmlStr);
NodeList nodeList = d.getElementsByTagNameNS("http://www.w3.org/2001/04/xmlenc#", "EncryptedData");
if (nodeList.getLength() == 0) {
Modified: camel/trunk/components/camel-xmlsecurity/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlsecurity/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-xmlsecurity/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -29,5 +29,5 @@ log4j.appender.console.layout.Conversion
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
-log4j.appender.file.file=target/camel-xmlsecurity.log
+log4j.appender.file.file=target/camel-xmlsecurity-test.log
Modified: camel/trunk/components/camel-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/pom.xml (original)
+++ camel/trunk/components/camel-xmpp/pom.xml Tue Feb 1 07:41:02 2011
@@ -57,11 +57,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack</artifactId>
<version>${smack-version}</version>
@@ -91,6 +86,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/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java Tue Feb 1 07:41:02 2011
@@ -25,8 +25,8 @@ import org.apache.camel.impl.DefaultHead
import org.apache.camel.spi.HeaderFilterStrategy;
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.jivesoftware.smack.packet.Message;
@@ -38,7 +38,7 @@ import org.jivesoftware.smack.packet.Mes
*/
public class XmppBinding {
- private static final transient Log LOG = LogFactory.getLog(XmppBinding.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XmppBinding.class);
private HeaderFilterStrategy headerFilterStrategy;
public XmppBinding() {
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java Tue Feb 1 07:41:02 2011
@@ -22,14 +22,14 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision:520964 $
*/
public class XmppComponent extends DefaultComponent {
- private static final transient Log LOG = LogFactory.getLog(XmppComponent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XmppComponent.class);
//keep a cache of endpoints so they can be properly cleaned up
Map<String, XmppEndpoint> endpointCache = new HashMap<String, XmppEndpoint>();
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java Tue Feb 1 07:41:02 2011
@@ -19,8 +19,8 @@ package org.apache.camel.component.xmpp;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jivesoftware.smack.Chat;
import org.jivesoftware.smack.ChatManager;
import org.jivesoftware.smack.ChatManagerListener;
@@ -43,7 +43,7 @@ import org.jivesoftware.smackx.muc.Multi
* @version $Revision$
*/
public class XmppConsumer extends DefaultConsumer implements PacketListener, MessageListener, ChatManagerListener {
- private static final transient Log LOG = LogFactory.getLog(XmppConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XmppConsumer.class);
private final XmppEndpoint endpoint;
private MultiUserChat muc;
private Chat privateChat;
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Tue Feb 1 07:41:02 2011
@@ -29,8 +29,8 @@ import org.apache.camel.impl.DefaultHead
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
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.jivesoftware.smack.AccountManager;
import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.XMPPConnection;
@@ -46,7 +46,7 @@ import org.jivesoftware.smackx.muc.Multi
* @version $Revision:520964 $
*/
public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
- private static final transient Log LOG = LogFactory.getLog(XmppEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XmppEndpoint.class);
private HeaderFilterStrategy headerFilterStrategy = new DefaultHeaderFilterStrategy();
private XmppBinding binding;
private String host;
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java Tue Feb 1 07:41:02 2011
@@ -19,8 +19,8 @@ package org.apache.camel.component.xmpp;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeExchangeException;
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;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
@@ -32,7 +32,7 @@ import org.jivesoftware.smackx.muc.Multi
* @version $Revision$
*/
public class XmppGroupChatProducer extends DefaultProducer {
- private static final transient Log LOG = LogFactory.getLog(XmppGroupChatProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XmppGroupChatProducer.class);
private final XmppEndpoint endpoint;
private XMPPConnection connection;
private MultiUserChat chat;
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java Tue Feb 1 07:41:02 2011
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.xmpp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.packet.Packet;
public class XmppLogger implements PacketListener {
- private static final transient Log LOG = LogFactory.getLog(XmppLogger.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XmppLogger.class);
private String direction;
public XmppLogger(String direction) {