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/03/12 10:59:00 UTC
svn commit: r1455472 - in /camel/trunk:
platforms/karaf/features/src/main/resources/features.xml
tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
Author: davsclaus
Date: Tue Mar 12 09:58:59 2013
New Revision: 1455472
URL: http://svn.apache.org/r1455472
Log:
camel-test-spring feature seems working now
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
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=1455472&r1=1455471&r2=1455472&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Mar 12 09:58:59 2013
@@ -941,7 +941,6 @@
<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>
@@ -949,7 +948,6 @@
<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-twitter' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.twitter4j/${twitter4j-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java?rev=1455472&r1=1455471&r2=1455472&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java Tue Mar 12 09:58:59 2013
@@ -16,7 +16,6 @@
*/
package org.apache.camel.itest.karaf;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -24,7 +23,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-@Ignore("Requires Spring 3.1")
public class CamelTestSpringTest extends AbstractFeatureTest {
public static final String COMPONENT = "test-spring";