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 2013/01/31 16:08:49 UTC
svn commit: r1441006 - in /camel/trunk: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java

Author: davsclaus
Date: Thu Jan 31 15:08:49 2013
New Revision: 1441006

URL: http://svn.apache.org/viewvc?rev=1441006&view=rev
Log:
camel-urlrewrite feature

Added:
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
      - copied, changed from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1441006&r1=1441005&r2=1441006&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 31 15:08:49 2013
@@ -358,6 +358,7 @@
     <twitter4j-bundle-version>3.0.1_1</twitter4j-bundle-version>
     <twitter4j-version>3.0.3</twitter4j-version>
     <urlrewritefilter-version>4.0.4</urlrewritefilter-version>
+    <urlrewritefilter-bundle-version>4.0.4_1</urlrewritefilter-bundle-version>
     <velocity-bundle-version>1.7_6</velocity-bundle-version>
     <velocity-tools-version>2.0</velocity-tools-version>
     <velocity-version>1.7</velocity-version>

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=1441006&r1=1441005&r2=1441006&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jan 31 15:08:49 2013
@@ -686,6 +686,7 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-quickfix/${project.version}</bundle>
   </feature>
+<!-- TODO: requires Karaf 2.3.1
   <feature name='camel-redis' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <feature version='${spring-version-range}'>spring</feature>
@@ -696,6 +697,7 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-redis/${project.version}</bundle>
   </feature>
+-->
   <feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}</bundle>
@@ -887,6 +889,14 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-twitter/${project.version}</bundle>
   </feature>
+  <feature name='camel-urlrewrite' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-http</feature>
+    <feature version='${project.version}'>camel-http4</feature>
+    <feature version='${project.version}'>camel-jetty</feature>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.urlrewritefilter/${urlrewritefilter-bundle-version}</bundle>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-urlrewrite/${project.version}</bundle>
+  </feature>
   <feature name='camel-velocity' version='${project.version}' resolver='(obr)' start-level='50'>
     <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
     <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>

Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java (from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java&r1=1440928&r2=1441006&rev=1441006&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java Thu Jan 31 15:08:49 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-public class CamelTwitterTest extends AbstractFeatureTest {
+public class CamelUrlrewriteTest extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelTwitterTest.class);
+    public static final String COMPONENT = extractName(CamelUrlrewriteTest.class);
 
     @Test
     public void test() throws Exception {