camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1049839 - in /camel/trunk: platforms/karaf/features/src/main/resources/ tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/
Date Thu, 16 Dec 2010 09:28:22 GMT
Author: davsclaus
Date: Thu Dec 16 09:28:21 2010
New Revision: 1049839

URL: http://svn.apache.org/viewvc?rev=1049839&view=rev
Log:
More features test.

Added:
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
      - copied, changed from r1049805, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
      - copied, changed from r1049805, 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-spring2.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1049839&r1=1049838&r2=1049839&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml Thu Dec 16
09:28:21 2010
@@ -549,6 +549,7 @@
   <feature name='camel-spring-ws' version='${pom.version}'>
     <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
+    <bundle>mvn:org.springframework/spring-webmvc/${spring-version}</bundle>
     <bundle>mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle>
     <bundle>mvn:org.springframework.ws/spring-oxm/${spring-ws-version}</bundle>
     <bundle>mvn:org.springframework.ws/spring-ws-core/${spring-ws-version}</bundle>

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=1049839&r1=1049838&r2=1049839&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Dec 16 09:28:21
2010
@@ -555,6 +555,7 @@
   <feature name='camel-spring-ws' version='${pom.version}'>
     <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.springframework/spring-web/${spring3-version}</bundle>
+    <bundle>mvn:org.springframework/spring-webmvc/${spring3-version}</bundle>
     <bundle>mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle>
     <bundle>mvn:org.springframework.ws/spring-oxm/${spring-ws-version}</bundle>
     <bundle>mvn:org.springframework.ws/spring-ws-core/${spring-ws-version}</bundle>

Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
(from r1049805, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java&r1=1049805&r2=1049839&rev=1049839&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
(original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
Thu Dec 16 09:28:21 2010
@@ -17,7 +17,8 @@
 package org.apache.camel.itest.karaf;
 
 import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.JaxbDataFormat;
+import org.apache.camel.model.dataformat.JibxDataFormat;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -25,12 +26,13 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-public class CamelJaxbTest extends AbstractFeatureTest {
+@Ignore("A feature is missing")
+public class CamelJibxTest extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelJaxbTest.class);
+    public static final String COMPONENT = extractName(CamelJibxTest.class);
     
     protected DataFormatDefinition createDataformatDefinition(String format) {
-        return new JaxbDataFormat();
+        return new JibxDataFormat();
     }
 
     @Test

Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java?rev=1049839&r1=1049838&r2=1049839&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java
(original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java
Thu Dec 16 09:28:21 2010
@@ -24,10 +24,10 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-@Ignore("No quickfix feature exists")
+@Ignore("Requires Karaf 2.2 which has slf4j logger improved")
 public class CamelQuickFixTest extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelQuickFixTest.class);
+    public static final String COMPONENT = "quickfix";
 
     @Test
     public void test() throws Exception {

Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
(from r1049805, 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/CamelSpringWebServiceTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java&r1=1049805&r2=1049839&rev=1049839&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/CamelSpringWebServiceTest.java
Thu Dec 16 09:28:21 2010
@@ -16,6 +16,7 @@
  */
 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;
@@ -23,9 +24,10 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-public class CamelSpringIntegrationTest extends AbstractFeatureTest {
+@Ignore("Fails with some javax.xml.stream issue")
+public class CamelSpringWebServiceTest extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelSpringIntegrationTest.class);
+    public static final String COMPONENT = "spring-ws";
 
     @Test
     public void test() throws Exception {



Mime
View raw message