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 15:20:10 UTC
svn commit: r1440968 - in /camel/trunk: parent/
platforms/karaf/features/src/main/resources/
tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/
Author: davsclaus
Date: Thu Jan 31 14:20:10 2013
New Revision: 1440968
URL: http://svn.apache.org/viewvc?rev=1440968&view=rev
Log:
Added camel-redis feature and addedd more karaf tests.
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
- copied, changed from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
- copied, changed from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java
- copied, changed from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java
- copied, changed from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
- copied, changed from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.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=1440968&r1=1440967&r2=1440968&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 31 14:20:10 2013
@@ -191,6 +191,7 @@
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>
+ <jedis-client-bundle-version>2.1.0_1</jedis-client-bundle-version>
<jetty-version>7.6.8.v20121106</jetty-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
<jetty6-version>6.1.26</jetty6-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=1440968&r1=1440967&r2=1440968&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 14:20:10 2013
@@ -56,6 +56,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
</feature>
+<!-- TODO: Need Karaf 2.3.1 release
<feature name='camel-test-spring' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
<bundle dependency='true'>mvn:org.springframework/spring-test/${spring-version}</bundle>
@@ -63,6 +64,7 @@
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-test-spring/${project.version}</bundle>
</feature>
+-->
<feature name='camel-context' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-context/${project.version}</bundle>
@@ -684,14 +686,16 @@
<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: camel-redis feature doesnt work yet
<feature name='camel-redis' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='[3.1,4)'>spring</feature>
<feature version='${project.version}'>camel-core</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
+ <bundle dependency='true'>mvn:org.springframework/spring-context/${spring-version}</bundle>
+ <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle>
+ <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>
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java (from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java&r1=1440928&r2=1440968&rev=1440968&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java Thu Jan 31 14:20:10 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelCometdTest extends AbstractFeatureTest {
+public class CamelCouchDBTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelCometdTest.class);
+ public static final String COMPONENT = "couchdb";
@Test
public void test() throws Exception {
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java (from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java&r1=1440928&r2=1440968&rev=1440968&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java Thu Jan 31 14:20:10 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelExecTest extends AbstractFeatureTest {
+public class CamelElasticsearchTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelExecTest.class);
+ public static final String COMPONENT = extractName(CamelElasticsearchTest.class);
@Test
public void test() throws Exception {
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java (from r1440928, 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/CamelNeo4jTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNeo4jTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java&r1=1440928&r2=1440968&rev=1440968&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/CamelNeo4jTest.java Thu Jan 31 14:20:10 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 CamelNeo4jTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelNettyTest.class);
+ public static final String COMPONENT = extractName(CamelNeo4jTest.class);
@Test
public void test() throws Exception {
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java (from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java&r1=1440928&r2=1440968&rev=1440968&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRedisTest.java Thu Jan 31 14:20:10 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelRestletTest extends AbstractFeatureTest {
+public class CamelRedisTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelRestletTest.class);
+ public static final String COMPONENT = extractName(CamelRedisTest.class);
@Test
public void test() throws Exception {
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java (from r1440928, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java&r1=1440928&r2=1440968&rev=1440968&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java Thu Jan 31 14:20:10 2013
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelVelocityTest extends AbstractFeatureTest {
+public class CamelXmlrpcTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelVelocityTest.class);
+ public static final String COMPONENT = extractName(CamelXmlrpcTest.class);
@Test
public void test() throws Exception {