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 2011/05/29 12:19:32 UTC
svn commit: r1128853 - in /camel/trunk:
platforms/karaf/features/src/main/resources/
tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/
Author: davsclaus
Date: Sun May 29 10:19:31 2011
New Revision: 1128853
URL: http://svn.apache.org/viewvc?rev=1128853&view=rev
Log:
CAMEL-3705: Added camel-dns feature.
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
- copied, changed from r1128844, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java
- copied, changed from r1128844, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.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=1128853&r1=1128852&r2=1128853&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sun May 29 10:19:31 2011
@@ -223,6 +223,11 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-csv/${pom.version}</bundle>
</feature>
+ <feature name='camel-dns' version='${pom.version}' resolver='(obr)'>
+ <bundle dependency="true">mvn:dnsjava/dnsjava/${dnsjava-version}</bundle>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-dns/${pom.version}</bundle>
+ </feature>
<feature name='camel-dozer' version='${pom.version}' resolver='(obr)'>
<feature version='${pom.version}'>camel-core</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
@@ -499,6 +504,10 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-routebox/${pom.version}</bundle>
</feature>
+ <feature name='camel-ruby' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-script</feature>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby-bundle-version}</bundle>
+ </feature>
<feature name='camel-rss' version='${pom.version}' resolver='(obr)'>
<feature version='${pom.version}'>camel-atom</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
@@ -520,10 +529,6 @@
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.camel/camel-script/${pom.version}</bundle>
</feature>
- <feature name='camel-ruby' version='${pom.version}'>
- <feature version='${pom.version}'>camel-script</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby-bundle-version}</bundle>
- </feature>
<feature name='camel-sip' version='${pom.version}' resolver='(obr)'>
<feature version='${pom.version}'>camel-core</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}</bundle>
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java (from r1128844, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java&r1=1128844&r2=1128853&rev=1128853&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java Sun May 29 10:19:31 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.CsvDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -25,18 +23,13 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelCsvTest extends AbstractFeatureTest {
+public class CamelDnsTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelCsvTest.class);
+ public static final String COMPONENT = extractName(CamelDnsTest.class);
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new CsvDataFormat();
- }
-
-
@Test
public void test() throws Exception {
- testDataFormat(COMPONENT);
+ testComponent(COMPONENT);
}
@Configuration
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java (from r1128844, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java&r1=1128844&r2=1128853&rev=1128853&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java Sun May 29 10:19:31 2011
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelOgnlTest extends AbstractFeatureTest {
+public class CamelRubyTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelOgnlTest.class);
+ public static final String COMPONENT = extractName(CamelRubyTest.class);
@Test
public void test() throws Exception {