svn commit: r1308555 - in /camel/branches/camel-2.9.x: ./ parent/ platforms/karaf/features/src/main/resources/ tests/camel-itest-osgi/ tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ tests/camel-itest-osgi/src/test/resources/org/...

[hadrian]

Author: hadrian
Date: Mon Apr  2 20:55:14 2012
New Revision: 1308555

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

........
  r1307702 | hadrian | 2012-03-30 22:40:02 -0400 (Fri, 30 Mar 2012) | 1 line
  
  CAMEL-5020. Add featurs for camel-jsch
........

Added:
    
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/
      - copied from r1307702, 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/
    
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java
      - copied unchanged from r1307702, 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java
    
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jsch/
      - copied from r1307702, 
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jsch/
    
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jsch/CamelContext.xml
      - copied unchanged from r1307702, 
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jsch/CamelContext.xml
Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/parent/pom.xml
    
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
    camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml

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

Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1308555&r1=1308554&r2=1308555&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Mon Apr  2 20:55:14 2012
@@ -500,6 +500,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-jsch</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-jt400</artifactId>
         <version>${project.version}</version>
       </dependency>

Modified: 
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1308555&r1=1308554&r2=1308555&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
 (original)
+++ 
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
 Mon Apr  2 20:55:14 2012
@@ -271,6 +271,11 @@
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-ftp/${project.version}</bundle>
   </feature>
+  <feature name='camel-jsch' version='${project.version}' resolver='(obr)' 
start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-jsch/${project.version}</bundle>
+  </feature>
   <feature name='camel-guice' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>

Modified: camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml?rev=1308555&r1=1308554&r2=1308555&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml Mon Apr  2 
20:55:14 2012
@@ -153,6 +153,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jsch</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-protobuf</artifactId>
       <scope>test</scope>
     </dependency>