Author: davsclaus
Date: Sat Mar 10 08:39:19 2012
New Revision: 1299162
URL: http://svn.apache.org/viewvc?rev=1299162&view=rev
Log:
CAMEL-5073: Added camel-jt400 to features.
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java
- copied, changed from r1299156,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
Modified:
camel/trunk/components/camel-jt400/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-jt400/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/pom.xml?rev=1299162&r1=1299161&r2=1299162&view=diff
==============================================================================
--- camel/trunk/components/camel-jt400/pom.xml (original)
+++ camel/trunk/components/camel-jt400/pom.xml Sat Mar 10 08:39:19 2012
@@ -41,7 +41,7 @@
<dependency>
<groupId>net.sf.jt400</groupId>
<artifactId>jt400-full</artifactId>
- <version>6.0</version>
+ <version>${jt400-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1299162&r1=1299161&r2=1299162&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Mar 10 08:39:19 2012
@@ -118,6 +118,7 @@
<jsch-version>0.1.44-1</jsch-version>
<juel-version>2.1.2</juel-version>
<junit-version>4.8.1</junit-version>
+ <jt400-version>6.0</jt400-version>
<karaf-version>2.2.5</karaf-version>
<krati-version>0.4.3</krati-version>
<log4j-version>1.2.16</log4j-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=1299162&r1=1299161&r2=1299162&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat
Mar 10 08:39:19 2012
@@ -467,6 +467,11 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-juel/${project.version}</bundle>
</feature>
+ <feature name='camel-jt400' version='${project.version}' resolver='(obr)'
start-level='50'>
+ <bundle
dependency='true'>wrap:mvn:net.sf.jt400/jt400-full/${jt400-version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jt400/${project.version}</bundle>
+ </feature>
<feature name='camel-kestrel' version='${project.version}' resolver='(obr)'
start-level='50'>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spymemcached/${spymemcached-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
Copied:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java
(from r1299156,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java&r1=1299156&r2=1299162&rev=1299162&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java
Sat Mar 10 08:39:19 2012
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelMina2Test extends AbstractFeatureTest {
+public class CamelJt400Test extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelMina2Test.class);
+ public static final String COMPONENT = extractName(CamelJt400Test.class);
@Test
public void test() throws Exception {
