Repository: cxf
Updated Branches:
  refs/heads/master 19e912e8d -> 4fb4de764


Fix tests by adding http feature

Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13b9b012
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13b9b012
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13b9b012

Branch: refs/heads/master
Commit: 13b9b012a31fdf1a7e35757a336fecc3c688848e
Parents: 94cfe7e
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Dec 10 15:46:52 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Dec 10 15:46:52 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java   | 2 +-
 .../java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/13b9b012/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
----------------------------------------------------------------------
diff --git 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index 2b08262..67ae39c 100644
--- 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -95,7 +95,7 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
         return new Option[] {
             cxfBaseConfig(),
             testUtils(),
-            features(cxfUrl, "cxf-core", "cxf-jaxrs"),
+            features(cxfUrl, "cxf-core", "cxf-jaxrs", "http"),
             logLevel(LogLevel.INFO),
             provision(serviceBundle())
         };

http://git-wip-us.apache.org/repos/asf/cxf/blob/13b9b012/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
----------------------------------------------------------------------
diff --git 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index 34279e3..3aa9c1a 100644
--- 
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ 
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -68,10 +68,9 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
     public Option[] config() {
         return new Option[] {
             cxfBaseConfig(),
-            features(cxfUrl, "cxf-core", "cxf-jaxws"),
+            features(cxfUrl, "cxf-jaxws", "cxf-http-jetty", "http"),
             testUtils(),
             logLevel(LogLevel.INFO),
-            features(cxfUrl, "cxf-http", "cxf-http-jetty"),
             provision(serviceBundle())
         };
     }

Reply via email to