cxf git commit: [CXF-7419] Supporting subsesource locators returning classes
Repository: cxf
Updated Branches:
refs/heads/master cb607e912 -> 4e46cb7d8
[CXF-7419] Supporting subsesource locators returning classes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4e46cb7d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4e46cb7d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4e46cb7d
Branch: refs/heads/master
Commit: 4e46cb7d8d4ccb47aeff85b5b2804728ea4b736d
Parents: cb607e9
Author: Sergey Beryozkin
Authored: Wed Jul 5 17:05:13 2017 +0100
Committer: Sergey Beryozkin
Committed: Wed Jul 5 17:05:13 2017 +0100
--
.../main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 13 -
.../java/org/apache/cxf/jaxrs/utils/ResourceUtils.java | 3 +++
.../java/org/apache/cxf/systest/jaxrs/BookStore.java | 5 +
.../cxf/systest/jaxrs/JAXRSClientServerBookTest.java | 6 ++
4 files changed, 26 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e46cb7d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index b002f50..c0ca2ff 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -30,6 +30,7 @@ import java.util.logging.Logger;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.ResourceContext;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -45,6 +46,7 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.InterceptorChain.State;
import org.apache.cxf.jaxrs.impl.AsyncResponseImpl;
import org.apache.cxf.jaxrs.impl.MetadataMap;
+import org.apache.cxf.jaxrs.impl.ResourceContextImpl;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
@@ -224,7 +226,16 @@ public class JAXRSInvoker extends AbstractInvoker {
result = checkResultObject(result, subResourcePath);
-subCri = cri.getSubResource(methodToInvoke.getReturnType(),
+Class subResponseType = null;
+if (result.getClass() == Class.class) {
+ResourceContext rc = new ResourceContextImpl(inMessage,
ori);
+result = rc.getResource((Class)result);
+subResponseType =
InjectionUtils.getActualType(methodToInvoke.getGenericReturnType());
+} else {
+subResponseType = methodToInvoke.getReturnType();
+}
+
+subCri = cri.getSubResource(subResponseType,
ClassHelper.getRealClass(exchange.getBus(), result),
result);
if (subCri == null) {
org.apache.cxf.common.i18n.Message errorM =
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e46cb7d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
index 40d9780..31b38a5 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
@@ -316,6 +316,9 @@ public final class ResourceUtils {
if (httpMethod == null) {
// subresource locator
Class subClass = m.getReturnType();
+if (subClass == Class.class) {
+subClass =
InjectionUtils.getActualType(m.getGenericReturnType());
+}
if (enableStatic) {
ClassResourceInfo subCri = cri.findResource(subClass,
subClass);
if (subCri == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e46cb7d/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index ff7a84b..38b8da9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/sys
[7/7] cxf git commit: Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into
3.1.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/63a97dca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/63a97dca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/63a97dca
Branch: refs/heads/3.1.x-fixes
Commit: 63a97dcaaa1b508cf32497f6ee88b4587a750655
Parents: 3001234 d84c16c
Author: Daniel Kulp
Authored: Wed Jul 5 11:37:41 2017 -0400
Committer: Daniel Kulp
Committed: Wed Jul 5 11:37:41 2017 -0400
--
.gitmergeinfo | 2 +
integration/spring-boot/autoconfigure/pom.xml | 32 +--
maven-plugins/codegen-plugin/pom.xml| 13 +-
maven-plugins/codegen-plugin/src/it/README.md | 5 +
.../Cxf7067Service-1.0.0.wsdl | 82 ++
.../src/it/wsdl-artifact-resolution/pom.xml | 68 +
.../cxf/maven_plugin/AbstractCodegenMoho.java | 125
.../wsdl2java/WsdlOptionLoader.java | 2 +-
maven-plugins/pom.xml | 3 +
.../handler/soap/SOAPHandlerInterceptor.java| 67 ++---
.../cxf/jaxrs/client/spec/ClientImpl.java | 2 +-
rt/rs/description-swagger/pom.xml | 1 +
.../cxf/jaxrs/json/basic/JsonMapObject.java | 4 +
.../cxf/jaxrs/ext/search/SearchUtils.java | 1 -
.../jaxrs/ext/search/sql/SQLPrinterVisitor.java | 58 +++-
.../search/sql/SQLHierarchicalQueryTest.java| 74 +
.../jaxrs/AbstractJweJsonWriterProvider.java| 104 ++-
.../jaxrs/AbstractJwsJsonWriterProvider.java| 31 +-
.../jose/jaxrs/JweJsonWriterInterceptor.java| 45 +--
.../jose/jaxrs/JwsJsonWriterInterceptor.java| 47 +--
.../JwsMultipartSignatureInFilter.java | 2 +-
.../cxf/rs/security/jose/common/JoseUtils.java | 12 +
.../jose/common/KeyManagementUtils.java | 13 +
.../cxf/rs/security/jose/jwa/KeyAlgorithm.java | 3 +
.../jose/jwe/DirectKeyDecryptionAlgorithm.java | 2 +-
.../jose/jwe/DirectKeyEncryptionAlgorithm.java | 5 +-
.../rs/security/jose/jwe/JweJsonConsumer.java | 5 +-
.../jose/jwe/JweJsonEncryptionEntry.java| 2 +-
.../rs/security/jose/jwe/JweJsonProducer.java | 15 +-
.../cxf/rs/security/jose/jwe/JweUtils.java | 287 ++-
.../cxf/rs/security/jose/jws/JwsUtils.java | 121 ++--
.../security/jose/jwe/JweJsonConsumerTest.java | 14 +-
.../cxf/rs/security/jose/jws/JwsUtilsTest.java | 3 +-
.../saml/sso/SAMLProtocolResponseValidator.java | 7 +-
.../token/provider/jwt/JWTTokenProvider.java| 2 +-
.../token/provider/JWTTokenProviderTest.java| 9 +-
.../jaxrs/JAXRSClientServerBookTest.java| 2 +-
.../systest/jaxrs/security/jose/BookStore.java | 48
.../security/jose/jwejws/JAXRSJweJsonTest.java | 61 ++--
.../security/jose/jwejws/JAXRSJweJwsTest.java | 29 ++
.../security/jose/jwejws/JAXRSJwsJsonTest.java | 18 +-
.../jaxrs/security/certs/jwkPrivateSet.txt | 11 +
.../jaxrs/security/jose/jwejws/server.xml | 12 +
.../security/jose/jwejws/serverJweJson.xml | 25 +-
.../jaxrs/security/jwe.direct.properties| 21 ++
.../systest/jaxrs/security/jwejson1.properties | 22 ++
.../systest/jaxrs/security/jwejson2.properties | 22 ++
.../jaxrs/security/secret.jwk.hmac2.properties | 19 --
48 files changed, 1037 insertions(+), 521 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/integration/spring-boot/autoconfigure/pom.xml
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/maven-plugins/codegen-plugin/pom.xml
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/maven-plugins/pom.xml
--
diff --cc maven-plugins/pom.xml
index 605f403,7e50bf2..f5672c1
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@@ -27,9 -27,12 +27,12 @@@
org.apache.cxf
cxf-parent
-3.1.12-SNAPSHOT
+3.1.13-SNAPSHOT
../parent
+
+ ${cxf.maven.core.version}
+
codegen-plugin
java2ws-plugin
http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/rt/rs/description-swagger/pom.xml
--
[3/7] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.12
[maven-release-plugin] prepare release cxf-3.1.12 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0a88d866 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0a88d866 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0a88d866 Branch: refs/heads/3.1.x-fixes Commit: 0a88d8665d61de10fa7553f4a410bfb31772ff5d Parents: ad3670f Author: Daniel Kulp Authored: Mon Jun 26 14:21:17 2017 -0400 Committer: Daniel Kulp Committed: Mon Jun 26 14:21:17 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 ++-- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 8 .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../release/samples/jax_rs/tracing_brave/pom.xml| 14 +++--- .../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +++--- .../release/samples/jax_rs/tracing_htrace/pom.xml | 14 +++--- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_osgi/pom.xml | 8 .../release/samples/jax_rs/websocket_web/pom.xml| 8 .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../main/release/samples/jaxws_spring_boot/pom.xml | 2 +- .../samples/jaxws_tracing_brave_osgi/pom.xml| 10 +- .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/throttling/pom.xml | 2 +- .../src/main/release/samples/ws_addressi
[5/7] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
index 745a0f6..93574c1 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
@@ -26,7 +26,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12
+3.1.13-SNAPSHOT
..
@@ -36,23 +36,23 @@
org.apache.cxf
cxf-rt-transports-http
-3.1.12
+3.1.13-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.12
+3.1.13-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12
+3.1.13-SNAPSHOT
org.apache.cxf
cxf-integration-tracing-brave
-3.1.12
+3.1.13-SNAPSHOT
javax.ws.rs
http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/distribution/src/main/release/samples/jms_pubsub/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml
b/distribution/src/main/release/samples/jms_pubsub/pom.xml
index 044c79c..153c706 100644
--- a/distribution/src/main/release/samples/jms_pubsub/pom.xml
+++ b/distribution/src/main/release/samples/jms_pubsub/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12
+3.1.13-SNAPSHOT
${project.version}
@@ -36,7 +36,7 @@
org.apache.cxf
cxf-codegen-plugin
-3.1.12
+3.1.13-SNAPSHOT
generate-sources
@@ -137,12 +137,12 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12
+3.1.13-SNAPSHOT
org.apache.cxf
cxf-rt-transports-jms
-3.1.12
+3.1.13-SNAPSHOT
org.apache.activemq
http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/distribution/src/main/release/samples/jms_queue/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_queue/pom.xml
b/distribution/src/main/release/samples/jms_queue/pom.xml
index b9e8f71..7ab15c7 100644
--- a/distribution/src/main/release/samples/jms_queue/pom.xml
+++ b/distribution/src/main/release/samples/jms_queue/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12
+3.1.13-SNAPSHOT
${project.version}
@@ -137,12 +137,12 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12
+3.1.13-SNAPSHOT
org.apache.cxf
cxf-rt-transports-jms
-3.1.12
+3.1.13-SNAPSHOT
org.apache.activemq
http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/distribution/src/main/release/samples/jms_spec_demo/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_spec_demo/pom.xml
b/distribution/src/main/release/samples/jms_spec_demo/pom.xml
index 474041d..58f99da 100644
--- a/distribution/src/main/release/samples/jms_spec_demo/pom.xml
+++ b/distribution/src/main/release/samples/jms_spec_demo/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12
+3.1.13-SNAPSHOT
${project.version}
@@ -137,12 +137,12 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12
+3.1.13-SNAPSHOT
org.apache.cxf
cxf-rt-transports-jms
-3.1.12
+3.1.13-SNAPSHOT
org.apache.activemq
http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/distribution/src/main/release/samples/jms_spring_config/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_spring_config/pom.xml
b/distribution/src/main/release/samples/jms_spring_config/pom.xml
index 2764038..aba536a 100644
--- a/distribution/src/main/release/samples/jms_spring_config/pom.xml
+++ b/distribution/src/main/release/samples/jms_spring_config/pom.xml
@@ -26,7 +26,7 @@
org.apache.cxf.samples
cxf-samp
[2/7] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.12
http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
index a17b56f..745a0f6 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
@@ -26,7 +26,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12-SNAPSHOT
+3.1.12
..
@@ -36,23 +36,23 @@
org.apache.cxf
cxf-rt-transports-http
-3.1.12-SNAPSHOT
+3.1.12
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.12-SNAPSHOT
+3.1.12
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12-SNAPSHOT
+3.1.12
org.apache.cxf
cxf-integration-tracing-brave
-3.1.12-SNAPSHOT
+3.1.12
javax.ws.rs
http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/distribution/src/main/release/samples/jms_pubsub/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml
b/distribution/src/main/release/samples/jms_pubsub/pom.xml
index ea04f5d..044c79c 100644
--- a/distribution/src/main/release/samples/jms_pubsub/pom.xml
+++ b/distribution/src/main/release/samples/jms_pubsub/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12-SNAPSHOT
+3.1.12
${project.version}
@@ -36,7 +36,7 @@
org.apache.cxf
cxf-codegen-plugin
-3.1.12-SNAPSHOT
+3.1.12
generate-sources
@@ -137,12 +137,12 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12-SNAPSHOT
+3.1.12
org.apache.cxf
cxf-rt-transports-jms
-3.1.12-SNAPSHOT
+3.1.12
org.apache.activemq
http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/distribution/src/main/release/samples/jms_queue/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_queue/pom.xml
b/distribution/src/main/release/samples/jms_queue/pom.xml
index 1d03691..b9e8f71 100644
--- a/distribution/src/main/release/samples/jms_queue/pom.xml
+++ b/distribution/src/main/release/samples/jms_queue/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12-SNAPSHOT
+3.1.12
${project.version}
@@ -137,12 +137,12 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12-SNAPSHOT
+3.1.12
org.apache.cxf
cxf-rt-transports-jms
-3.1.12-SNAPSHOT
+3.1.12
org.apache.activemq
http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/distribution/src/main/release/samples/jms_spec_demo/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_spec_demo/pom.xml
b/distribution/src/main/release/samples/jms_spec_demo/pom.xml
index 637b283..474041d 100644
--- a/distribution/src/main/release/samples/jms_spec_demo/pom.xml
+++ b/distribution/src/main/release/samples/jms_spec_demo/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.12-SNAPSHOT
+3.1.12
${project.version}
@@ -137,12 +137,12 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.12-SNAPSHOT
+3.1.12
org.apache.cxf
cxf-rt-transports-jms
-3.1.12-SNAPSHOT
+3.1.12
org.apache.activemq
http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/distribution/src/main/release/samples/jms_spring_config/pom.xml
--
diff --git a/distribution/src/main/release/samples/jms_spring_config/pom.xml
b/distribution/src/main/release/samples/jms_spring_config/pom.xml
index 0f5e654..2764038 100644
--- a/distribution/src/main/release/samples/jms_spring_config/pom.xml
+++ b/distribution/src/main/release/samples/jms_spring_config/pom.xml
@@ -26,7 +26,7 @@
org.apache.cxf.samples
cxf-samp
[1/7] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.12
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes d84c16c9b -> 63a97dcaa http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/javascript/javascript-tests/pom.xml -- diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml index bafbdac..bf856d5 100644 --- a/rt/javascript/javascript-tests/pom.xml +++ b/rt/javascript/javascript-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript -3.1.12-SNAPSHOT +3.1.12 http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/javascript/pom.xml -- diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml index 73cae8d..852f11c 100644 --- a/rt/javascript/pom.xml +++ b/rt/javascript/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/management-web/pom.xml -- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index 6a99acc..cb36281 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/management/pom.xml -- diff --git a/rt/management/pom.xml b/rt/management/pom.xml index 8a67014..6354f90 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/pom.xml -- diff --git a/rt/pom.xml b/rt/pom.xml index 5e03b44..ec4e7ac 100644 --- a/rt/pom.xml +++ b/rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf -3.1.12-SNAPSHOT +3.1.12 wsdl http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/rs/client/pom.xml -- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index 8264d8e..61255a6 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/rs/description-swagger/pom.xml -- diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml index dbb343e..ed5623a 100644 --- a/rt/rs/description-swagger/pom.xml +++ b/rt/rs/description-swagger/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/rs/description/pom.xml -- diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index a89c07f..1d32fc8 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/rs/extensions/json-basic/pom.xml -- diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml index c5eb431..9e65c43 100644 --- a/rt/rs/extensions/json-basic/pom.xml +++ b/rt/rs/extensions/json-basic/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/rs/extensions/providers/pom.xml -- diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index 9cd7246..a5227e4 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12-SNAPSHOT +3.1.12 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/0a88d866/rt/rs/extensions/search/pom.xml -- diff --git a/rt/rs/extensions/s
[6/7] cxf git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3001234a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3001234a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3001234a Branch: refs/heads/3.1.x-fixes Commit: 3001234a9fa7e163726ddbe9d87233b9da992868 Parents: 0a88d86 Author: Daniel Kulp Authored: Mon Jun 26 14:21:21 2017 -0400 Committer: Daniel Kulp Committed: Mon Jun 26 14:21:21 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 ++-- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 8 .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../release/samples/jax_rs/tracing_brave/pom.xml| 14 +++--- .../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +++--- .../release/samples/jax_rs/tracing_htrace/pom.xml | 14 +++--- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_osgi/pom.xml | 8 .../release/samples/jax_rs/websocket_web/pom.xml| 8 .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../main/release/samples/jaxws_spring_boot/pom.xml | 2 +- .../samples/jaxws_tracing_brave_osgi/pom.xml| 10 +- .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/throttling/pom.xml | 2 +- .../src/main/release/samples
[4/7] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/javascript/javascript-tests/pom.xml -- diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml index bf856d5..ad9d557 100644 --- a/rt/javascript/javascript-tests/pom.xml +++ b/rt/javascript/javascript-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript -3.1.12 +3.1.13-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/javascript/pom.xml -- diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml index 852f11c..5763240 100644 --- a/rt/javascript/pom.xml +++ b/rt/javascript/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/management-web/pom.xml -- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index cb36281..14a92a7 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/management/pom.xml -- diff --git a/rt/management/pom.xml b/rt/management/pom.xml index 6354f90..dc7231f 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/pom.xml -- diff --git a/rt/pom.xml b/rt/pom.xml index ec4e7ac..4eaf1ed 100644 --- a/rt/pom.xml +++ b/rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf -3.1.12 +3.1.13-SNAPSHOT wsdl http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/rs/client/pom.xml -- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index 61255a6..dc20a09 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/rs/description-swagger/pom.xml -- diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml index ed5623a..8b11b36 100644 --- a/rt/rs/description-swagger/pom.xml +++ b/rt/rs/description-swagger/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/rs/description/pom.xml -- diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index 1d32fc8..509e128 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/rs/extensions/json-basic/pom.xml -- diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml index 9e65c43..b381a54 100644 --- a/rt/rs/extensions/json-basic/pom.xml +++ b/rt/rs/extensions/json-basic/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/rs/extensions/providers/pom.xml -- diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index a5227e4..6c9602b 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.12 +3.1.13-SNAPSHOT ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/3001234a/rt/rs/extensions/search/pom.xml -- diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index 4309329..f666fd6 100644 --- a/
cxf git commit: [CXF-7357] Testcase for UnknownHostException
Repository: cxf
Updated Branches:
refs/heads/master 0287f7d3a -> cb607e912
[CXF-7357] Testcase for UnknownHostException
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cb607e91
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cb607e91
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cb607e91
Branch: refs/heads/master
Commit: cb607e91281aaf822bb6a92fc34077435921a664
Parents: 0287f7d
Author: Dennis Kieselhorst
Authored: Wed Jul 5 15:54:05 2017 +0200
Committer: Dennis Kieselhorst
Committed: Wed Jul 5 15:54:05 2017 +0200
--
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 16
1 file changed, 16 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/cb607e91/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index d3b63af..583603c 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.net.URI;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -62,6 +63,7 @@ import javax.xml.ws.Holder;
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
@@ -72,6 +74,7 @@ import
org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
public class JAXRS20ClientServerBookTest extends
AbstractBusClientServerTestBase {
@@ -790,6 +793,19 @@ public class JAXRS20ClientServerBookTest extends
AbstractBusClientServerTestBase
assertEquals("CXF Rocks", b22.getName());
}
+@Ignore("CXF-7357")
+@Test
+public void testUnknownHostException() throws InterruptedException {
+String address =
"http://unknown-host/bookstore/bookheaders/simple/async";;
+try {
+doTestPostBookAsyncHandler(address);
+fail("Should fail with UnknownHostException");
+} catch (ExecutionException e) {
+assertTrue("Should fail with UnknownHostException",
+ExceptionUtils.getRootCause(e) instanceof
UnknownHostException);
+}
+}
+
private static class ReplaceBodyFilter implements ClientRequestFilter {
@Override
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 4499a797a -> 20cc55284 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/20cc5528 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20cc5528 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20cc5528 Branch: refs/heads/3.0.x-fixes Commit: 20cc55284b22e51a0f5c2ef08c3fc55def9771cf Parents: 4499a79 Author: Colm O hEigeartaigh Authored: Wed Jul 5 11:35:54 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Jul 5 11:35:54 2017 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/20cc5528/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 109f791..a36ea92 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1578,6 +1578,7 @@ B d7e2821f80efe3501dc4e3e0e54c14e8548739d3 B d7fd946abbd5c81ed08b057f6c6ac9d0880cf6fa B d83a99912eda32fe6545bc01aaf30a0dd54797a7 B d83e6eab1544b4a7f748a6c0138b91c988f88684 +B d84c16c9bac47eec057f0d0f038a26b43bc8d603 B d8673543d8723579eaf6a57d4b1ac6e22e0d308d B d877c0539fd09d79094763b98484576de52198fa B d8a6bdbd2c84b3fa0187de935e294d5f66974e46
cxf git commit: Instantiate the SAML Response signature validator directly
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes cdee5469e -> d84c16c9b
Instantiate the SAML Response signature validator directly
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d84c16c9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d84c16c9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d84c16c9
Branch: refs/heads/3.1.x-fixes
Commit: d84c16c9bac47eec057f0d0f038a26b43bc8d603
Parents: cdee546
Author: Colm O hEigeartaigh
Authored: Wed Jul 5 11:31:07 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Jul 5 11:32:50 2017 +0100
--
.../rs/security/saml/sso/SAMLProtocolResponseValidator.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d84c16c9/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
--
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
index 590ed64..9a3df86 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
@@ -65,7 +65,8 @@ import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.signature.KeyInfo;
import org.opensaml.xmlsec.signature.Signature;
import org.opensaml.xmlsec.signature.support.SignatureException;
-import org.opensaml.xmlsec.signature.support.SignatureValidator;
+import org.opensaml.xmlsec.signature.support.SignatureValidationProvider;
+import
org.opensaml.xmlsec.signature.support.provider.ApacheSantuarioSignatureValidationProviderImpl;
/**
* Validate a SAML (1.1 or 2.0) Protocol Response. It validates the Response
against the specs,
@@ -336,7 +337,9 @@ public class SAMLProtocolResponseValidator {
throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"invalidSAMLsecurity");
}
try {
-SignatureValidator.validate(signature, credential);
+SignatureValidationProvider responseSignatureValidator =
+new ApacheSantuarioSignatureValidationProviderImpl();
+responseSignatureValidator.validate(signature, credential);
} catch (SignatureException ex) {
LOG.log(Level.FINE, "Error in validating the SAML Signature: " +
ex.getMessage(), ex);
throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"invalidSAMLsecurity");
cxf git commit: Instantiate the SAML Response signature validator directly
Repository: cxf
Updated Branches:
refs/heads/master 0c307b673 -> 0287f7d3a
Instantiate the SAML Response signature validator directly
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0287f7d3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0287f7d3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0287f7d3
Branch: refs/heads/master
Commit: 0287f7d3a30908cdde0ca30f470f2103dab26a7c
Parents: 0c307b6
Author: Colm O hEigeartaigh
Authored: Wed Jul 5 11:31:07 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Jul 5 11:31:07 2017 +0100
--
.../rs/security/saml/sso/SAMLProtocolResponseValidator.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0287f7d3/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
--
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
index 49607dc..94d369d 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
@@ -65,7 +65,8 @@ import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.signature.KeyInfo;
import org.opensaml.xmlsec.signature.Signature;
import org.opensaml.xmlsec.signature.support.SignatureException;
-import org.opensaml.xmlsec.signature.support.SignatureValidator;
+import org.opensaml.xmlsec.signature.support.SignatureValidationProvider;
+import
org.opensaml.xmlsec.signature.support.provider.ApacheSantuarioSignatureValidationProviderImpl;
/**
* Validate a SAML (1.1 or 2.0) Protocol Response. It validates the Response
against the specs,
@@ -337,7 +338,9 @@ public class SAMLProtocolResponseValidator {
throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"invalidSAMLsecurity");
}
try {
-SignatureValidator.validate(signature, credential);
+SignatureValidationProvider responseSignatureValidator =
+new ApacheSantuarioSignatureValidationProviderImpl();
+responseSignatureValidator.validate(signature, credential);
} catch (SignatureException ex) {
LOG.log(Level.FINE, "Error in validating the SAML Signature: " +
ex.getMessage(), ex);
throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"invalidSAMLsecurity");
[2/2] cxf git commit: [CXF-7412] avoid NPE occuring when handler chain contains a SoapHandler and empty message is received
[CXF-7412] avoid NPE occuring when handler chain contains a SoapHandler and
empty message is received
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5958e971
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5958e971
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5958e971
Branch: refs/heads/3.0.x-fixes
Commit: 5958e9711ee4a3204ad486cda22d62da5acb61f3
Parents: 5f15b86
Author: Dennis Kieselhorst
Authored: Wed Jul 5 11:39:22 2017 +0200
Committer: Dennis Kieselhorst
Committed: Wed Jul 5 11:48:19 2017 +0200
--
.../handler/soap/SOAPHandlerInterceptor.java| 67 ++--
1 file changed, 34 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5958e971/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
--
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
index db6f55f..7dfb3d4 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
@@ -138,7 +138,7 @@ public class SOAPHandlerInterceptor extends
message.getInterceptorChain().abort();
if (ep.getInFaultObserver() != null) {
ep.getInFaultObserver().onMessage(message);
-
+
}
}
}
@@ -157,12 +157,12 @@ public class SOAPHandlerInterceptor extends
}
private boolean handleMessageInternal(SoapMessage message) {
-
+
MessageContext context = createProtocolMessageContext(message);
if (context == null) {
return true;
}
-
+
HandlerChainInvoker invoker = getInvoker(message);
invoker.setProtocolMessageContext(context);
@@ -185,7 +185,7 @@ public class SOAPHandlerInterceptor extends
// client side outbound
if (getInvoker(message).isOutbound()) {
message.getInterceptorChain().abort();
-
+
MessageObserver observer =
message.getExchange().get(MessageObserver.class);
if (!message.getExchange().isOneWay()
&& observer != null) {
@@ -193,7 +193,7 @@ public class SOAPHandlerInterceptor extends
Message responseMsg = new MessageImpl();
responseMsg.setExchange(message.getExchange());
responseMsg = e.getBinding().createMessage(responseMsg);
-
+
// the request message becomes the response message
message.getExchange().setInMessage(responseMsg);
SOAPMessage soapMessage =
((SOAPMessageContext)context).getMessage();
@@ -237,7 +237,7 @@ public class SOAPHandlerInterceptor extends
// well for outbound case, as many outbound interceptors
// have their ending interceptors.
// For example, we can not skip MessageSenderInterceptor.
-chain.doInterceptStartingAfter(responseMsg,
+chain.doInterceptStartingAfter(responseMsg,
SoapPreProtocolOutInterceptor.class.getName());
}
@@ -251,39 +251,40 @@ public class SOAPHandlerInterceptor extends
@Override
protected MessageContext createProtocolMessageContext(SoapMessage message)
{
SOAPMessageContextImpl sm = new SOAPMessageContextImpl(message);
-
+
Exchange exch = message.getExchange();
setupBindingOperationInfo(exch, sm);
SOAPMessage msg = sm.getMessage();
-try {
-List params = new ArrayList();
-message.put(MessageContext.REFERENCE_PARAMETERS, params);
-SOAPHeader head = SAAJUtils.getHeader(msg);
-if (head != null) {
-Iterator it = CastUtils.cast(head.getChildElements());
-while (it != null && it.hasNext()) {
-Node nd = it.next();
-if (nd instanceof SOAPElement) {
-SOAPElement el = (SOAPElement)nd;
-if (el.hasAttributeNS(Names.WSA_NAMESPACE_NAME,
"IsReferenceParameter")
-&&
("1".equals(el.getAttributeNS(Names.WSA_NAMESPACE_NAME,
-
"IsReferenceParameter"))
-||
Boolean.parseBoolean(el.getAttributeNS(Names.WSA_NAM
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 5f15b860f -> 4499a797a Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4499a797 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4499a797 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4499a797 Branch: refs/heads/3.0.x-fixes Commit: 4499a797ad021e8082b78d50dc6bc84fdfb77ef0 Parents: 5958e97 Author: Dennis Kieselhorst Authored: Wed Jul 5 11:48:19 2017 +0200 Committer: Dennis Kieselhorst Committed: Wed Jul 5 11:48:19 2017 +0200 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4499a797/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index ad7cdf3..109f791 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -904,6 +904,7 @@ B 7b4c14f1aadb810d5b91fa0adfa2a6bc70e45a76 B 7b8145e65e9300931aea628251446e49f2e8bfe0 B 7b9f72bd7c3dc778da9bee85d54f36f99c0feb23 B 7be9bae496416baf3dea6b35d4fe8aef7767c7a6 +B 7c159a7916bb839726847e67ea87b00707b5f897 B 7c3ce3d499651177e9e712d49c7774c5796b1524 B 7c7404970a05900911b97c28a08665f5db3dcaa8 B 7c7bf49e2c980e34610e0647e286ab0f5d7e63e4 @@ -1506,6 +1507,7 @@ B cd7095c49ab2be4a5667450bf67e5e4be8ec84c1 B cd809b8526fc5620c481d4ee5a8534ccf6babae4 B cd9d69a3c92e2c23b85e44bfbfe973c029870e78 B cdafd372c60b7e19229d7e6a91fc69b9c5dbc69c +B cdee5469e7bf2e0299dddc6159839c67dea28350 B ce81b3829764996aa8d6c006ec2dd5c784e98433 B ce992f3b0cd85ca255950289461c6c48926c8efc B cec8828bd220abd0d49457df707b9261b50e1a8e
[1/2] cxf git commit: [CXF-7412] avoid NPE occuring when handler chain contains a SoapHandler and empty message is received
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 2f62e85eb -> cdee5469e
[CXF-7412] avoid NPE occuring when handler chain contains a SoapHandler and
empty message is received
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce9baaa3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce9baaa3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce9baaa3
Branch: refs/heads/3.1.x-fixes
Commit: ce9baaa3a0a319db3353ddcbc4d7741462995012
Parents: 2f62e85
Author: Dennis Kieselhorst
Authored: Wed Jul 5 11:39:22 2017 +0200
Committer: Dennis Kieselhorst
Committed: Wed Jul 5 11:43:17 2017 +0200
--
.../handler/soap/SOAPHandlerInterceptor.java| 67 ++--
1 file changed, 34 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce9baaa3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
--
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
index 76a5164..52d8b24 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
@@ -138,7 +138,7 @@ public class SOAPHandlerInterceptor extends
message.getInterceptorChain().abort();
if (ep.getInFaultObserver() != null) {
ep.getInFaultObserver().onMessage(message);
-
+
}
}
}
@@ -157,12 +157,12 @@ public class SOAPHandlerInterceptor extends
}
private boolean handleMessageInternal(SoapMessage message) {
-
+
MessageContext context = createProtocolMessageContext(message);
if (context == null) {
return true;
}
-
+
HandlerChainInvoker invoker = getInvoker(message);
invoker.setProtocolMessageContext(context);
@@ -185,7 +185,7 @@ public class SOAPHandlerInterceptor extends
// client side outbound
if (getInvoker(message).isOutbound()) {
message.getInterceptorChain().abort();
-
+
MessageObserver observer =
message.getExchange().get(MessageObserver.class);
if (!message.getExchange().isOneWay()
&& observer != null) {
@@ -193,7 +193,7 @@ public class SOAPHandlerInterceptor extends
Message responseMsg = new MessageImpl();
responseMsg.setExchange(message.getExchange());
responseMsg = e.getBinding().createMessage(responseMsg);
-
+
// the request message becomes the response message
message.getExchange().setInMessage(responseMsg);
SOAPMessage soapMessage =
((SOAPMessageContext)context).getMessage();
@@ -237,7 +237,7 @@ public class SOAPHandlerInterceptor extends
// well for outbound case, as many outbound interceptors
// have their ending interceptors.
// For example, we can not skip MessageSenderInterceptor.
-chain.doInterceptStartingAfter(responseMsg,
+chain.doInterceptStartingAfter(responseMsg,
SoapPreProtocolOutInterceptor.class.getName());
}
@@ -251,39 +251,40 @@ public class SOAPHandlerInterceptor extends
@Override
protected MessageContext createProtocolMessageContext(SoapMessage message)
{
SOAPMessageContextImpl sm = new SOAPMessageContextImpl(message);
-
+
Exchange exch = message.getExchange();
setupBindingOperationInfo(exch, sm);
SOAPMessage msg = sm.getMessage();
-try {
-List params = new ArrayList();
-message.put(MessageContext.REFERENCE_PARAMETERS, params);
-SOAPHeader head = SAAJUtils.getHeader(msg);
-if (head != null) {
-Iterator it = CastUtils.cast(head.getChildElements());
-while (it != null && it.hasNext()) {
-Node nd = it.next();
-if (nd instanceof SOAPElement) {
-SOAPElement el = (SOAPElement)nd;
-if (el.hasAttributeNS(Names.WSA_NAMESPACE_NAME,
"IsReferenceParameter")
-&&
("1".equals(el.getAttributeNS(Names.WSA_NAMESPACE_NAME,
-
"IsReferenceParameter"))
-
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cdee5469 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cdee5469 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cdee5469 Branch: refs/heads/3.1.x-fixes Commit: cdee5469e7bf2e0299dddc6159839c67dea28350 Parents: ce9baaa Author: Dennis Kieselhorst Authored: Wed Jul 5 11:43:50 2017 +0200 Committer: Dennis Kieselhorst Committed: Wed Jul 5 11:43:50 2017 +0200 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/cdee5469/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index e66a099..56f8d4d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -436,6 +436,7 @@ M 08c9194ce2c567ebfe59f59ee628b1197d90fd43 M 090fa6100ae3a5aa8ae894b0e238acb793f705ec M 09fb22b25333c66514f06652ceaf7fc11bde51cc M 0b7b18333591d6bb8e0bfcf324bbdefaa8cce21d +M 0c307b67340dcafd75a1fd40ce003869ddd4594b M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9 M 0eef86f37288f71fd96506fb2ac7fa27169d1e43 M 10d34e1a812ab2a709376f008c738de68c8720cf
cxf git commit: [CXF-7412] avoid NPE occuring when handler chain contains a SoapHandler and empty message is received
Repository: cxf
Updated Branches:
refs/heads/master dcb407024 -> 0c307b673
[CXF-7412] avoid NPE occuring when handler chain contains a SoapHandler and
empty message is received
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0c307b67
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0c307b67
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0c307b67
Branch: refs/heads/master
Commit: 0c307b67340dcafd75a1fd40ce003869ddd4594b
Parents: dcb4070
Author: Dennis Kieselhorst
Authored: Wed Jul 5 11:39:22 2017 +0200
Committer: Dennis Kieselhorst
Committed: Wed Jul 5 11:39:22 2017 +0200
--
.../handler/soap/SOAPHandlerInterceptor.java| 47 ++--
1 file changed, 24 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0c307b67/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
--
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
index 2122eff..340c966 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
@@ -254,35 +254,36 @@ public class SOAPHandlerInterceptor extends
Exchange exch = message.getExchange();
setupBindingOperationInfo(exch, sm);
SOAPMessage msg = sm.getMessage();
-try {
-List params = new ArrayList<>();
-message.put(MessageContext.REFERENCE_PARAMETERS, params);
-SOAPHeader head = SAAJUtils.getHeader(msg);
-if (head != null) {
-Iterator it = CastUtils.cast(head.getChildElements());
-while (it != null && it.hasNext()) {
-Node nd = it.next();
-if (nd instanceof SOAPElement) {
-SOAPElement el = (SOAPElement)nd;
-if (el.hasAttributeNS(Names.WSA_NAMESPACE_NAME,
"IsReferenceParameter")
-&&
("1".equals(el.getAttributeNS(Names.WSA_NAMESPACE_NAME,
-
"IsReferenceParameter"))
-||
Boolean.parseBoolean(el.getAttributeNS(Names.WSA_NAMESPACE_NAME,
-
"IsReferenceParameter" {
-params.add(el);
+if (msg != null) {
+try {
+List params = new ArrayList<>();
+message.put(MessageContext.REFERENCE_PARAMETERS, params);
+SOAPHeader head = SAAJUtils.getHeader(msg);
+if (head != null) {
+Iterator it =
CastUtils.cast(head.getChildElements());
+while (it != null && it.hasNext()) {
+Node nd = it.next();
+if (nd instanceof SOAPElement) {
+SOAPElement el = (SOAPElement) nd;
+if (el.hasAttributeNS(Names.WSA_NAMESPACE_NAME,
"IsReferenceParameter")
+&&
("1".equals(el.getAttributeNS(Names.WSA_NAMESPACE_NAME,
+"IsReferenceParameter"))
+||
Boolean.parseBoolean(el.getAttributeNS(Names.WSA_NAMESPACE_NAME,
+"IsReferenceParameter" {
+params.add(el);
+}
}
}
}
+if (isRequestor(message) &&
msg.getSOAPPart().getEnvelope().getBody() != null
+&&
msg.getSOAPPart().getEnvelope().getBody().hasFault()) {
+return null;
+}
+} catch (SOAPException e) {
+throw new Fault(e);
}
-if (isRequestor(message) &&
msg.getSOAPPart().getEnvelope().getBody() != null
-&& msg.getSOAPPart().getEnvelope().getBody().hasFault()) {
-return null;
-}
-} catch (SOAPException e) {
-throw new Fault(e);
}
-
return sm;
}
