Author: davsclaus
Date: Tue Jun 5 10:22:06 2012
New Revision: 1346334
URL: http://svn.apache.org/viewvc?rev=1346334&view=rev
Log:
CAMEL-5311: Added spring-batch osgi feature
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
- copied, changed from r1346325,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
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=1346334&r1=1346333&r2=1346334&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Jun 5 10:22:06 2012
@@ -717,6 +717,12 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-solr/${project.version}</bundle>
</feature>
+ <feature name='camel-spring-batch' version='${project.version}'
resolver='(obr)' start-level='50'>
+ <bundle
dependency='true'>mvn:org.springframework.batch/spring-batch-core/${spring-batch-version}</bundle>
+ <bundle
dependency='true'>mvn:org.springframework.batch/spring-batch-infrastructure/${spring-batch-version}</bundle>
+ <feature version='${project.version}'>camel-spring</feature>
+ <bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle>
+ </feature>
<feature name='camel-spring-integration' version='${project.version}'
resolver='(obr)' start-level='50'>
<bundle
dependency='true'>mvn:org.springframework.integration/spring-integration-core/${spring-integration-version}</bundle>
<feature version='${project.version}'>camel-spring</feature>
Copied:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
(from r1346325,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java&r1=1346325&r2=1346334&rev=1346334&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
Tue Jun 5 10:22:06 2012
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelSpringIntegrationTest extends AbstractFeatureTest {
+public class CamelSpringBatchTest extends AbstractFeatureTest {
- public static final String COMPONENT =
extractName(CamelSpringIntegrationTest.class);
+ public static final String COMPONENT =
extractName(CamelSpringBatchTest.class);
@Test
public void test() throws Exception {
