[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/jose-parent/jose-jaxrs/pom.xml -- diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml index d6581cf..ec04d00 100644 --- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml +++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11 +3.1.12-SNAPSHOT ../../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/jose-parent/jose/pom.xml -- diff --git a/rt/rs/security/jose-parent/jose/pom.xml b/rt/rs/security/jose-parent/jose/pom.xml index b88db2f..f5c3cae 100644 --- a/rt/rs/security/jose-parent/jose/pom.xml +++ b/rt/rs/security/jose-parent/jose/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11 +3.1.12-SNAPSHOT ../../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/jose-parent/pom.xml -- diff --git a/rt/rs/security/jose-parent/pom.xml b/rt/rs/security/jose-parent/pom.xml index 7459932..e9bb6a1 100644 --- a/rt/rs/security/jose-parent/pom.xml +++ b/rt/rs/security/jose-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt-rs-security -3.1.11 +3.1.12-SNAPSHOT jose http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/oauth-parent/oauth/pom.xml -- diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml b/rt/rs/security/oauth-parent/oauth/pom.xml index 995b0d4..be33687 100644 --- a/rt/rs/security/oauth-parent/oauth/pom.xml +++ b/rt/rs/security/oauth-parent/oauth/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf -3.1.11 +3.1.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/oauth-parent/oauth2-saml/pom.xml -- diff --git a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml index 8034419..8c7762b 100644 --- a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf -3.1.11 +3.1.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/oauth-parent/oauth2/pom.xml -- diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index 37f08b9..e04812c 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf -3.1.11 +3.1.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/oauth-parent/pom.xml -- diff --git a/rt/rs/security/oauth-parent/pom.xml b/rt/rs/security/oauth-parent/pom.xml index 9bde5bc..64c96ef 100644 --- a/rt/rs/security/oauth-parent/pom.xml +++ b/rt/rs/security/oauth-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11 +3.1.12-SNAPSHOT ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/pom.xml -- diff --git a/rt/rs/security/pom.xml b/rt/rs/security/pom.xml index 5a67899..79e6e58 100644 --- a/rt/rs/security/pom.xml +++ b/rt/rs/security/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt-rs -3.1.11 +3.1.12-SNAPSHOT xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/sso/oidc/pom.xml -- diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index 7e8d7fe..0c0f4b6 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11 +3.1.12-SNAPSHOT ../../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/rt/rs/security/sso/saml/pom.xml -- diff --git a/rt/rs/security/sso/saml/pom.xml b/rt/rs/security/sso/saml/pom.xml index f
[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.11
http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
--
diff --git
a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
index a647c27..ee15c84 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11-SNAPSHOT
+3.1.11
${project.version}
@@ -59,22 +59,22 @@
org.apache.cxf
cxf-rt-javascript
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11-SNAPSHOT
+3.1.11
org.springframework
http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
--
diff --git
a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
index 080ba90..aadac20 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11-SNAPSHOT
+3.1.11
${project.version}
@@ -111,22 +111,22 @@
org.apache.cxf
cxf-rt-javascript
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11-SNAPSHOT
+3.1.11
http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/distribution/src/main/release/samples/js_client/pom.xml
--
diff --git a/distribution/src/main/release/samples/js_client/pom.xml
b/distribution/src/main/release/samples/js_client/pom.xml
index 681d074..55dd122 100644
--- a/distribution/src/main/release/samples/js_client/pom.xml
+++ b/distribution/src/main/release/samples/js_client/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11-SNAPSHOT
+3.1.11
${project.version}
@@ -113,22 +113,22 @@
org.apache.cxf
cxf-rt-javascript
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11-SNAPSHOT
+3.1.11
rhino
http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/distribution/src/main/release/samples/js_provider/pom.xml
--
diff --git a/distribution/src/main/release/samples/js_provider/pom.xml
b/distribution/src/main/release/samples/js_provider/pom.xml
index 4a82322..ed84be3 100644
--- a/distribution/src/main/release/samples/js_provider/pom.xml
+++ b/distribution/src/main/release/samples/js_provider/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11-SNAPSHOT
+3.1.11
${project.version}
@@ -128,18 +128,18 @@
org.apache.cxf
cxf-rt-frontend-js
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http
-3.1.11-SNAPSHOT
+3.1.11
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11-SNAPSHOT
+3.1.11
http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
[6/6] 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/99e6c4fa Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/99e6c4fa Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/99e6c4fa Branch: refs/heads/3.1.x-fixes Commit: 99e6c4fa038ef2a8beeac4873876b5cf8a45c31d Parents: df51c99 Author: Daniel Kulp Authored: Wed Apr 5 16:02:53 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 16:02:53 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_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 +- .../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_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml
[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
--
diff --git
a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
index ee15c84..f4ab6b4 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11
+3.1.12-SNAPSHOT
${project.version}
@@ -59,22 +59,22 @@
org.apache.cxf
cxf-rt-javascript
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11
+3.1.12-SNAPSHOT
org.springframework
http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
--
diff --git
a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
index aadac20..b4eba53 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11
+3.1.12-SNAPSHOT
${project.version}
@@ -111,22 +111,22 @@
org.apache.cxf
cxf-rt-javascript
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11
+3.1.12-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/distribution/src/main/release/samples/js_client/pom.xml
--
diff --git a/distribution/src/main/release/samples/js_client/pom.xml
b/distribution/src/main/release/samples/js_client/pom.xml
index 55dd122..99961e6 100644
--- a/distribution/src/main/release/samples/js_client/pom.xml
+++ b/distribution/src/main/release/samples/js_client/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11
+3.1.12-SNAPSHOT
${project.version}
@@ -113,22 +113,22 @@
org.apache.cxf
cxf-rt-javascript
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxws
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11
+3.1.12-SNAPSHOT
rhino
http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/distribution/src/main/release/samples/js_provider/pom.xml
--
diff --git a/distribution/src/main/release/samples/js_provider/pom.xml
b/distribution/src/main/release/samples/js_provider/pom.xml
index ed84be3..6664833 100644
--- a/distribution/src/main/release/samples/js_provider/pom.xml
+++ b/distribution/src/main/release/samples/js_provider/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.1.11
+3.1.12-SNAPSHOT
${project.version}
@@ -128,18 +128,18 @@
org.apache.cxf
cxf-rt-frontend-js
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http
-3.1.11
+3.1.12-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-3.1.11
+3.1.12-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/cxf/blob/99e6c4fa/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.11
[maven-release-plugin] prepare release cxf-3.1.11 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/df51c99d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/df51c99d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/df51c99d Branch: refs/heads/3.1.x-fixes Commit: df51c99d9a708974a124052bb965494797c22e8c Parents: 2be6949 Author: Daniel Kulp Authored: Wed Apr 5 16:02:48 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 16:02:48 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_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 +- .../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_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml| 14 +++
[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.11
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 2be69493d -> 99e6c4fa0 http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/jose-parent/jose-jaxrs/pom.xml -- diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml index 5c3f86a..d6581cf 100644 --- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml +++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11-SNAPSHOT +3.1.11 ../../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/jose-parent/jose/pom.xml -- diff --git a/rt/rs/security/jose-parent/jose/pom.xml b/rt/rs/security/jose-parent/jose/pom.xml index 52223e3..b88db2f 100644 --- a/rt/rs/security/jose-parent/jose/pom.xml +++ b/rt/rs/security/jose-parent/jose/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11-SNAPSHOT +3.1.11 ../../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/jose-parent/pom.xml -- diff --git a/rt/rs/security/jose-parent/pom.xml b/rt/rs/security/jose-parent/pom.xml index 62b6182..7459932 100644 --- a/rt/rs/security/jose-parent/pom.xml +++ b/rt/rs/security/jose-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt-rs-security -3.1.11-SNAPSHOT +3.1.11 jose http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/oauth-parent/oauth/pom.xml -- diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml b/rt/rs/security/oauth-parent/oauth/pom.xml index 12261d3..995b0d4 100644 --- a/rt/rs/security/oauth-parent/oauth/pom.xml +++ b/rt/rs/security/oauth-parent/oauth/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf -3.1.11-SNAPSHOT +3.1.11 ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/oauth-parent/oauth2-saml/pom.xml -- diff --git a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml index e0883fe..8034419 100644 --- a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf -3.1.11-SNAPSHOT +3.1.11 ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/oauth-parent/oauth2/pom.xml -- diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index bf7cb6b..37f08b9 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf -3.1.11-SNAPSHOT +3.1.11 ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/oauth-parent/pom.xml -- diff --git a/rt/rs/security/oauth-parent/pom.xml b/rt/rs/security/oauth-parent/pom.xml index 7283630..9bde5bc 100644 --- a/rt/rs/security/oauth-parent/pom.xml +++ b/rt/rs/security/oauth-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11-SNAPSHOT +3.1.11 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/pom.xml -- diff --git a/rt/rs/security/pom.xml b/rt/rs/security/pom.xml index d575ec0..5a67899 100644 --- a/rt/rs/security/pom.xml +++ b/rt/rs/security/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt-rs -3.1.11-SNAPSHOT +3.1.11 xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/sso/oidc/pom.xml -- diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index ac4400c..7e8d7fe 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.11-SNAPSHOT +3.1.11 ../../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/df51c99d/rt/rs/security/sso/saml/pom.xml -- di
[cxf] Git Push Summary
Repository: cxf Updated Tags: refs/tags/cxf-3.1.11 [created] 2ae648327
[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.13
[maven-release-plugin] prepare release cxf-3.0.13 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e58227cd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e58227cd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e58227cd Branch: refs/heads/3.0.x-fixes Commit: e58227cd53c8e4526bb3a75b37e4afdb7add6ddf Parents: ec35007 Author: Daniel Kulp Authored: Wed Apr 5 15:50:12 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 15:50:12 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 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 10 +- .../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 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../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 .../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/ws_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml| 14 +++--- .../src/main/release/samples/ws_policy/pom.xml | 8 distribution/src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml| 16 .../samples/ws_security/sign_enc_policy/pom.xml | 2 +- .../src/main/release/samples/ws_security/ut/pom.xml | 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 2 +- .../src/main/release/samples/wsdl_first/pom.xml | 6 +++--- .../samples/wsdl_first_dynamic_client/pom.xml | 8 .../main/release/samples/wsdl_first_https/pom.xml | 2 +- .../release/samples/wsdl_first_pure_xml/pom.xml | 8 .../main/release/samples/wsdl_first_rpclit/pom.xml | 8 .../main/release/samples/wsdl_first_soap12
[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/pom.xml -- diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index ef17540..815ffe7 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf.services cxf-services -3.0.13 +3.0.14-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-client/pom.xml -- diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml index 242c52f..c15e862 100644 --- a/services/xkms/xkms-client/pom.xml +++ b/services/xkms/xkms-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-common/pom.xml -- diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml index 5f7d272..1df31c1 100644 --- a/services/xkms/xkms-common/pom.xml +++ b/services/xkms/xkms-common/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-features/pom.xml -- diff --git a/services/xkms/xkms-features/pom.xml b/services/xkms/xkms-features/pom.xml index a08b339..e329dae 100644 --- a/services/xkms/xkms-features/pom.xml +++ b/services/xkms/xkms-features/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-itests/pom.xml -- diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml index 065e7a8..086f7dd 100644 --- a/services/xkms/xkms-itests/pom.xml +++ b/services/xkms/xkms-itests/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-osgi/pom.xml -- diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml index 7193aa8..7b1a23b 100644 --- a/services/xkms/xkms-osgi/pom.xml +++ b/services/xkms/xkms-osgi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-service/pom.xml -- diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml index f036029..4e1cd66 100644 --- a/services/xkms/xkms-service/pom.xml +++ b/services/xkms/xkms-service/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-war/pom.xml -- diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml index e212b20..f20d125 100644 --- a/services/xkms/xkms-war/pom.xml +++ b/services/xkms/xkms-war/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-x509-handlers/pom.xml -- diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index 1f7fdfc..f3da5aa 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13 +3.0.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/services/xkms/xkms-x509-repo-ldap/pom.xml -- diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml index 8c6b578..ea25daa 100644 --- a/services/xkms/xkms-x509-repo-ldap/pom.xml +++ b/services/xkms/xkms-x509-repo-ldap/pom.xml @@ -3,7 +3,7 @@ org.apache.cx
[6/6] 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/8499493d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8499493d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8499493d Branch: refs/heads/3.0.x-fixes Commit: 8499493df81558321b0663eca467851236d8776a Parents: e58227c Author: Daniel Kulp Authored: Wed Apr 5 15:50:15 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 15:50:15 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 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 10 +- .../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 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../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 .../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/ws_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml| 14 +++--- .../src/main/release/samples/ws_policy/pom.xml | 8 distribution/src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml| 16 .../samples/ws_security/sign_enc_policy/pom.xml | 2 +- .../src/main/release/samples/ws_security/ut/pom.xml | 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 2 +- .../src/main/release/samples/wsdl_first/pom.xml | 6 +++--- .../samples/wsdl_first_dynamic_client/pom.xml | 8 .../main/release/samples/wsdl_first_https/pom.xml | 2 +- .../release/samples/wsdl_first_pure_xml/pom.xml | 8 .../main/release/samples/wsdl_first_rpclit/pom.xml | 8 .../main/release/samples/wsdl_
[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.13
http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/distribution/src/main/release/samples/ws_addressing/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_addressing/pom.xml
b/distribution/src/main/release/samples/ws_addressing/pom.xml
index 40ac565..f7cb6cd 100644
--- a/distribution/src/main/release/samples/ws_addressing/pom.xml
+++ b/distribution/src/main/release/samples/ws_addressing/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13-SNAPSHOT
+3.0.13
${project.version}
@@ -126,17 +126,17 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf
cxf-rt-transports-http
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf
cxf-rt-transports-http-jetty
-3.0.13-SNAPSHOT
+3.0.13
org.springframework
http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/distribution/src/main/release/samples/ws_discovery/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_discovery/pom.xml
b/distribution/src/main/release/samples/ws_discovery/pom.xml
index 3ddf03b..910204b 100644
--- a/distribution/src/main/release/samples/ws_discovery/pom.xml
+++ b/distribution/src/main/release/samples/ws_discovery/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13-SNAPSHOT
+3.0.13
${project.version}
@@ -38,22 +38,22 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf
cxf-rt-transports-http
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf.services.ws-discovery
cxf-services-ws-discovery-api
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf.services.ws-discovery
cxf-services-ws-discovery-service
-3.0.13-SNAPSHOT
+3.0.13
http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/distribution/src/main/release/samples/ws_eventing/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml
b/distribution/src/main/release/samples/ws_eventing/pom.xml
index 8933bdb..9cdd526 100644
--- a/distribution/src/main/release/samples/ws_eventing/pom.xml
+++ b/distribution/src/main/release/samples/ws_eventing/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13-SNAPSHOT
+3.0.13
http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/distribution/src/main/release/samples/ws_notification/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml
b/distribution/src/main/release/samples/ws_notification/pom.xml
index a9dbeb9..0b880af 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13-SNAPSHOT
+3.0.13
${project.version}
@@ -93,32 +93,32 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf
cxf-rt-transports-http
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf
cxf-rt-transports-http-jetty
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf
cxf-rt-ws-addr
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf
cxf-rt-ws-policy
-3.0.13-SNAPSHOT
+3.0.13
org.apache.cxf.services.wsn
cxf-services-wsn-core
-3.0.13-SNAPSHOT
+3.0.13
http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/distribution/src/main/release/samples/ws_policy/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml
b/distribution/src/main/release/samples/ws_policy/pom.xml
index ca2cacf..f838873 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.sampl
[cxf] Git Push Summary
Repository: cxf Updated Tags: refs/tags/cxf-3.0.13 [created] 444c58f6d
[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.13
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes ec35007b8 -> 8499493df http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/pom.xml -- diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index a38c7da..ef17540 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf.services cxf-services -3.0.13-SNAPSHOT +3.0.13 ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-client/pom.xml -- diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml index 79614eb..242c52f 100644 --- a/services/xkms/xkms-client/pom.xml +++ b/services/xkms/xkms-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-common/pom.xml -- diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml index 3b187f6..5f7d272 100644 --- a/services/xkms/xkms-common/pom.xml +++ b/services/xkms/xkms-common/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-features/pom.xml -- diff --git a/services/xkms/xkms-features/pom.xml b/services/xkms/xkms-features/pom.xml index a87b3e0..a08b339 100644 --- a/services/xkms/xkms-features/pom.xml +++ b/services/xkms/xkms-features/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-itests/pom.xml -- diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml index ec69c7f..065e7a8 100644 --- a/services/xkms/xkms-itests/pom.xml +++ b/services/xkms/xkms-itests/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-osgi/pom.xml -- diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml index 96605d9..7193aa8 100644 --- a/services/xkms/xkms-osgi/pom.xml +++ b/services/xkms/xkms-osgi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-service/pom.xml -- diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml index 466705c..f036029 100644 --- a/services/xkms/xkms-service/pom.xml +++ b/services/xkms/xkms-service/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-war/pom.xml -- diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml index 64f887e..e212b20 100644 --- a/services/xkms/xkms-war/pom.xml +++ b/services/xkms/xkms-war/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-x509-handlers/pom.xml -- diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index e39028d..1f7fdfc 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.13-SNAPSHOT +3.0.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/e58227cd/services/xkms/xkms-x509-repo-ldap/pom.xml -- diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml index 97266ea..8c6b578 100644 --- a/services/xkms/xkms-x509-repo-ldap/pom.xml +++ b/se
[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/distribution/src/main/release/samples/ws_addressing/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_addressing/pom.xml
b/distribution/src/main/release/samples/ws_addressing/pom.xml
index f7cb6cd..c930327 100644
--- a/distribution/src/main/release/samples/ws_addressing/pom.xml
+++ b/distribution/src/main/release/samples/ws_addressing/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13
+3.0.14-SNAPSHOT
${project.version}
@@ -126,17 +126,17 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-3.0.13
+3.0.14-SNAPSHOT
org.springframework
http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/distribution/src/main/release/samples/ws_discovery/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_discovery/pom.xml
b/distribution/src/main/release/samples/ws_discovery/pom.xml
index 910204b..2f81c94 100644
--- a/distribution/src/main/release/samples/ws_discovery/pom.xml
+++ b/distribution/src/main/release/samples/ws_discovery/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13
+3.0.14-SNAPSHOT
${project.version}
@@ -38,22 +38,22 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf.services.ws-discovery
cxf-services-ws-discovery-api
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf.services.ws-discovery
cxf-services-ws-discovery-service
-3.0.13
+3.0.14-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/distribution/src/main/release/samples/ws_eventing/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml
b/distribution/src/main/release/samples/ws_eventing/pom.xml
index 9cdd526..fce7c40 100644
--- a/distribution/src/main/release/samples/ws_eventing/pom.xml
+++ b/distribution/src/main/release/samples/ws_eventing/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13
+3.0.14-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/distribution/src/main/release/samples/ws_notification/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml
b/distribution/src/main/release/samples/ws_notification/pom.xml
index 0b880af..8a1ecbe 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.samples
cxf-samples
-3.0.13
+3.0.14-SNAPSHOT
${project.version}
@@ -93,32 +93,32 @@
org.apache.cxf
cxf-rt-frontend-jaxws
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf
cxf-rt-ws-addr
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf
cxf-rt-ws-policy
-3.0.13
+3.0.14-SNAPSHOT
org.apache.cxf.services.wsn
cxf-services-wsn-core
-3.0.13
+3.0.14-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/cxf/blob/8499493d/distribution/src/main/release/samples/ws_policy/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml
b/distribution/src/main/release/samples/ws_policy/pom.xml
index f838873..478445e 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -25,7 +25,7 @@
org.apache.cxf.sampl
cxf git commit: Update 3.1.11 release notes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 0ba98f03e -> 2be69493d Update 3.1.11 release notes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2be69493 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2be69493 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2be69493 Branch: refs/heads/3.1.x-fixes Commit: 2be69493d3e4f5f2815ffcf5ce7e8a1e81fa8d67 Parents: 0ba98f0 Author: Daniel Kulp Authored: Wed Apr 5 15:26:21 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 15:26:21 2017 -0400 -- distribution/src/main/release/release_notes.txt | 149 +-- 1 file changed, 101 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2be69493/distribution/src/main/release/release_notes.txt -- diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index d20e6d3..1669c1b 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,8 +1,8 @@ -Apache CXF 3.1.10 Release Notes +Apache CXF 3.1.11 Release Notes 1. Overview -The 3.1.10 version of Apache CXF is a significant new version of CXF +The 3.1.x versions of Apache CXF is a significant new version of CXF that provides several new features and enhancements. New features include: @@ -25,7 +25,7 @@ http://cxf.apache.org/docs/31-migration-guide.html for further information and requirements for upgrading from earlier versions of CXF. -3.1.10 fixes over 25 JIRA issues reported by users and the community. +3.1.11 fixes over 100 JIRA issues reported by users and the community. 2. Installation Prerequisites @@ -70,55 +70,108 @@ to 3.1. 7. Specific issues, features, and improvements fixed in this version +** Sub-task +* [CXF-6942] - cxf-codegen-plugin wsdlArtifact failed to resolve WSDL ** Bug -* [CXF-5436] - Poorly crafted response caused NullPointerException when processing incoming message -* [CXF-6962] - Basic auth uses UTF-8 for the encoded password when it should use ISO-8859-1 -* [CXF-7166] - NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy with IBM-JDK 8 -* [CXF-7174] - NullPointerException when Content-Type is not specified in the http request -* [CXF-7179] - Unable to set ServerConnector in JettyHTTPServerEngine using jetty 9 -* [CXF-7183] - CXF Blueprint namespace don't work well with blueprint-core 1.7.x -* [CXF-7185] - Xml validation with Mtom enabled is not working with french locale -* [CXF-7189] - org.apache.cxf.jaxrs.ext.multipart.Attachment.getObject do not rethrow exception -* [CXF-7204] - CXF 3.1.9 does not support Spring 3.2, enforces Spring 4.1 -* [CXF-7205] - In JmsPullPoint create session for producer and consumer separately and synchronized the session but not the whole method to avoid deadlock -* [CXF-7207] - JCacheOAuthDataProvider can leak jcache component(s) -* [CXF-7210] - StringIndexOutOfBoundsException during construction of failover request -* [CXF-7213] - FIQL Parser: Crashes when parsing a collection (java.util.Set) inside an object -* [CXF-7220] - WS-Security StaX processing fails on whitespace after the SOAP Body opening tag -* [CXF-7221] - NullPointerException when using org.apache.cxf.logging.enable and logging interceptors -* [CXF-7228] - ProviderInfo rarely supports proxies -* [CXF-7230] - Unable to disable access to default wadl genearated by cxf -* [CXF-7231] - Java HttpUrlConnection Reflection Fix to support custom verbs does not work with HTTPS - +* [CXF-3574] - JMSPropertyType should support non string properties +* [CXF-4028] - X509TokenValidator uses signature-crypto-provider instead of encryption-crypto-provider +* [CXF-4821] - UseAsyncMethod annotation does not work with Provider interface +* [CXF-4851] - AttachmentDeserializer cannot handle attachments with Quoted Printable content transfer encoding in initializeRootMessage +* [CXF-5096] - cxf-utils.js has incorrect error handling +* [CXF-5637] - WSDL First approach : Xsd import in wsdl causing validation errors while generating client. +* [CXF-5697] - WHICH_JARS inconsistent with lib/ contents for 2.7.11 +* [CXF-5743] - Full path is missing from schema included in imported schema when parsing WSDL +* [CXF-5754] - JMSConduit - temporary queue not beeing closed if relpyMessage is null (timeout) +* [CXF-5800] - Exceptions and response problems when using schema-validation and base64Binary element (with or without MTOM) +* [CXF-6029] - Questionable exception handling +* [CXF-6161] - wsdl2java can use invalid local filen
cxf git commit: Update 3.0.13 release notes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 53e7752ff -> ec35007b8
Update 3.0.13 release notes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ec35007b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ec35007b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ec35007b
Branch: refs/heads/3.0.x-fixes
Commit: ec35007b8ee491466a7e46a546652a6ac11e821a
Parents: 53e7752
Author: Daniel Kulp
Authored: Wed Apr 5 15:21:25 2017 -0400
Committer: Daniel Kulp
Committed: Wed Apr 5 15:21:25 2017 -0400
--
distribution/src/main/release/release_notes.txt | 106 +++
1 file changed, 60 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec35007b/distribution/src/main/release/release_notes.txt
--
diff --git a/distribution/src/main/release/release_notes.txt
b/distribution/src/main/release/release_notes.txt
index 996afae..f659373 100644
--- a/distribution/src/main/release/release_notes.txt
+++ b/distribution/src/main/release/release_notes.txt
@@ -1,4 +1,4 @@
-Apache CXF 3.0.12 Release Notes
+Apache CXF 3.0.13 Release Notes
1. Overview
@@ -22,7 +22,7 @@ Users are encourage to review the migration guide at:
http://cxf.apache.org/docs/30-migration-guide.html
for further information and requirements for upgrading from 2.7.x.
-3.0.12 fixes over 17 JIRA issues reported by users and the community.
+3.0.13 fixes over 58 JIRA issues reported by users and the community.
@@ -65,51 +65,65 @@ for caveats when upgrading from CXF 2.7.x to 3.0.0
7. Specific issues, features, and improvements fixed in this version
-
+** Sub-task
+* [CXF-6942] - cxf-codegen-plugin wsdlArtifact failed to resolve WSDL
** Bug
-* [CXF-6216] - No output sanitizing in FormattedServiceListWriter
-* [CXF-6604] - Sporadic ClassCastException in
AsymmetricBindingHandler#doSignBeforeEncrypt
-* [CXF-7015] - Invalid URL encoding causes error 500
-* [CXF-7091] - JAXRSBeanValidationOutInterceptor fails to validate
Response entity on the 2nd try
-* [CXF-7099] - Technical user should be the SAML Subject for the ActAs
use-case
-* [CXF-7114] - Disable HTTP TRACE method on CXF http-jetty transport
-* [CXF-7116] - AsyncResponse.resume() infinitely hangs up after first call
-* [CXF-7121] - Need to log a warning when async method returns a non-void
type
-* [CXF-7123] - JAXRS Clients will hang if they do not set a oneway
exchange status before the call and 202 is returned
-* [CXF-7124] - PackageUtils.getSharedPackageName(List>) has bug
-* [CXF-7135] - ConcurrentModificationException in
MessageImpl.calcContextCache() when using JMS Transport and JAXRS Client
-* [CXF-7139] - BufferOverflowException when decoding a parameter values
with a trailing %
-* [CXF-7140] - Multiple calls to AsyncResponse.cancel() returns different
values
-* [CXF-7148] - Race Condition while handling symmetric key in
SymmetricBindingHandler
-* [CXF-7154] - WSDL2JAVA Allows Unsafe Characters in to Generated Javadocs
-* [CXF-7155] - JAXRSOutInterceptor do not close CachedOutputStream when
out buffering is enabled
-* [CXF-7162] - Inconsistent reading of formatted xml when validating schema
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+* [CXF-3574] - JMSPropertyType should support non string properties
+* [CXF-4821] - UseAsyncMethod annotation does not work with Provider interface
+* [CXF-4851] - AttachmentDeserializer cannot handle attachments with Quoted
Printable content transfer encoding in initializeRootMessage
+* [CXF-5436] - Poorly crafted response caused NullPointerException when
processing incoming message
+* [CXF-5697] - WHICH_JARS inconsistent with lib/ contents for 2.7.11
+* [CXF-5743] - Full path is missing from schema included in imported schema
when parsing WSDL
+* [CXF-5754] - JMSConduit - temporary queue not beeing closed if relpyMessage
is null (timeout)
+* [CXF-5800] - Exceptions and response problems when using schema-validation
and base64Binary element (with or without MTOM)
+* [CXF-6029] - Questionable exception handling
+* [CXF-6161] - wsdl2java can use invalid local filename when working with wsdl
imports
+* [CXF-6523] - org.apache.cxf.interceptor.Fault: wrong number of arguments
(due to explicit soap header)
+* [CXF-6590] - MAPCodec: memory leak with sync client when soapfaults returned
from endpoint
+* [CXF-6598] - java.lang.IndexOutOfBoundsException when processing response
+* [CXF-6672] - PollingMessageListenerContainer does fail silently upon
java.lang.Error
+* [CXF-6717] - Live WSDL regression: Fails updating schemaLocation in
catalog-imported schema
+* [CXF-6731] - wsdl2java returning error "'{A_Type}' is already defined" from
[1/3] cxf git commit: [CXF-6919] For soap 1.2, make sure the fault code is valid
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes b94ebcca7 -> 53e7752ff
[CXF-6919] For soap 1.2, make sure the fault code is valid
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69247884
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69247884
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69247884
Branch: refs/heads/3.0.x-fixes
Commit: 6924788445ce33477162dd6076afe683c78babe2
Parents: b94ebcc
Author: Daniel Kulp
Authored: Wed Apr 5 11:29:05 2017 -0400
Committer: Daniel Kulp
Committed: Wed Apr 5 15:18:36 2017 -0400
--
.../apache/cxf/binding/soap/saaj/SAAJUtils.java | 37 ++--
1 file changed, 26 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/69247884/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
index 89cb7f7..0215519 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
@@ -21,12 +21,14 @@ package org.apache.cxf.binding.soap.saaj;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
+import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.common.util.StringUtils;
/**
@@ -52,20 +54,33 @@ public final class SAAJUtils {
return m.getSOAPPart().getEnvelope().getBody();
}
}
+
public static void setFaultCode(SOAPFault f, QName code) throws
SOAPException {
-try {
-f.setFaultCode(code);
-} catch (Throwable t) {
-int count = 1;
-String pfx = "fc1";
-while (!StringUtils.isEmpty(f.getNamespaceURI(pfx))) {
-count++;
-pfx = "fc" + count;
+if (f.getNamespaceURI().equals(Soap12.SOAP_NAMESPACE)) {
+try {
+f.setFaultCode(code);
+} catch (SOAPException ex) {
+f.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
+f.appendFaultSubcode(code);
+}
+} else {
+try {
+f.setFaultCode(code);
+} catch (Throwable t) {
+int count = 1;
+String pfx = "fc1";
+while (!StringUtils.isEmpty(f.getNamespaceURI(pfx))) {
+count++;
+pfx = "fc" + count;
+}
+if (code.getNamespaceURI() != null &&
!"".equals(code.getNamespaceURI())) {
+f.addNamespaceDeclaration(pfx, code.getNamespaceURI());
+} else {
+f.addNamespaceDeclaration(pfx, f.getNamespaceURI());
+}
+f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-f.addNamespaceDeclaration(pfx, code.getNamespaceURI());
-f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-
}
public static SOAPElement adjustPrefix(SOAPElement e, String prefix) {
[3/3] 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/53e7752f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53e7752f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53e7752f Branch: refs/heads/3.0.x-fixes Commit: 53e7752ff28ff4a08a1dbd364cca3427389475e4 Parents: 33ee853 Author: Daniel Kulp Authored: Wed Apr 5 15:18:28 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 15:18:41 2017 -0400 -- .gitmergeinfo | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/53e7752f/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index d124dd1..e5e0045 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -66,6 +66,7 @@ B 0b7e0e914328aa7a78a2eab00bb1040c703e9b63 B 0b9097fbd1cddbb4a183e9448576bde2a6eb2589 B 0ba04d859c6df8b9d31163e7c65aa1addbb2 B 0ba19453f17be19aa2e46848b1908f776a6abb64 +B 0ba98f03e5d817f707bfde0d130a5385ed823c84 B 0bc42f47f79f2e301a6c8fe0c92acd945e43273b B 0bcc77743fad212fb54d119db3719858addcbabc B 0befccd8a70d7896d9210f554e19375e5d8cc168 @@ -80,6 +81,7 @@ B 0ceb6a1d93195310c3a9325bf80e4c88d6920755 B 0d0bc938103b0ea9311c3b73f6c385aa3e12260c B 0d2a6ccabc752708484e2b2c44deb5b48e71b76e B 0d72569d3fdd360e60d1fcea59c354b754f2a386 +B 0da892a50e692986afa80dd67526612471ad938b B 0dd29509e42fc412ec0cf214e66885d26da9850e B 0ddd071dd1e7c475d8a0463564a991d62c96e3b0 B 0de0309f28e1543660c763c158f4353d6d2189be @@ -226,6 +228,7 @@ B 22aeab948c344aee666cafbeb5979a2e99748843 B 22d0c244d3b60aafbd3c070e9599012019de486c B 2302aa5820661975bb04857fa6d48bb68bebb4f7 B 23112f714cc6c52bef8678739f216f5a8ef26d49 +B 2322ce566bf56d149c4582967883631b9e1a2b91 B 2345b6e4ff4adf48e9adf5e0b9245da3f7afa011 B 237ace40ea2c204f68848309b9483c322499b524 B 23849faa6058427381cd3a737d2f37b551db9938 @@ -542,6 +545,7 @@ B 4e787778cdf5f836a811a611e64334e9730720ef B 4edaad797a57d6968f5ba293b100b856a72c52ab B 4eec754b1bbd46e0142412cd37dbaf189c47f905 B 4efd6b4c188c7e7c94feb6afc943df831da43180 +B 4f48e495c2dd9cabc9b23959db0b656e7e2b54e9 B 4f542faeaff542c92f93833fa846d47d9b74a392 B 4f61ca801deed173c648b2d424ac231663acd704 B 4f70bdf4199a666829cf9c6c62c508d12afbe251 @@ -792,6 +796,7 @@ B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee B 75edfe9d21fd654d844e24038a72206b4e15457d B 7618c7501d6ba6275c10c3cf91c329184d0cef96 B 7646e930399aaf3e522cd9c3e7e67f9882a28eeb +B 76738db7dfd2b9a0375c49a96ae04c89c1084bf0 B 76e415b00a35a66b2254114b102b4259886f10cf B 770ea4c9b218ba34526fce5903feae6959c3366c B 772ca96b6c3e2ee569b538e8aebdb80777c900d7 @@ -972,6 +977,7 @@ B 93039ab86bea4f2bdac4e5eec4229d3271f4c7ec B 9320bea658e97e54d2bd9d47ad07313c388079f9 B 9344b093b8081a68c9f83f0c740d60508e99fd5e B 9368e4bc9fd4381ecd124da3de3b3d314a590a25 +B 93c969980c512d941dcdf97f2a68f6370132e624 B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2 B 945daf7e52fc754b6d3e700444cc5619cdc1a800 B 94a6c24399cfa0326edfeb669c770adee6f9c773 @@ -1981,6 +1987,7 @@ M be7f5239128e5255ce7d617e0fc62556f4f33459 M beae71f1d6d60921d79c7d2275dd8ce90bbd21e4 M bee82ba7d1766b555d965a75b3846ead4686239e M bfa97ebf03e8ab6b29129f31d76fa469b054f843 +M c5724b774580889fcdd1b75ca7e7dd762ccb M c014597c2d47243330d6119120a4a81c531cb62e M c090a8163c047bf3c89757afdf9bcbb7107b0818 M c1863fc29c037d01e827e3b2b1dca493fddf986d
[2/3] cxf git commit: [CXF-6768] Add ws-addr schema to catalog for offline support This closes #108
[CXF-6768] Add ws-addr schema to catalog for offline support This closes #108 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/33ee8532 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/33ee8532 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/33ee8532 Branch: refs/heads/3.0.x-fixes Commit: 33ee8532d90e8c8551821dfd1283e417225d80e8 Parents: 6924788 Author: Nick Birnie Authored: Tue Feb 16 17:15:03 2016 + Committer: Daniel Kulp Committed: Wed Apr 5 15:18:41 2017 -0400 -- .../main/resources/META-INF/jax-ws-catalog.xml | 7 + .../apache/cxf/ws/discovery/wsdl/ws-addr.xsd| 137 +++ 2 files changed, 144 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/33ee8532/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml -- diff --git a/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml b/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml new file mode 100644 index 000..c3c1540 --- /dev/null +++ b/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml @@ -0,0 +1,7 @@ + + +http://www.w3.org/2006/03/addressing/ws-addr.xsd"; +uri="classpath:/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd"/> + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/33ee8532/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd -- diff --git a/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd b/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd new file mode 100644 index 000..47362ed --- /dev/null +++ b/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd @@ -0,0 +1,137 @@ + + +http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://www.w3.org/2005/08/addressing"; targetNamespace="http://www.w3.org/2005/08/addressing"; blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.w3.org/2005/08/addressing/reply"/> + + + + + + + + + + + + http://www.w3.org/2005/08/addressing/reply"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[3/3] 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/0ba98f03 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0ba98f03 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0ba98f03 Branch: refs/heads/3.1.x-fixes Commit: 0ba98f03e5d817f707bfde0d130a5385ed823c84 Parents: d535938 Author: Daniel Kulp Authored: Wed Apr 5 15:16:39 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 15:16:39 2017 -0400 -- .gitmergeinfo | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/0ba98f03/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 341ae4c..0f5029e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -93,6 +93,7 @@ B 447f2dac6e160b5cd495558ca8855ed481396c63 B 44c608c205fd2fdac2f2fed9557c2c39730a44d6 B 45bc2219b761e671973acf297e0f37a1b8934c6c B 46438c487115889c4cadd86f70fd4109a0daa2b8 +B 46bd4b3e9b8365b5afe2310ba6225eb6c2abad12 B 4786e832573f1fcc07ed190ab21fdb2820348e4d B 47a431412dbd7669d89a70d6fed49053e70dfed1 B 4a30203a08ea11f96b52b454220ed5ce9419e3be @@ -126,6 +127,7 @@ B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1 B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095 B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2 B 604167d9f0cfc67e01219a19a95353176ce38f79 +B 61a361610d57aaf18f2c574916621ac09af45151 B 62060f8bc1f4d85b77ff136cb0576049312b8541 B 629af817f4762a12623e76fb7f7baefe98482719 B 63daada33c83c7900d5678ad495a0e764b3506de @@ -199,6 +201,7 @@ B 9bb1148e093b5293454cd978673f5526443d1f55 B 9bcde744c2ad59a67c278d155f2ba22e35bacb7d B 9c7ccd5cc10b1d4a6f1817a6c37c99b8f19d15a1 B 9f39272a5f92c8bc27a8d3adc4da89f0eb30a54b +B 9f82ccd9d9a6f7db5b555c4040c41faf177f8e0b B a05d75086453fa18ca4f4733f7cc8819693c786b B a219766354d6aee53c7f7a4da91f434af552b437 B a261507ebd3104b1a00298801ec9815ed1e7a728 @@ -371,6 +374,7 @@ M 20d0a2811c15cb65a402eb063e1359236d7014ea M 21031e3ab2ae227540e2a078d0336d894361acba M 2538ae42fb0c774023deed5264291b2fe6658cb8 M 26edcd457ea507075a4c82e2787f11f11a432876 +M 29af9d48cee34521fcc9bc27a79d15f5781916a9 M 2b1607831ccf97909122eae9247116d9a075c7cf M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6 M 2ea81b5f7dd84d4d179a2d9ac77c5660a8aeb3c9
[2/3] cxf git commit: [CXF-6768] Add ws-addr schema to catalog for offline support This closes #108
[CXF-6768] Add ws-addr schema to catalog for offline support This closes #108 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d5359385 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d5359385 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d5359385 Branch: refs/heads/3.1.x-fixes Commit: d535938537655219b208c34d3ff267fd945536be Parents: c57 Author: Nick Birnie Authored: Tue Feb 16 17:15:03 2016 + Committer: Daniel Kulp Committed: Wed Apr 5 15:16:39 2017 -0400 -- .../main/resources/META-INF/jax-ws-catalog.xml | 7 + .../apache/cxf/ws/discovery/wsdl/ws-addr.xsd| 137 +++ 2 files changed, 144 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/d5359385/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml -- diff --git a/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml b/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml new file mode 100644 index 000..c3c1540 --- /dev/null +++ b/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml @@ -0,0 +1,7 @@ + + +http://www.w3.org/2006/03/addressing/ws-addr.xsd"; +uri="classpath:/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd"/> + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/d5359385/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd -- diff --git a/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd b/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd new file mode 100644 index 000..47362ed --- /dev/null +++ b/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd @@ -0,0 +1,137 @@ + + +http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://www.w3.org/2005/08/addressing"; targetNamespace="http://www.w3.org/2005/08/addressing"; blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.w3.org/2005/08/addressing/reply"/> + + + + + + + + + + + + http://www.w3.org/2005/08/addressing/reply"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[1/3] cxf git commit: [CXF-6919] For soap 1.2, make sure the fault code is valid
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 0da892a50 -> 0ba98f03e
[CXF-6919] For soap 1.2, make sure the fault code is valid
# Conflicts:
#
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c572
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c572
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c572
Branch: refs/heads/3.1.x-fixes
Commit: c5724b774580889fcdd1b75ca7e7dd762ccb
Parents: 0da892a
Author: Daniel Kulp
Authored: Wed Apr 5 11:29:05 2017 -0400
Committer: Daniel Kulp
Committed: Wed Apr 5 15:16:37 2017 -0400
--
.../apache/cxf/binding/soap/saaj/SAAJUtils.java | 39 +---
1 file changed, 25 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c572/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
index f1abe19..0215519 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
@@ -21,12 +21,14 @@ package org.apache.cxf.binding.soap.saaj;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
+import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.common.util.StringUtils;
/**
@@ -52,24 +54,33 @@ public final class SAAJUtils {
return m.getSOAPPart().getEnvelope().getBody();
}
}
+
public static void setFaultCode(SOAPFault f, QName code) throws
SOAPException {
-try {
-f.setFaultCode(code);
-} catch (Throwable t) {
-int count = 1;
-String pfx = "fc1";
-while (!StringUtils.isEmpty(f.getNamespaceURI(pfx))) {
-count++;
-pfx = "fc" + count;
+if (f.getNamespaceURI().equals(Soap12.SOAP_NAMESPACE)) {
+try {
+f.setFaultCode(code);
+} catch (SOAPException ex) {
+f.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
+f.appendFaultSubcode(code);
}
-if (code.getNamespaceURI() != null &&
!"".equals(code.getNamespaceURI())) {
-f.addNamespaceDeclaration(pfx, code.getNamespaceURI());
-} else {
-f.addNamespaceDeclaration(pfx, f.getNamespaceURI());
+} else {
+try {
+f.setFaultCode(code);
+} catch (Throwable t) {
+int count = 1;
+String pfx = "fc1";
+while (!StringUtils.isEmpty(f.getNamespaceURI(pfx))) {
+count++;
+pfx = "fc" + count;
+}
+if (code.getNamespaceURI() != null &&
!"".equals(code.getNamespaceURI())) {
+f.addNamespaceDeclaration(pfx, code.getNamespaceURI());
+} else {
+f.addNamespaceDeclaration(pfx, f.getNamespaceURI());
+}
+f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-
}
public static SOAPElement adjustPrefix(SOAPElement e, String prefix) {
[2/2] cxf git commit: [CXF-6919] For soap 1.2, make sure the fault code is valid
[CXF-6919] For soap 1.2, make sure the fault code is valid
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/29af9d48
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/29af9d48
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/29af9d48
Branch: refs/heads/master
Commit: 29af9d48cee34521fcc9bc27a79d15f5781916a9
Parents: 60d2577
Author: Daniel Kulp
Authored: Wed Apr 5 11:29:05 2017 -0400
Committer: Daniel Kulp
Committed: Wed Apr 5 14:49:11 2017 -0400
--
.../apache/cxf/binding/soap/saaj/SAAJUtils.java | 39 +---
1 file changed, 25 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/29af9d48/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
index c29af06..96a1701 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
@@ -21,12 +21,14 @@ package org.apache.cxf.binding.soap.saaj;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
+import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.common.util.StringUtils;
/**
@@ -52,24 +54,33 @@ public final class SAAJUtils {
return m.getSOAPPart().getEnvelope().getBody();
}
}
+
public static void setFaultCode(SOAPFault f, QName code) throws
SOAPException {
-try {
-f.setFaultCode(code);
-} catch (Throwable t) {
-int count = 1;
-String pfx = "fc1";
-while (!StringUtils.isEmpty(f.getNamespaceURI(pfx))) {
-count++;
-pfx = "fc" + count;
+if (f.getNamespaceURI().equals(Soap12.SOAP_NAMESPACE)) {
+try {
+f.setFaultCode(code);
+} catch (SOAPException ex) {
+f.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
+f.appendFaultSubcode(code);
}
-if (code.getNamespaceURI() != null &&
!"".equals(code.getNamespaceURI())) {
-f.addNamespaceDeclaration(pfx, code.getNamespaceURI());
-} else {
-f.addNamespaceDeclaration(pfx, f.getNamespaceURI());
+} else {
+try {
+f.setFaultCode(code);
+} catch (Throwable t) {
+int count = 1;
+String pfx = "fc1";
+while (!StringUtils.isEmpty(f.getNamespaceURI(pfx))) {
+count++;
+pfx = "fc" + count;
+}
+if (code.getNamespaceURI() != null &&
!"".equals(code.getNamespaceURI())) {
+f.addNamespaceDeclaration(pfx, code.getNamespaceURI());
+} else {
+f.addNamespaceDeclaration(pfx, f.getNamespaceURI());
+}
+f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-
}
public static SOAPElement adjustPrefix(SOAPElement e, String prefix) {
[1/2] cxf git commit: [CXF-6768] Add ws-addr schema to catalog for offline support This closes #108
Repository: cxf Updated Branches: refs/heads/master 60d257751 -> 8dd8b14da [CXF-6768] Add ws-addr schema to catalog for offline support This closes #108 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8dd8b14d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8dd8b14d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8dd8b14d Branch: refs/heads/master Commit: 8dd8b14da69ae7a56d0c39c3c1e6405394763419 Parents: 29af9d4 Author: Nick Birnie Authored: Tue Feb 16 17:15:03 2016 + Committer: Daniel Kulp Committed: Wed Apr 5 14:49:11 2017 -0400 -- .../main/resources/META-INF/jax-ws-catalog.xml | 7 + .../apache/cxf/ws/discovery/wsdl/ws-addr.xsd| 137 +++ 2 files changed, 144 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8dd8b14d/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml -- diff --git a/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml b/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml new file mode 100644 index 000..c3c1540 --- /dev/null +++ b/services/ws-discovery/ws-discovery-api/src/main/resources/META-INF/jax-ws-catalog.xml @@ -0,0 +1,7 @@ + + +http://www.w3.org/2006/03/addressing/ws-addr.xsd"; +uri="classpath:/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd"/> + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/8dd8b14d/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd -- diff --git a/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd b/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd new file mode 100644 index 000..47362ed --- /dev/null +++ b/services/ws-discovery/ws-discovery-api/src/main/resources/org/apache/cxf/ws/discovery/wsdl/ws-addr.xsd @@ -0,0 +1,137 @@ + + +http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://www.w3.org/2005/08/addressing"; targetNamespace="http://www.w3.org/2005/08/addressing"; blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.w3.org/2005/08/addressing/reply"/> + + + + + + + + + + + + http://www.w3.org/2005/08/addressing/reply"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
cxf git commit: Prototyping a dedicated OAuth2 TLS test with much more to come later on
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 4f48e495c -> 0da892a50
Prototyping a dedicated OAuth2 TLS test with much more to come later on
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0da892a5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0da892a5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0da892a5
Branch: refs/heads/3.1.x-fixes
Commit: 0da892a50e692986afa80dd67526612471ad938b
Parents: 4f48e49
Author: Sergey Beryozkin
Authored: Wed Apr 5 17:48:00 2017 +0100
Committer: Sergey Beryozkin
Committed: Wed Apr 5 17:48:44 2017 +0100
--
.../oauth2/common/OAuthDataProviderTlsImpl.java | 56
.../oauth2/grants/BookServerOAuth2Tls.java | 59
.../oauth2/grants/JAXRSOAuth2TlsTest.java | 95
.../jaxrs/security/oauth2/grants/serverTls.xml | 80 +
4 files changed, 290 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0da892a5/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
--
diff --git
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
new file mode 100644
index 000..e253110
--- /dev/null
+++
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs.security.oauth2.common;
+
+import java.io.InputStream;
+import java.security.cert.Certificate;
+import java.util.Collections;
+
+import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.rs.security.oauth2.common.Client;
+import
org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvider;
+import org.apache.cxf.rt.security.crypto.CryptoUtils;
+import org.apache.xml.security.utils.ClassLoaderUtils;
+
+/**
+ * Extend the DefaultEHCacheCodeDataProvider to allow refreshing of tokens
+ */
+public class OAuthDataProviderTlsImpl extends DefaultEHCacheCodeDataProvider {
+public OAuthDataProviderTlsImpl() throws Exception {
+
+Certificate cert = loadCert();
+String encodedCert = Base64Utility.encode(cert.getEncoded());
+
+Client client = new
Client("CN=whateverhost.com,OU=Morpit,O=ApacheTest,L=Syracuse,C=US",
+null,
+true,
+null,
+null);
+client.getAllowedGrantTypes().add("custom_grant");
+
client.setApplicationCertificates(Collections.singletonList(encodedCert));
+this.setClient(client);
+
+}
+
+private Certificate loadCert() throws Exception {
+try (InputStream is =
ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", this.getClass())) {
+return CryptoUtils.loadCertificate(is, new char[]{'p', 'a', 's',
's', 'w', 'o', 'r', 'd'}, "morpit", null);
+}
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/0da892a5/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
--
diff --git
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
new file mode 100644
index 000..7244c76
--- /dev/null
+++
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributo
cxf git commit: Prototyping a dedicated OAuth2 TLS test with much more to come later on
Repository: cxf
Updated Branches:
refs/heads/master e00b84269 -> 60d257751
Prototyping a dedicated OAuth2 TLS test with much more to come later on
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/60d25775
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/60d25775
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/60d25775
Branch: refs/heads/master
Commit: 60d257751e5867bee2866fede227ad2f0056ed36
Parents: e00b842
Author: Sergey Beryozkin
Authored: Wed Apr 5 17:48:00 2017 +0100
Committer: Sergey Beryozkin
Committed: Wed Apr 5 17:48:00 2017 +0100
--
.../oauth2/common/OAuthDataProviderTlsImpl.java | 56
.../oauth2/grants/BookServerOAuth2Tls.java | 59
.../oauth2/grants/JAXRSOAuth2TlsTest.java | 95
.../jaxrs/security/oauth2/grants/serverTls.xml | 80 +
4 files changed, 290 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/60d25775/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
--
diff --git
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
new file mode 100644
index 000..e253110
--- /dev/null
+++
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderTlsImpl.java
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs.security.oauth2.common;
+
+import java.io.InputStream;
+import java.security.cert.Certificate;
+import java.util.Collections;
+
+import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.rs.security.oauth2.common.Client;
+import
org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvider;
+import org.apache.cxf.rt.security.crypto.CryptoUtils;
+import org.apache.xml.security.utils.ClassLoaderUtils;
+
+/**
+ * Extend the DefaultEHCacheCodeDataProvider to allow refreshing of tokens
+ */
+public class OAuthDataProviderTlsImpl extends DefaultEHCacheCodeDataProvider {
+public OAuthDataProviderTlsImpl() throws Exception {
+
+Certificate cert = loadCert();
+String encodedCert = Base64Utility.encode(cert.getEncoded());
+
+Client client = new
Client("CN=whateverhost.com,OU=Morpit,O=ApacheTest,L=Syracuse,C=US",
+null,
+true,
+null,
+null);
+client.getAllowedGrantTypes().add("custom_grant");
+
client.setApplicationCertificates(Collections.singletonList(encodedCert));
+this.setClient(client);
+
+}
+
+private Certificate loadCert() throws Exception {
+try (InputStream is =
ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", this.getClass())) {
+return CryptoUtils.loadCertificate(is, new char[]{'p', 'a', 's',
's', 'w', 'o', 'r', 'd'}, "morpit", null);
+}
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/60d25775/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
--
diff --git
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
new file mode 100644
index 000..7244c76
--- /dev/null
+++
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/BookServerOAuth2Tls.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license
cxf git commit: Fixing 3.0.x checkstyle issue
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 750b01a6e -> b94ebcca7
Fixing 3.0.x checkstyle issue
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b94ebcca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b94ebcca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b94ebcca
Branch: refs/heads/3.0.x-fixes
Commit: b94ebcca758266ffccd176b89328da8d50d4a9db
Parents: 750b01a
Author: Sergey Beryozkin
Authored: Wed Apr 5 16:09:11 2017 +0100
Committer: Sergey Beryozkin
Committed: Wed Apr 5 16:09:11 2017 +0100
--
.../main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b94ebcca/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index ea10274..f6b2bfc 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -365,7 +365,7 @@ public final class InjectionUtils {
Annotation[] paramAnns,
ParameterType pType,
Message message) {
-if (value == null) {
+if (value == null || Number.class.isAssignableFrom(pClass) &&
"".equals(value)) {
return null;
}
if (pType == ParameterType.PATH) {
@@ -394,11 +394,6 @@ public final class InjectionUtils {
}
return theResult;
}
-
-if (Number.class.isAssignableFrom(pClass) && "".equals(value)) {
-//pass empty string to boxed number type will result in 404
-return null;
-}
if (pClass.isPrimitive()) {
try {
T ret = (T)PrimitiveUtils.read(value, pClass);
[2/2] cxf git commit: Revert "CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc)"
Revert "CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc)" This reverts commit 50d3f48781cef7fdde9d4b2c4232feb2c2f4c8aa. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2322ce56 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2322ce56 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2322ce56 Branch: refs/heads/3.1.x-fixes Commit: 2322ce566bf56d149c4582967883631b9e1a2b91 Parents: 76738db Author: Daniel Kulp Authored: Wed Apr 5 09:00:11 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 09:27:33 2017 -0400 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2322ce56/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index d5cd1d4..fe60e2b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -156,7 +156,7 @@ 2.2.1.RELEASE spring-test 1.3.13 -1.5.13 +1.5.12 1.7 4.4.1 3.1.4
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 76738db7d -> 4f48e495c 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/4f48e495 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4f48e495 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4f48e495 Branch: refs/heads/3.1.x-fixes Commit: 4f48e495c2dd9cabc9b23959db0b656e7e2b54e9 Parents: 2322ce5 Author: Daniel Kulp Authored: Wed Apr 5 09:27:33 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 09:27:33 2017 -0400 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4f48e495/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index fb7fe72..341ae4c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -515,6 +515,7 @@ M dba09f00804cc05d943fd95d34882d6368c28edb M dd421381bcf61ead2a66311f1caf9ebdfcbf06c4 M ded06c40ba057981e003903faa93beb94cbe11fa M df3854cefae5d2da71f8d222a86218e81df7bd05 +M e00b84269aa8112bf4073b69b58f933fda3ab497 M e0ed46f9f99ac1ec3e0925b3e5666e0b7a69af53 M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7 M e578ea946aa13177adef98727e3e4606652ffc76
cxf git commit: Revert "CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc)"
Repository: cxf Updated Branches: refs/heads/master 46bd4b3e9 -> e00b84269 Revert "CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc)" This reverts commit 50d3f48781cef7fdde9d4b2c4232feb2c2f4c8aa. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e00b8426 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e00b8426 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e00b8426 Branch: refs/heads/master Commit: e00b84269aa8112bf4073b69b58f933fda3ab497 Parents: 46bd4b3 Author: Daniel Kulp Authored: Wed Apr 5 09:00:11 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 09:00:25 2017 -0400 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e00b8426/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ccc4255..e9c3eb7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -157,7 +157,7 @@ 2.3.1.RELEASE spring-test 1.3.13 -1.5.13 +1.5.12 1.7 5.0.3 3.1.4
cxf git commit: CXF-7276: Atmosphere init code should be moved out of AtmosphereWebSocketServlet Destination (javadocs + cleanup)
Repository: cxf
Updated Branches:
refs/heads/master 61a361610 -> 46bd4b3e9
CXF-7276: Atmosphere init code should be moved out of
AtmosphereWebSocketServlet Destination (javadocs + cleanup)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46bd4b3e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46bd4b3e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46bd4b3e
Branch: refs/heads/master
Commit: 46bd4b3e9b8365b5afe2310ba6225eb6c2abad12
Parents: 61a3616
Author: reta
Authored: Wed Apr 5 08:41:43 2017 -0400
Committer: reta
Committed: Wed Apr 5 08:41:43 2017 -0400
--
.../java/org/apache/cxf/transport/servlet/ServletConfigAware.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/46bd4b3e/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
index 59abc0c..8df3e29 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
@@ -23,7 +23,7 @@ import javax.servlet.ServletException;
/**
* Interface to be implemented by any Destination that wishes to be notified
of the
- * SerlvetConfig availability.
+ * ServletConfig availability.
*/
public interface ServletConfigAware {
default void onServletConfigAvailable(ServletConfig config) throws
ServletException {
cxf git commit: CXF-7276: Atmosphere init code should be moved out of AtmosphereWebSocketServlet Destination (javadocs + cleanup)
Repository: cxf
Updated Branches:
refs/heads/master 9f82ccd9d -> 61a361610
CXF-7276: Atmosphere init code should be moved out of
AtmosphereWebSocketServlet Destination (javadocs + cleanup)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/61a36161
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/61a36161
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/61a36161
Branch: refs/heads/master
Commit: 61a361610d57aaf18f2c574916621ac09af45151
Parents: 9f82ccd
Author: reta
Authored: Wed Apr 5 08:39:43 2017 -0400
Committer: reta
Committed: Wed Apr 5 08:39:43 2017 -0400
--
.../org/apache/cxf/transport/servlet/ServletConfigAware.java | 4
.../atmosphere/AtmosphereWebSocketServletDestination.java | 6 --
2 files changed, 4 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/61a36161/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
index 07a5f62..59abc0c 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
@@ -21,6 +21,10 @@ package org.apache.cxf.transport.servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+/**
+ * Interface to be implemented by any Destination that wishes to be notified
of the
+ * SerlvetConfig availability.
+ */
public interface ServletConfigAware {
default void onServletConfigAvailable(ServletConfig config) throws
ServletException {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/61a36161/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
--
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
index e7c7551..f1c0cd6 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
@@ -103,12 +103,6 @@ public class AtmosphereWebSocketServletDestination extends
ServletDestination im
HttpServletResponse resp) throws IOException {
if (AtmosphereUtils.useAtmosphere(req)) {
try {
-//if (!framework.initialized()) {
-//
framework.addInitParameter(ApplicationConfig.PROPERTY_NATIVE_COMETSUPPORT,
"false");
-//
framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPRESS_JSR356,
"false");
-//framework.init(config);
-//}
-
framework.doCometSupport(AtmosphereRequestImpl.wrap(req),
AtmosphereResponseImpl.wrap(resp));
} catch (ServletException e) {
cxf git commit: CXF-7276: Atmosphere init code should be moved out of AtmosphereWebSocketServlet Destination
Repository: cxf
Updated Branches:
refs/heads/master 50d3f4878 -> 9f82ccd9d
CXF-7276: Atmosphere init code should be moved out of
AtmosphereWebSocketServlet Destination
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9f82ccd9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9f82ccd9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9f82ccd9
Branch: refs/heads/master
Commit: 9f82ccd9d9a6f7db5b555c4040c41faf177f8e0b
Parents: 50d3f48
Author: reta
Authored: Wed Apr 5 08:33:20 2017 -0400
Committer: reta
Committed: Wed Apr 5 08:33:20 2017 -0400
--
.../samples/jax_rs/websocket_web/pom.xml| 3 +-
.../transport/http/DestinationRegistryImpl.java | 15 +-
.../transport/servlet/AbstractHTTPServlet.java | 2 +-
.../transport/servlet/CXFNonSpringServlet.java | 9
.../transport/servlet/ServletConfigAware.java | 27 ++
.../transport/servlet/ServletDestination.java | 2 +-
.../AtmosphereWebSocketServletDestination.java | 57
7 files changed, 100 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/9f82ccd9/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index d9fac05..b279852 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -32,7 +32,7 @@
${project.version}
-2.4.7
+2.4.9
9.2.15.v20160210
9.3.5.v20151012
${cxf.jetty93.version}
@@ -118,6 +118,5 @@
atmosphere-runtime
${cxf.atmosphere.version}
-
http://git-wip-us.apache.org/repos/asf/cxf/blob/9f82ccd9/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
index 2e75059..3dfc11d 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
@@ -30,10 +30,14 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.transport.AbstractDestination;
+import org.apache.cxf.transport.servlet.ServletConfigAware;
-public class DestinationRegistryImpl implements DestinationRegistry {
+public class DestinationRegistryImpl implements DestinationRegistry,
ServletConfigAware {
private static final String SLASH = "/";
private ConcurrentMap destinations
= new ConcurrentHashMap();
@@ -170,5 +174,14 @@ public class DestinationRegistryImpl implements
DestinationRegistry {
}
return path;
}
+
+@Override
+public void onServletConfigAvailable(ServletConfig config) throws
ServletException {
+for (final AbstractHTTPDestination destination: getDestinations()) {
+if (destination instanceof ServletConfigAware) {
+
((ServletConfigAware)destination).onServletConfigAvailable(config);
+}
+}
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9f82ccd9/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index 5819686..55d330a 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -124,7 +124,7 @@ public abstract class AbstractHTTPServlet extends
HttpServlet implements Filter
FileUtils.maybeDeleteDefaultTempDir();
}
-protected void finalizeServletInit(ServletConfig servletConfig) {
+protected void finalizeServletInit(ServletConfig servletConfig) throws
ServletException {
InputStream is = getResourceAsStream("/WEB-INF" +
STATIC_RESOURCES_MAP_RESOURCE);
if (is == null) {
[4/4] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/750b01a6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/750b01a6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/750b01a6
Branch: refs/heads/3.0.x-fixes
Commit: 750b01a6ef16614c0c388537bff2503353831e7e
Parents: aa00a2d
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 13:20:22 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 13:20:22 2017 +0100
--
.../IssuedTokenInterceptorProvider.java | 73 ++-
.../security/trust/DefaultSTSTokenCacher.java | 210 ---
2 files changed, 67 insertions(+), 216 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/750b01a6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index a27493a..e2c09b2 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -19,6 +19,8 @@
package org.apache.cxf.ws.security.policy.interceptors;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,7 +33,11 @@ import java.util.logging.Logger;
import javax.xml.namespace.QName;
+import org.w3c.dom.CDATASection;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
@@ -59,6 +65,7 @@ import
org.apache.cxf.ws.security.wss4j.policyvalidators.IssuedTokenPolicyValida
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SAMLKeyInfo;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
@@ -71,6 +78,7 @@ import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.model.IssuedToken;
import org.apache.wss4j.policy.model.Trust10;
import org.apache.wss4j.policy.model.Trust13;
+import org.apache.xml.security.utils.Base64;
/**
*
@@ -312,19 +320,72 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
return null;
}
-private String getIdFromToken(Element token) {
+// Get an id from the token that is unique to that token
+private static String getIdFromToken(Element token) {
if (token != null) {
-// Try to find the "Id" on the token.
-if (token.hasAttributeNS(WSConstants.WSU_NS, "Id")) {
-return token.getAttributeNS(WSConstants.WSU_NS, "Id");
-} else if (token.hasAttributeNS(null, "ID")) {
+// For SAML tokens get the ID/AssertionID
+if ("Assertion".equals(token.getLocalName())
+&&
WSConstants.SAML2_NS.equals(token.getNamespaceURI())) {
return token.getAttributeNS(null, "ID");
-} else if (token.hasAttributeNS(null, "AssertionID")) {
+} else if ("Assertion".equals(token.getLocalName())
+&&
WSConstants.SAML_NS.equals(token.getNamespaceURI())) {
return token.getAttributeNS(null, "AssertionID");
}
+
+// For UsernameTokens get the username
+if (WSConstants.USERNAME_TOKEN_LN.equals(token.getLocalName())
+&&
WSConstants.WSSE_NS.equals(token.getNamespaceURI())) {
+Element usernameElement =
+XMLUtils.getDirectChildElement(token,
WSConstants.USERNAME_LN, WSConstants.WSSE_NS);
+if (usernameElement != null) {
+return getElementText(usernameElement);
+}
+}
+
+// For BinarySecurityTokens take the hash of the value
+if (WSConstants.BINARY_TOKEN_LN.equals(token.getLocalName())
+&&
WSConstants.WSSE_NS.equals(token.getNamespaceURI())) {
+String text = getElementText(token);
+i
[2/4] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5080508d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5080508d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5080508d
Branch: refs/heads/3.0.x-fixes
Commit: 5080508d70cd14fae217df1197b5e2fea2fc9d55
Parents: 262d17c
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 12:49:57 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 12:51:17 2017 +0100
--
.../org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5080508d/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
index c2699fc..972a9fd 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.security.trust;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@@ -38,6 +37,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
+import org.apache.xml.security.utils.Base64;
public class DefaultSTSTokenCacher implements STSTokenCacher {
@@ -197,7 +197,7 @@ public class DefaultSTSTokenCacher implements
STSTokenCacher {
try {
MessageDigest digest =
MessageDigest.getInstance("SHA-256");
byte[] bytes = digest.digest(text.getBytes());
-return Base64.getMimeEncoder().encodeToString(bytes);
+return Base64.encode(bytes);
} catch (NoSuchAlgorithmException e) {
// SHA-256 must be supported so not going to happen...
}
[3/4] 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/aa00a2db Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aa00a2db Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aa00a2db Branch: refs/heads/3.0.x-fixes Commit: aa00a2db2226dd6f99dc9ecf58dfed5cd0bf9f17 Parents: 5080508 Author: Colm O hEigeartaigh Authored: Wed Apr 5 12:51:17 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Apr 5 12:51:17 2017 +0100 -- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/aa00a2db/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index d576a02..d124dd1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -220,6 +220,7 @@ B 21a7f538c3e91d2f5b0c1250c866ea43405bcb42 B 21d5de9ffc7b47c8704ec312fe7234304fbd0df1 B 21f50ebda6a66a4ae3860dd95b63add684546ced B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1 +B 22a58c399ccdb94f5969ab3be9dfad46cf222af2 B 22a9780de14857d7320c41506b23e02b55cd4d05 B 22aeab948c344aee666cafbeb5979a2e99748843 B 22d0c244d3b60aafbd3c070e9599012019de486c @@ -516,6 +517,7 @@ B 4b71edb65b4e24f390b222dbb0cad6f1b533ce66 B 4b76cb4d35d175ec3ba98ea1286859503e055374 B 4bc00dc9e621b2d61764bfbe24c82042a784d083 B 4bc0c5e52615dac9db94b6fdcd73065a48eb1411 +B 4bca17bcaa911ff4f90d4d610e2ce0b974f68f96 B 4bdbdf6cd2f15560a950aa6f1aebc8aa8f78ac2c B 4c64e8b5f8af67d2e163ad575fd6e7191c6636d1 B 4c687895d918deb69cba4f50e62a3746a71b4130 @@ -1721,6 +1723,7 @@ M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 1946e323a0df6e5f9748af82106cff39d7b5d01f M 19e912e8d4b6d3f3a4c2b88b1d53e691496d7dc0 M 1a4c2ac162b2b67b14e8ad12b06ca87e443dccc4 +M 1a4fe22fc297f8be204788bcdfcd498e91201a01 M 1b5e4078c3b14cf249f39607b1bb2b676d236747 M 1b91b6e630bec0980d94bd04b016748af525d9bd M 1baae69592a128462ef252916bccfb67cd81095b
[1/4] cxf git commit: Refactor how we extract "IDs" from delegation tokens when used for caching
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 2b56bf00a -> 750b01a6e
Refactor how we extract "IDs" from delegation tokens when used for caching
# Conflicts:
#
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/262d17c5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/262d17c5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/262d17c5
Branch: refs/heads/3.0.x-fixes
Commit: 262d17c5a3588acc28ff2a2ae5dc5280b35e6fb2
Parents: 2b56bf0
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 11:01:21 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 12:51:09 2017 +0100
--
.../security/trust/DefaultSTSTokenCacher.java | 210 +++
1 file changed, 210 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/262d17c5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
new file mode 100644
index 000..c2699fc
--- /dev/null
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
@@ -0,0 +1,210 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.ws.security.trust;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.rt.security.utils.SecurityUtils;
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.cxf.ws.security.tokenstore.SecurityToken;
+import org.apache.cxf.ws.security.tokenstore.TokenStore;
+import org.apache.cxf.ws.security.tokenstore.TokenStoreUtils;
+import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.common.util.XMLUtils;
+import org.apache.wss4j.dom.WSConstants;
+
+public class DefaultSTSTokenCacher implements STSTokenCacher {
+
+public SecurityToken retrieveToken(Message message) {
+boolean cacheIssuedToken =
+
SecurityUtils.getSecurityPropertyBoolean(SecurityConstants.CACHE_ISSUED_TOKEN_IN_ENDPOINT,
+ message,
+ true);
+SecurityToken tok = null;
+if (cacheIssuedToken) {
+tok =
(SecurityToken)message.getContextualProperty(SecurityConstants.TOKEN);
+if (tok == null) {
+String tokId =
(String)message.getContextualProperty(SecurityConstants.TOKEN_ID);
+if (tokId != null) {
+tok =
TokenStoreUtils.getTokenStore(message).getToken(tokId);
+}
+}
+} else {
+tok = (SecurityToken)message.get(SecurityConstants.TOKEN);
+if (tok == null) {
+String tokId = (String)message.get(SecurityConstants.TOKEN_ID);
+if (tokId != null) {
+tok =
TokenStoreUtils.getTokenStore(message).getToken(tokId);
+}
+}
+}
+return tok;
+}
+
+public SecurityToken retrieveToken(Message message, Element
delegationToken, String cacheKey) {
+if (delegationToken == null) {
+return null;
+}
+TokenStore tokenStore = TokenStoreUtils.getTokenStore(message);
+
+// See if the token corresponding to the delegation Token is stored in
the cache
+// and if it points to an issued token
+String id = getIdFromToken(delegationToken);
+SecurityToken cachedToken = tokenStore.getToken(id);
+if (cachedTo
cxf-fediz git commit: OIDC logout should use post_logout_redirect_uris, patch from Adrian Gonzalez applied, This closes #16
Repository: cxf-fediz
Updated Branches:
refs/heads/master d385478b9 -> b54fb6553
OIDC logout should use post_logout_redirect_uris, patch from Adrian Gonzalez
applied, This closes #16
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b54fb655
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b54fb655
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b54fb655
Branch: refs/heads/master
Commit: b54fb65539ce18f0ab602fe75b01c3fdc270e6b1
Parents: d385478
Author: Sergey Beryozkin
Authored: Wed Apr 5 12:59:46 2017 +0100
Committer: Sergey Beryozkin
Committed: Wed Apr 5 12:59:46 2017 +0100
--
.../oidc/logout/LogoutRedirectConstraintHandler.java | 13 ++---
services/oidc/src/main/webapp/WEB-INF/views/client.jsp | 4 ++--
2 files changed, 12 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b54fb655/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
--
diff --git
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
index 8335a5c..150746a 100644
---
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
+++
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutRedirectConstraintHandler.java
@@ -20,6 +20,8 @@
package org.apache.cxf.fediz.service.oidc.logout;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
import java.util.regex.Pattern;
import javax.security.auth.callback.Callback;
@@ -27,6 +29,7 @@ import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.lang.StringUtils;
import org.apache.cxf.fediz.core.spi.ReplyConstraintCallback;
import
org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider;
import org.apache.cxf.rs.security.oauth2.common.Client;
@@ -36,7 +39,7 @@ import org.springframework.context.ApplicationContext;
public class LogoutRedirectConstraintHandler implements CallbackHandler {
-private static final String CLIENT_LOGOUT_URI = "client_logout_uri";
+private static final String POST_LOGOUT_REDIRECT_URIS =
"post_logout_redirect_uris";
@Override
public void handle(Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
@@ -61,9 +64,13 @@ public class LogoutRedirectConstraintHandler implements
CallbackHandler {
Client client = dataManager.getClient(clientId);
if (client != null) {
-String logoutUri = client.getProperties().get(CLIENT_LOGOUT_URI);
+String logoutUri =
client.getProperties().get(POST_LOGOUT_REDIRECT_URIS);
if (logoutUri != null) {
-return Pattern.compile(logoutUri);
+List uris = Arrays.asList(logoutUri.split(" "));
+for (int i = 0; i < uris.size(); i++) {
+uris.set(i, "\\Q" + uris.get(i) + "\\E");
+}
+return Pattern.compile("(" + StringUtils.join(uris, "|") +
")");
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b54fb655/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
index 6940715..597bd8a 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
@@ -156,8 +156,8 @@
Logout URL
-<% if (client.getProperties().get("client_logout_uri") != null) { %>
- <%=client.getProperties().get("client_logout_uri") %>
+<% if (client.getProperties().get("post_logout_redirect_uris") != null) { %>
+ <%=client.getProperties().get("post_logout_redirect_uris") %>
<% } %>
[2/2] cxf git commit: CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc)
CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/93c96998 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/93c96998 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/93c96998 Branch: refs/heads/3.1.x-fixes Commit: 93c969980c512d941dcdf97f2a68f6370132e624 Parents: b16f63b Author: Dennis Kieselhorst Authored: Wed Apr 5 13:25:25 2017 +0200 Committer: Daniel Kulp Committed: Wed Apr 5 07:57:54 2017 -0400 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/93c96998/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index fe60e2b..d5cd1d4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -156,7 +156,7 @@ 2.2.1.RELEASE spring-test 1.3.13 -1.5.12 +1.5.13 1.7 4.4.1 3.1.4
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes b16f63b29 -> 76738db7d 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/76738db7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/76738db7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/76738db7 Branch: refs/heads/3.1.x-fixes Commit: 76738db7dfd2b9a0375c49a96ae04c89c1084bf0 Parents: 93c9699 Author: Daniel Kulp Authored: Wed Apr 5 07:57:54 2017 -0400 Committer: Daniel Kulp Committed: Wed Apr 5 07:57:54 2017 -0400 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/76738db7/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 4b95281..fb7fe72 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -404,6 +404,7 @@ M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01 M 4e5119b3d1d807fb6885ec67ce28180beb55c360 M 4f4ce80ba2de80219e13943cbd6edbf47234 M 5022be0c15d90800ee983fe94b07a10a54814991 +M 50d3f48781cef7fdde9d4b2c4232feb2c2f4c8aa M 52d77470228a3560f464003c68b30ffe8f1e8b9c M 574b2a9997c94011794fa2e083181e23c9936f15 M 585df048b7730ee36644a4bb7c1a20fcf977d79e
cxf git commit: CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc)
Repository: cxf Updated Branches: refs/heads/master 66c2c5b99 -> 50d3f4878 CXF-7316: Update swagger-jaxrs dependency to 1.5.13 (cherry picked from commit a9c33dc) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/50d3f487 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/50d3f487 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/50d3f487 Branch: refs/heads/master Commit: 50d3f48781cef7fdde9d4b2c4232feb2c2f4c8aa Parents: 66c2c5b Author: Dennis Kieselhorst Authored: Wed Apr 5 13:25:25 2017 +0200 Committer: Dennis Kieselhorst Committed: Wed Apr 5 13:30:11 2017 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/50d3f487/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index e9c3eb7..ccc4255 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -157,7 +157,7 @@ 2.3.1.RELEASE spring-test 1.3.13 -1.5.12 +1.5.13 1.7 5.0.3 3.1.4
[1/4] cxf git commit: Change the ReceivedTokenCallbackHandler to follow an ordering when retrieving a token from the previous message
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes eb98654ac -> b16f63b29
Change the ReceivedTokenCallbackHandler to follow an ordering when retrieving a
token from the previous message
# Conflicts:
#
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/22a58c39
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/22a58c39
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/22a58c39
Branch: refs/heads/3.1.x-fixes
Commit: 22a58c399ccdb94f5969ab3be9dfad46cf222af2
Parents: eb98654
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 10:08:46 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 11:41:58 2017 +0100
--
.../ReceivedTokenCallbackHandler.java | 91
1 file changed, 57 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/22a58c39/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
index 523677b..7c32240 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
@@ -21,24 +21,26 @@ package org.apache.cxf.ws.security.trust.delegation;
import java.io.IOException;
import java.lang.ref.WeakReference;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.token.BinarySecurity;
+import org.apache.wss4j.common.token.PKIPathSecurity;
+import org.apache.wss4j.common.token.X509Security;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.dom.message.token.UsernameToken;
/**
* This CallbackHandler implementation obtains the previously received message
from a
@@ -46,7 +48,18 @@ import org.apache.wss4j.dom.message.token.UsernameToken;
* (SAML/UsernameToken/BinarySecurityToken) from it to be used as the
delegation token.
*/
public class ReceivedTokenCallbackHandler implements CallbackHandler {
-
+
+private static final List DEFAULT_SECURITY_PRIORITIES = new
ArrayList<>();
+static {
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.ST_SIGNED);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.ST_UNSIGNED);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.UT);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.BST);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.UT_NOPASSWORD);
+}
+
+private List securityPriorities = new
ArrayList<>(DEFAULT_SECURITY_PRIORITIES);
+
private boolean useTransformedToken = true;
@SuppressWarnings("unchecked")
@@ -80,8 +93,8 @@ public class ReceivedTokenCallbackHandler implements
CallbackHandler {
List results =
CastUtils.cast((List)soapMessage.get(WSHandlerConstants.RECV_RESULTS));
if (results != null) {
-for (WSHandlerResult rResult : results) {
-Element token = findToken(rResult.getResults());
+for (WSHandlerResult handlerResult : results) {
+Element token = getTokenFromResults(handlerResult);
if (token != null) {
return token;
}
@@ -90,38 +103,40 @@ public class ReceivedTokenCallbackHandler implements
CallbackHandler {
}
return null;
}
-
-private Element findToken(
-List wsSecEngineResults
-) {
-for (WSSecurityEngineResult wser : wsSecEngineResults) {
-// First check for a transformed token
-Object transformedToken =
wser.get(WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN);
-if (useTransformedToken && transformedToken instanceof
SamlAssertionWrapper) {
-
[2/4] cxf git commit: Refactor how we extract "IDs" from delegation tokens when used for caching
Refactor how we extract "IDs" from delegation tokens when used for caching
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a4fe22f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a4fe22f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a4fe22f
Branch: refs/heads/3.1.x-fixes
Commit: 1a4fe22fc297f8be204788bcdfcd498e91201a01
Parents: 22a58c3
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 11:01:21 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 11:41:59 2017 +0100
--
.../security/trust/DefaultSTSTokenCacher.java | 40 +---
1 file changed, 35 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1a4fe22f/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
index 6fc26f0..c2699fc 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
@@ -19,6 +19,9 @@
package org.apache.cxf.ws.security.trust;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@@ -33,6 +36,7 @@ import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.tokenstore.TokenStoreUtils;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
public class DefaultSTSTokenCacher implements STSTokenCacher {
@@ -163,16 +167,42 @@ public class DefaultSTSTokenCacher implements
STSTokenCacher {
return false;
}
+// Get an id from the token that is unique to that token
private static String getIdFromToken(Element token) {
if (token != null) {
-// Try to find the "Id" on the token.
-if (token.hasAttributeNS(WSConstants.WSU_NS, "Id")) {
-return token.getAttributeNS(WSConstants.WSU_NS, "Id");
-} else if (token.hasAttributeNS(null, "ID")) {
+// For SAML tokens get the ID/AssertionID
+if ("Assertion".equals(token.getLocalName())
+&& WSConstants.SAML2_NS.equals(token.getNamespaceURI())) {
return token.getAttributeNS(null, "ID");
-} else if (token.hasAttributeNS(null, "AssertionID")) {
+} else if ("Assertion".equals(token.getLocalName())
+&& WSConstants.SAML_NS.equals(token.getNamespaceURI())) {
return token.getAttributeNS(null, "AssertionID");
}
+
+// For UsernameTokens get the username
+if (WSConstants.USERNAME_TOKEN_LN.equals(token.getLocalName())
+&& WSConstants.WSSE_NS.equals(token.getNamespaceURI())) {
+Element usernameElement =
+XMLUtils.getDirectChildElement(token,
WSConstants.USERNAME_LN, WSConstants.WSSE_NS);
+if (usernameElement != null) {
+return XMLUtils.getElementText(usernameElement);
+}
+}
+
+// For BinarySecurityTokens take the hash of the value
+if (WSConstants.BINARY_TOKEN_LN.equals(token.getLocalName())
+&& WSConstants.WSSE_NS.equals(token.getNamespaceURI())) {
+String text = XMLUtils.getElementText(token);
+if (text != null && !"".equals(text)) {
+try {
+MessageDigest digest =
MessageDigest.getInstance("SHA-256");
+byte[] bytes = digest.digest(text.getBytes());
+return Base64.getMimeEncoder().encodeToString(bytes);
+} catch (NoSuchAlgorithmException e) {
+// SHA-256 must be supported so not going to happen...
+}
+}
+}
}
return "";
}
[4/4] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b16f63b2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b16f63b2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b16f63b2
Branch: refs/heads/3.1.x-fixes
Commit: b16f63b29a864f3687932f9e664088b79f3c40e9
Parents: 4bca17b
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 12:49:57 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 12:49:57 2017 +0100
--
.../org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b16f63b2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
index c2699fc..972a9fd 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.security.trust;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@@ -38,6 +37,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
+import org.apache.xml.security.utils.Base64;
public class DefaultSTSTokenCacher implements STSTokenCacher {
@@ -197,7 +197,7 @@ public class DefaultSTSTokenCacher implements
STSTokenCacher {
try {
MessageDigest digest =
MessageDigest.getInstance("SHA-256");
byte[] bytes = digest.digest(text.getBytes());
-return Base64.getMimeEncoder().encodeToString(bytes);
+return Base64.encode(bytes);
} catch (NoSuchAlgorithmException e) {
// SHA-256 must be supported so not going to happen...
}
[3/4] 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/4bca17bc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4bca17bc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4bca17bc Branch: refs/heads/3.1.x-fixes Commit: 4bca17bcaa911ff4f90d4d610e2ce0b974f68f96 Parents: 1a4fe22 Author: Colm O hEigeartaigh Authored: Wed Apr 5 11:41:59 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Apr 5 11:41:59 2017 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4bca17bc/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 6fbafc1..4b95281 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -412,6 +412,7 @@ M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391 M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22 M 6242c682dfce4a2ba4869978c28b14f1472484c1 M 62f994427bdd12863dc987e348eec1e24e6ce849 +M 631ac6ba0765022a0f53500ac986b61cbabca60c M 63a1088a9253da0452497440e900d35a5415c3c9 M 65c1204abcef8720d4eb985d58e3f865e39a1da3 M 6613e46662317ea151f72e26e5deb4f50148a148
[2/2] cxf git commit: Refactor how we extract "IDs" from delegation tokens when used for caching
Refactor how we extract "IDs" from delegation tokens when used for caching
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/66c2c5b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/66c2c5b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/66c2c5b9
Branch: refs/heads/master
Commit: 66c2c5b99e01a2165a2c5ed9ae34b4b9a512cb39
Parents: 631ac6b
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 11:01:21 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 11:01:21 2017 +0100
--
.../security/trust/DefaultSTSTokenCacher.java | 40 +---
1 file changed, 35 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/66c2c5b9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
index 6fc26f0..c2699fc 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java
@@ -19,6 +19,9 @@
package org.apache.cxf.ws.security.trust;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@@ -33,6 +36,7 @@ import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.tokenstore.TokenStoreUtils;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
public class DefaultSTSTokenCacher implements STSTokenCacher {
@@ -163,16 +167,42 @@ public class DefaultSTSTokenCacher implements
STSTokenCacher {
return false;
}
+// Get an id from the token that is unique to that token
private static String getIdFromToken(Element token) {
if (token != null) {
-// Try to find the "Id" on the token.
-if (token.hasAttributeNS(WSConstants.WSU_NS, "Id")) {
-return token.getAttributeNS(WSConstants.WSU_NS, "Id");
-} else if (token.hasAttributeNS(null, "ID")) {
+// For SAML tokens get the ID/AssertionID
+if ("Assertion".equals(token.getLocalName())
+&& WSConstants.SAML2_NS.equals(token.getNamespaceURI())) {
return token.getAttributeNS(null, "ID");
-} else if (token.hasAttributeNS(null, "AssertionID")) {
+} else if ("Assertion".equals(token.getLocalName())
+&& WSConstants.SAML_NS.equals(token.getNamespaceURI())) {
return token.getAttributeNS(null, "AssertionID");
}
+
+// For UsernameTokens get the username
+if (WSConstants.USERNAME_TOKEN_LN.equals(token.getLocalName())
+&& WSConstants.WSSE_NS.equals(token.getNamespaceURI())) {
+Element usernameElement =
+XMLUtils.getDirectChildElement(token,
WSConstants.USERNAME_LN, WSConstants.WSSE_NS);
+if (usernameElement != null) {
+return XMLUtils.getElementText(usernameElement);
+}
+}
+
+// For BinarySecurityTokens take the hash of the value
+if (WSConstants.BINARY_TOKEN_LN.equals(token.getLocalName())
+&& WSConstants.WSSE_NS.equals(token.getNamespaceURI())) {
+String text = XMLUtils.getElementText(token);
+if (text != null && !"".equals(text)) {
+try {
+MessageDigest digest =
MessageDigest.getInstance("SHA-256");
+byte[] bytes = digest.digest(text.getBytes());
+return Base64.getMimeEncoder().encodeToString(bytes);
+} catch (NoSuchAlgorithmException e) {
+// SHA-256 must be supported so not going to happen...
+}
+}
+}
}
return "";
}
[1/2] cxf git commit: Change the ReceivedTokenCallbackHandler to follow an ordering when retrieving a token from the previous message
Repository: cxf
Updated Branches:
refs/heads/master 037b0ee94 -> 66c2c5b99
Change the ReceivedTokenCallbackHandler to follow an ordering when retrieving a
token from the previous message
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/631ac6ba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/631ac6ba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/631ac6ba
Branch: refs/heads/master
Commit: 631ac6ba0765022a0f53500ac986b61cbabca60c
Parents: 037b0ee
Author: Colm O hEigeartaigh
Authored: Wed Apr 5 10:08:46 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Wed Apr 5 10:08:46 2017 +0100
--
.../ReceivedTokenCallbackHandler.java | 83 +---
1 file changed, 53 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/631ac6ba/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
index cdb515a..3ef5cfe 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
@@ -21,24 +21,26 @@ package org.apache.cxf.ws.security.trust.delegation;
import java.io.IOException;
import java.lang.ref.WeakReference;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.token.BinarySecurity;
+import org.apache.wss4j.common.token.PKIPathSecurity;
+import org.apache.wss4j.common.token.X509Security;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.apache.wss4j.dom.message.token.UsernameToken;
/**
* This CallbackHandler implementation obtains the previously received message
from a
@@ -47,6 +49,17 @@ import org.apache.wss4j.dom.message.token.UsernameToken;
*/
public class ReceivedTokenCallbackHandler implements CallbackHandler {
+private static final List DEFAULT_SECURITY_PRIORITIES = new
ArrayList<>();
+static {
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.ST_SIGNED);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.ST_UNSIGNED);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.UT);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.BST);
+DEFAULT_SECURITY_PRIORITIES.add(WSConstants.UT_NOPASSWORD);
+}
+
+private List securityPriorities = new
ArrayList<>(DEFAULT_SECURITY_PRIORITIES);
+
private boolean useTransformedToken = true;
@SuppressWarnings("unchecked")
@@ -80,8 +93,8 @@ public class ReceivedTokenCallbackHandler implements
CallbackHandler {
List results =
CastUtils.cast((List)soapMessage.get(WSHandlerConstants.RECV_RESULTS));
if (results != null) {
-for (WSHandlerResult rResult : results) {
-Element token = findToken(rResult.getResults());
+for (WSHandlerResult handlerResult : results) {
+Element token = getTokenFromResults(handlerResult);
if (token != null) {
return token;
}
@@ -91,37 +104,39 @@ public class ReceivedTokenCallbackHandler implements
CallbackHandler {
return null;
}
-private Element findToken(
-List wsSecEngineResults
-) {
-for (WSSecurityEngineResult wser : wsSecEngineResults) {
-// First check for a transformed token
-Object transformedToken =
wser.get(WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN);
-if (useTransformedToken && transformedToken instanceof
SamlAssertionWrapper) {
-return ((SamlAssertionWrapper)transformedToken).getElement();
-}
+private Element getTokenFromResults(WSHandlerResult handlerResult) {
+// Now go through the results in a certain order. Highest priority is
first.
+
