You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/04/01 02:54:54 UTC

svn commit: r1307968 - in /camel/branches/camel-2.9.x: ./ components/ components/camel-jsch/ components/camel-jsch/src/ components/camel-jsch/src/main/ components/camel-jsch/src/main/java/ components/camel-jsch/src/main/java/org/ components/camel-jsch/...

Author: hadrian
Date: Sun Apr  1 00:54:53 2012
New Revision: 1307968

URL: http://svn.apache.org/viewvc?rev=1307968&view=rev
Log:
Merged revisions 1292947 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1292947 | hadrian | 2012-02-23 15:48:47 -0500 (Thu, 23 Feb 2012) | 1 line
  
  CAMEL-5020. Add support for the scp protocol
........

Added:
    camel/branches/camel-2.9.x/components/camel-jsch/
      - copied from r1292947, camel/trunk/components/camel-jsch/
    camel/branches/camel-2.9.x/components/camel-jsch/pom.xml
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/pom.xml
    camel/branches/camel-2.9.x/components/camel-jsch/src/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/java/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/JschComponent.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/JschComponent.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpConfiguration.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpConfiguration.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpEndpoint.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpEndpoint.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpFile.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpFile.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProcessStrategyFactory.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProcessStrategyFactory.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProducer.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProducer.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/resources/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/resources/META-INF/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/services/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/resources/META-INF/services/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/services/org/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/resources/META-INF/services/org/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/services/org/apache/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/resources/META-INF/services/org/apache/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/services/org/apache/camel/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/resources/META-INF/services/org/apache/camel/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/services/org/apache/camel/component/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/main/resources/META-INF/services/org/apache/camel/component/
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/META-INF/services/org/apache/camel/component/scp
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/resources/META-INF/services/org/apache/camel/component/scp
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/resources/log4j.properties
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/main/resources/log4j.properties
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/java/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/java/org/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/java/org/apache/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/resources/
      - copied from r1292947, camel/trunk/components/camel-jsch/src/test/resources/
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/resources/client.jks
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/test/resources/client.jks
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/resources/hostkey.pem
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/test/resources/hostkey.pem
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/resources/log4j.properties
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/test/resources/log4j.properties
    camel/branches/camel-2.9.x/components/camel-jsch/src/test/resources/server.jks
      - copied unchanged from r1292947, camel/trunk/components/camel-jsch/src/test/resources/server.jks
Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/pom.xml

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/pom.xml?rev=1307968&r1=1307967&r2=1307968&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/pom.xml Sun Apr  1 00:54:53 2012
@@ -93,6 +93,7 @@
     <module>camel-jmx</module>
     <module>camel-josql</module>
     <module>camel-jpa</module>
+    <module>camel-jsch</module>
     <module>camel-jt400</module>
     <module>camel-juel</module>
     <module>camel-jxpath</module>