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 04:10:20 UTC
svn commit: r1203035 - in /camel/branches/camel-2.8.x/tests/camel-itest-osgi: pom.xml src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java

Author: ningjiang
Date: Thu Nov 17 03:10:19 2011
New Revision: 1203035

URL: http://svn.apache.org/viewvc?rev=1203035&view=rev
Log:
Fixed the OSGi test failure of CxfRsBlueprintRouterTest

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/cxf/blueprint/CxfRsBlueprintRouterTest.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=1203035&r1=1203034&r2=1203035&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 03:10:19 2011
@@ -95,6 +95,16 @@
       <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> 
@@ -264,6 +274,16 @@
     <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.configadmin</artifactId>
+        <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>test</scope>
     </dependency>
     <dependency>

Modified: camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.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/cxf/blueprint/CxfRsBlueprintRouterTest.java?rev=1203035&r1=1203034&r2=1203035&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java Thu Nov 17 03:10:19 2011
@@ -68,7 +68,7 @@ public class CxfRsBlueprintRouterTest ex
 
     protected void doPostSetup() throws Exception {
         getInstalledBundle("CxfRsBlueprintRouterTest").start();
-        getOsgiService(CamelContext.class, "(camel.context.symbolicname=CxfRsBlueprintRouterTest)", 10000);
+        getOsgiService(CamelContext.class, "(camel.context.symbolicname=CxfRsBlueprintRouterTest)", 30000);
     }
 
     @Test