You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2014/12/10 15:47:36 UTC
[1/2] cxf git commit: Fix tests by adding http feature
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())
};
}
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf.git
Posted by cs...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf.git
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4fb4de76
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4fb4de76
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4fb4de76
Branch: refs/heads/master
Commit: 4fb4de764cb997b6a7553d9e707cbd4f3e2942cf
Parents: 13b9b01 19e912e
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Dec 10 15:47:12 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Dec 10 15:47:12 2014 +0100
----------------------------------------------------------------------
.../org/apache/cxf/configuration/jsse/SSLUtils.java | 7 ++++---
.../basic_https/src/main/resources/ServerConfig.xml | 9 ---------
.../ut_policy/src/main/resources/ClientConfig.xml | 9 ---------
.../ut_policy/src/main/resources/ClientConfigStax.xml | 9 ---------
.../ut_policy/src/main/resources/ServiceConfig.xml | 9 ---------
.../ut_policy/src/main/resources/ServiceConfigStax.xml | 9 ---------
.../src/main/resources/SecureClient.xml | 9 ---------
.../src/main/resources/ServerConfig.xml | 9 ---------
.../http/netty/client/integration/ServerConfig.xml | 12 ------------
.../netty/server/integration/ApplicationContext.xml | 12 ------------
.../http/netty/server/integration/ServerConfig.xml | 12 ------------
.../apache/cxf/systest/sts/basic_auth/cxf-service.xml | 5 -----
.../cxf/systest/sts/basic_auth/stax-cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 5 -----
.../cxf/systest/sts/caching/cxf-caching-service.xml | 5 -----
.../org/apache/cxf/systest/sts/caching/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/claims/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/claims/stax-cxf-service.xml | 5 -----
.../cxf/systest/sts/cross_domain/cxf-service.xml | 5 -----
.../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 5 -----
.../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 5 -----
.../cxf/systest/sts/custom_onbehalfof/cxf-service.xml | 5 -----
.../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/deployment/cxf-sts.xml | 5 -----
.../apache/cxf/systest/sts/deployment/stax-cxf-sts.xml | 5 -----
.../systest/sts/distributed_caching/cxf-service.xml | 5 -----
.../cxf/systest/sts/distributed_caching/cxf-sts-1.xml | 5 -----
.../cxf/systest/sts/distributed_caching/cxf-sts-2.xml | 5 -----
.../cxf/systest/sts/kerberos/cxf-intermediary.xml | 5 -----
.../apache/cxf/systest/sts/kerberos/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/realms/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/realms/cxf-sts-saml1.xml | 5 -----
.../apache/cxf/systest/sts/realms/cxf-sts-saml2.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 5 -----
.../apache/cxf/systest/sts/secure_conv/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 5 -----
.../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/soap12/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/soap12/stax-cxf-service.xml | 5 -----
.../cxf/systest/sts/transformation/cxf-service.xml | 5 -----
.../cxf/systest/sts/usernametoken/cxf-service.xml | 5 -----
.../cxf/systest/sts/usernametoken/stax-cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/bearer/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/bearer/cxf-stax-service.xml | 5 -----
.../cxf/systest/sts/delegation/cxf-sts-transport.xml | 5 -----
.../cxf/systest/sts/deployment/cxf-transport.xml | 5 -----
.../cxf/systest/sts/deployment/stax-cxf-transport.xml | 5 -----
.../cxf-intermediary-caching.xml | 5 -----
.../intermediary_transformation/cxf-intermediary.xml | 5 -----
.../sts/intermediary_transformation/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/issuer/cxf-service.xml | 5 -----
.../cxf/systest/sts/issuer/cxf-sts-transport.xml | 5 -----
.../org/apache/cxf/systest/sts/jaas/cxf-service.xml | 5 -----
.../cxf/systest/sts/sendervouches/cxf-intermediary.xml | 5 -----
.../cxf/systest/sts/sendervouches/cxf-service.xml | 5 -----
.../sts/sendervouches/cxf-stax-intermediary.xml | 5 -----
.../cxf/systest/sts/sendervouches/cxf-stax-service.xml | 5 -----
.../apache/cxf/systest/sts/stsclient/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/transport/cxf-service.xml | 5 -----
.../cxf/systest/sts/transport/cxf-stax-service.xml | 5 -----
.../cxf/systest/jaxrs/security/jaxrs-https-server.xml | 5 -----
.../cxf/systest/kerberos/wssec/kerberos/server.xml | 10 ----------
.../systest/kerberos/wssec/kerberos/stax-server.xml | 5 -----
.../cxf/systest/kerberos/wssec/spnego/server.xml | 5 -----
.../cxf/systest/kerberos/wssec/spnego/stax-server.xml | 5 -----
.../apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 5 -----
.../cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml | 5 -----
.../apache/cxf/systest/jaxrs/security/jwt/server.xml | 5 -----
.../cxf/systest/jaxrs/security/jwt/serverJwsJson.xml | 5 -----
.../cxf/systest/jaxrs/security/oauth2/server.xml | 5 -----
.../cxf/systest/jaxrs/security/saml/secureServer.xml | 5 -----
.../apache/cxf/systest/jaxrs/security/saml/server.xml | 5 -----
.../apache/cxf/systest/jaxrs/security/xml/server.xml | 5 -----
.../cxf/systest/jaxrs/security/xml/stax-server.xml | 5 -----
.../apache/cxf/systest/wssec/examples/saml/server.xml | 5 -----
.../cxf/systest/wssec/examples/saml/stax-server.xml | 5 -----
.../apache/cxf/systest/wssec/examples/ut/server.xml | 5 -----
.../cxf/systest/wssec/examples/ut/stax-server.xml | 5 -----
.../org/apache/cxf/systest/ws/https/server.xml | 5 -----
.../org/apache/cxf/systest/ws/https/stax-server.xml | 5 -----
.../apache/cxf/systest/ws/policy/javafirstserver.xml | 13 -------------
.../org/apache/cxf/systest/ws/policy/server.xml | 5 -----
.../org/apache/cxf/systest/ws/saml/server.xml | 5 -----
.../org/apache/cxf/systest/ws/saml/stax-server.xml | 5 -----
.../apache/cxf/systest/ws/saml/subjectconf/server.xml | 5 -----
.../cxf/systest/ws/saml/subjectconf/stax-server.xml | 5 -----
.../apache/cxf/systest/ws/security/https_config.xml | 9 ---------
.../cxf/systest/ws/security/https_config_client.xml | 9 ---------
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 5 -----
.../org/apache/cxf/systest/ws/ut/server-derived.xml | 5 -----
.../resources/org/apache/cxf/systest/ws/ut/server.xml | 5 -----
.../apache/cxf/systest/ws/ut/stax-policy-server.xml | 5 -----
.../org/apache/cxf/systest/ws/ut/stax-server.xml | 5 -----
.../org/apache/cxf/systest/ws/wssc/server.xml | 10 ----------
.../org/apache/cxf/systest/ws/wssc/unit-server.xml | 5 -----
.../org/apache/cxf/systest/ws/wssec10/server.xml | 5 -----
.../cxf/systest/ws/wssec10/server_restricted.xml | 5 -----
.../ws/wssec10/server_restricted_authorized.xml | 5 -----
.../ws/wssec10/server_restricted_authorized_2.xml | 5 -----
.../org/apache/cxf/systest/ws/wssec10/stax-server.xml | 5 -----
.../cxf/systest/ws/wssec10/stax-server_restricted.xml | 5 -----
.../org/apache/cxf/systest/ws/x509/server.xml | 5 -----
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 5 -----
.../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 5 -----
108 files changed, 4 insertions(+), 613 deletions(-)
----------------------------------------------------------------------