svn commit: r1477920 - in /camel/trunk: apache-camel/ apache-camel/src/main/descriptors/ parent/ platforms/karaf/features/src/main/resources/ tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/

[davsclaus]

Author: davsclaus
Date: Wed May  1 07:31:12 2013
New Revision: 1477920

URL: http://svn.apache.org/r1477920
Log:
CAMEL-6327: Added camel-netty-http to distro

Added:
    
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
      - copied, changed from r1477915, 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1477920&r1=1477919&r2=1477920&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Wed May  1 07:31:12 2013
@@ -376,6 +376,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-netty-http</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-ognl</artifactId>
     </dependency>
     <dependency>

Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1477920&r1=1477919&r2=1477920&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Wed May  1 
07:31:12 2013
@@ -106,6 +106,7 @@
         <include>org.apache.camel:camel-mybatis</include>
         <include>org.apache.camel:camel-nagios</include>
         <include>org.apache.camel:camel-netty</include>
+        <include>org.apache.camel:camel-netty-http</include>
         <include>org.apache.camel:camel-ognl</include>
         <include>org.apache.camel:camel-paxlogging</include>
         <include>org.apache.camel:camel-printer</include>

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1477920&r1=1477919&r2=1477920&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed May  1 07:31:12 2013
@@ -889,6 +889,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-netty-http</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-ognl</artifactId>
         <version>${project.version}</version>
       </dependency>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1477920&r1=1477919&r2=1477920&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed 
May  1 07:31:12 2013
@@ -661,6 +661,10 @@
     <bundle 
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-netty/${project.version}</bundle>
   </feature>
+  <feature name='camel-netty-http' version='${project.version}' 
resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-netty</feature>
+    <bundle>mvn:org.apache.camel/camel-netty-http/${project.version}</bundle>
+  </feature>
   <feature name='camel-ognl' 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.ognl/${ognl-version}</bundle>

Copied: 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
 (from r1477915, 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java&r1=1477915&r2=1477920&rev=1477920&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
 Wed May  1 07:31:12 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-public class CamelNettyTest extends AbstractFeatureTest {
+public class CamelNettyHttpTest extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelNettyTest.class);
+    public static final String COMPONENT = 
extractName(CamelNettyHttpTest.class);
 
     @Test
     public void test() throws Exception {