You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/11/17 07:07:14 UTC
svn commit: r1203070 - in
/camel/branches/camel-2.8.x/tests/camel-itest-osgi: pom.xml
src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Author: ningjiang
Date: Thu Nov 17 06:07:13 2011
New Revision: 1203070
URL: http://svn.apache.org/viewvc?rev=1203070&view=rev
Log:
Fixed the OSGi test failure
Modified:
camel/branches/camel-2.8.x/tests/camel-itest-osgi/pom.xml
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Modified: camel/branches/camel-2.8.x/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/pom.xml?rev=1203070&r1=1203069&r2=1203070&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/pom.xml (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/pom.xml Thu Nov 17 06:07:13 2011
@@ -95,16 +95,6 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>4.0.1</version>
- <!--exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions-->
<scope>compile</scope>
<optional>true</optional>
</dependency>
Modified: camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1203070&r1=1203069&r2=1203070&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java Thu Nov 17 06:07:13 2011
@@ -110,10 +110,11 @@ public class OSGiIntegrationTestSupport
Helper.getDefaultProvisioningOptions()),
// install the spring, http features first
scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"),
-
+ // install the cxf jaxb spec as the karaf doesn't provide it by default
+ scanFeatures(getCamelKarafFeatureUrl(), "cxf-jaxb"),
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
- "xml-specs-api", "camel-core", "camel-spring", "camel-test"),
+ "camel-core", "camel-spring", "camel-test"),
workingDirectory("target/paxrunner/"));