You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/06/11 20:27:31 UTC
svn commit: r546213 - in /activemq/camel/trunk: ./ components/
components/camel-ftp/ components/camel-ftp/src/
components/camel-ftp/src/test/ components/camel-ftp/src/test/java/
components/camel-ftp/src/test/java/org/ components/camel-ftp/src/test/reso...
Author: jstrachan
Date: Mon Jun 11 11:27:30 2007
New Revision: 546213
URL: http://svn.apache.org/viewvc?view=rev&rev=546213
Log:
applied Noah's patch for CAMEL-13 with many thanks! I added an extra test case for FTP using Apache FtpServer; other than that, great work Noah! More more! :)
Added:
activemq/camel/trunk/components/camel-ftp/
activemq/camel/trunk/components/camel-ftp/pom.xml (with props)
activemq/camel/trunk/components/camel-ftp/src/
activemq/camel/trunk/components/camel-ftp/src/test/
activemq/camel/trunk/components/camel-ftp/src/test/java/
activemq/camel/trunk/components/camel-ftp/src/test/java/org/
activemq/camel/trunk/components/camel-ftp/src/test/resources/
activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties
- copied, changed from r545097, activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties
Modified:
activemq/camel/trunk/components/pom.xml
activemq/camel/trunk/pom.xml
Added: activemq/camel/trunk/components/camel-ftp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/pom.xml?view=auto&rev=546213
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/pom.xml (added)
+++ activemq/camel/trunk/components/camel-ftp/pom.xml Mon Jun 11 11:27:30 2007
@@ -0,0 +1,107 @@
+<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-ftp</artifactId>
+ <name>Camel :: FTP</name>
+ <description>Camel FTP support</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jsch</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.29</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ <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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>ftp.enable</name>
+ <value>${ftp.enable}</value>
+ </property>
+ <property>
+ <name>ftp.server</name>
+ <value>${ftp.url}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-ftp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties (from r545097, activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties?view=diff&rev=546213&p1=activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties&r1=545097&p2=activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties&r2=546213
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties (original)
+++ activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties Mon Jun 11 11:27:30 2007
@@ -18,9 +18,12 @@
#
# The logging properties used for eclipse testing, We want to see debug output on the console.
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=DEBUG, out
+#log4j.rootLogger=INFO, out
log4j.logger.org.apache.activemq=WARN
+log4j.logger.org.apache.mina=WARN
+log4j.logger.org.apache.ftpserver=WARN
#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?view=diff&rev=546213&r1=546212&r2=546213
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Mon Jun 11 11:27:30 2007
@@ -37,6 +37,7 @@
<module>camel-activemq</module>
<module>camel-bam</module>
<module>camel-cxf</module>
+ <module>camel-ftp</module>
<module>camel-http</module>
<module>camel-jaxb</module>
<module>camel-jbi</module>
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=546213&r1=546212&r2=546213
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Mon Jun 11 11:27:30 2007
@@ -37,6 +37,7 @@
<camel-version>1.0-SNAPSHOT</camel-version>
<compiler.fork>false</compiler.fork>
<m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
+ <slf4j-version>1.3.0</slf4j-version>
</properties>
<url>http://apache.apache.org/camel/</url>
@@ -385,9 +386,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.2</version>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
-
<!-- optional jetty support -->
<dependency>
@@ -462,7 +472,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -543,23 +553,23 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-one-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>install-maven-one-repository</goal>
- <goal>deploy-maven-one-repository</goal>
- </goals>
- <configuration>
- <remoteRepositoryId>apache.m1.releases</remoteRepositoryId>
- <remoteRepositoryUrl>${m1-dist-repo-url}</remoteRepositoryUrl>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-one-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ <goal>deploy-maven-one-repository</goal>
+ </goals>
+ <configuration>
+ <remoteRepositoryId>apache.m1.releases</remoteRepositoryId>
+ <remoteRepositoryUrl>${m1-dist-repo-url}</remoteRepositoryUrl>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -625,4 +635,49 @@
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots/>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots/>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
</project>