date:20151030

[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 241c2b7..91a896c 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -22,7 +22,7 @@
 org.apache.cxf.samples
 cxf-samples
 pom
-3.1.4
+3.1.5-SNAPSHOT
 Apache CXF Samples
 Apache CXF Samples
 http://cxf.apache.org

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/distribution/src/main/release/samples/restful_dispatch/pom.xml
--
diff --git a/distribution/src/main/release/samples/restful_dispatch/pom.xml 
b/distribution/src/main/release/samples/restful_dispatch/pom.xml
index 2bc51f1..f09b8de 100644
--- a/distribution/src/main/release/samples/restful_dispatch/pom.xml
+++ b/distribution/src/main/release/samples/restful_dispatch/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4
+3.1.5-SNAPSHOT
 
 
 ${project.version}
@@ -83,23 +83,23 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.4
+3.1.5-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.4
+3.1.5-SNAPSHOT
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.1.4
+3.1.5-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.4
+3.1.5-SNAPSHOT
 
 
 commons-httpclient

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/distribution/src/main/release/samples/ruby_spring_support/pom.xml
--
diff --git a/distribution/src/main/release/samples/ruby_spring_support/pom.xml 
b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
index 63ee0f0..9e0b181 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4
+3.1.5-SNAPSHOT
 
 
 ${project.version}
@@ -99,18 +99,18 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.4
+3.1.5-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.4
+3.1.5-SNAPSHOT
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.1.4
+3.1.5-SNAPSHOT
 
 
 org.jruby

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/distribution/src/main/release/samples/soap_header/pom.xml
--
diff --git a/distribution/src/main/release/samples/soap_header/pom.xml 
b/distribution/src/main/release/samples/soap_header/pom.xml
index 9018ce7..e048308 100644
--- a/distribution/src/main/release/samples/soap_header/pom.xml
+++ b/distribution/src/main/release/samples/soap_header/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4
+3.1.5-SNAPSHOT
 
 
 ${project.version}
@@ -114,18 +114,18 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.4
+3.1.5-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.4
+3.1.5-SNAPSHOT
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.1.4
+3.1.5-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/distribution/src/main/release/samples/sts/pom.xml
--
diff --git a/distribution/src/main/release/samples/sts/pom.xml 
b/distribution/src/main/release/samples/sts/pom.xml
index 935b838..59f0e9d 100644
--- a/distribution/src/main/release/samples/sts/pom.xml
+++ b/distribution/src/main/release/samples/sts/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4
+3.1.5-SNAPSHOT
 ..
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/distribution/src/main/release/samples/throttling/pom.xml
--
diff --git a/distribution/src/main/release/samples/throttling/pom.xml 
b/distribution/src/main/release/samples/throttling/pom.xml
index 38bec3b..afe72b1 100644
--- a/distribution/

[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.4

2015-10-30 Thread dkulp

[maven-release-plugin] prepare release cxf-3.1.4


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

Branch: refs/heads/master
Commit: 16d789c4a913e0cac51bcf929331abe84010ce1e
Parents: 44a2a45
Author: Daniel Kulp 
Authored: Fri Oct 30 15:52:28 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 15:52:28 2015 -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 | 10 +-
 .../jax_rs/description_swagger2_osgi/pom.xml|  8 
 .../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 +++---
 .../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_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/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 +++---
 .../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 | 10 +-
 .../samples/wsdl_first_dyn

[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.4

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 60514bf..241c2b7 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -22,7 +22,7 @@
 org.apache.cxf.samples
 cxf-samples
 pom
-3.1.4-SNAPSHOT
+3.1.4
 Apache CXF Samples
 Apache CXF Samples
 http://cxf.apache.org

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/distribution/src/main/release/samples/restful_dispatch/pom.xml
--
diff --git a/distribution/src/main/release/samples/restful_dispatch/pom.xml 
b/distribution/src/main/release/samples/restful_dispatch/pom.xml
index 1584b8b..2bc51f1 100644
--- a/distribution/src/main/release/samples/restful_dispatch/pom.xml
+++ b/distribution/src/main/release/samples/restful_dispatch/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4-SNAPSHOT
+3.1.4
 
 
 ${project.version}
@@ -83,23 +83,23 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.4-SNAPSHOT
+3.1.4
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.4-SNAPSHOT
+3.1.4
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.1.4-SNAPSHOT
+3.1.4
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.4-SNAPSHOT
+3.1.4
 
 
 commons-httpclient

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/distribution/src/main/release/samples/ruby_spring_support/pom.xml
--
diff --git a/distribution/src/main/release/samples/ruby_spring_support/pom.xml 
b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
index 729e13d..63ee0f0 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4-SNAPSHOT
+3.1.4
 
 
 ${project.version}
@@ -99,18 +99,18 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.4-SNAPSHOT
+3.1.4
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.4-SNAPSHOT
+3.1.4
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.1.4-SNAPSHOT
+3.1.4
 
 
 org.jruby

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/distribution/src/main/release/samples/soap_header/pom.xml
--
diff --git a/distribution/src/main/release/samples/soap_header/pom.xml 
b/distribution/src/main/release/samples/soap_header/pom.xml
index dada45b..9018ce7 100644
--- a/distribution/src/main/release/samples/soap_header/pom.xml
+++ b/distribution/src/main/release/samples/soap_header/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4-SNAPSHOT
+3.1.4
 
 
 ${project.version}
@@ -114,18 +114,18 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.4-SNAPSHOT
+3.1.4
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.4-SNAPSHOT
+3.1.4
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.1.4-SNAPSHOT
+3.1.4
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/distribution/src/main/release/samples/sts/pom.xml
--
diff --git a/distribution/src/main/release/samples/sts/pom.xml 
b/distribution/src/main/release/samples/sts/pom.xml
index c401b83..935b838 100644
--- a/distribution/src/main/release/samples/sts/pom.xml
+++ b/distribution/src/main/release/samples/sts/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.4-SNAPSHOT
+3.1.4
 ..
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/distribution/src/main/release/samples/throttling/pom.xml
--
diff --git a/distribution/src/main/release/samples/throttling/pom.xml 
b/distribution/src/main/release/samples/throttling/pom.xml
index 78cd001..38bec3b 100644
--- a/distribution/

[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/rt/ws/eventing/pom.xml
--
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index b8457a8..6a7d2ec 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -9,7 +9,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/rt/ws/mex/pom.xml
--
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index b6cde82..c763b4e 100644
--- a/rt/ws/mex/pom.xml
+++ b/rt/ws/mex/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/rt/ws/policy/pom.xml
--
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index affa4d8..f3b8c44 100644
--- a/rt/ws/policy/pom.xml
+++ b/rt/ws/policy/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/rt/ws/pom.xml
--
diff --git a/rt/ws/pom.xml b/rt/ws/pom.xml
index 7b0ec6a..a632391 100644
--- a/rt/ws/pom.xml
+++ b/rt/ws/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-rt
-3.1.4
+3.1.5-SNAPSHOT
 
 
 policy

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/rt/ws/rm/pom.xml
--
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 91c207c..1a8b624 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/rt/ws/security/pom.xml
--
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index b2e0f7a..a51b6be 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/rt/wsdl/pom.xml
--
diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml
index f1157ec..9848aa1 100644
--- a/rt/wsdl/pom.xml
+++ b/rt/wsdl/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/services/pom.xml
--
diff --git a/services/pom.xml b/services/pom.xml
index 8727a6b..7910bd3 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -28,7 +28,7 @@
 org.apache.cxf
 cxf
 ../pom.xml
-3.1.4
+3.1.5-SNAPSHOT
 
 
 sts

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/services/sts/pom.xml
--
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 9de5c99..caa98f6 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.services
 cxf-services
-3.1.4
+3.1.5-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 6832bd1..046a828 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/services/sts/sts-war/pom.xml
--
diff --git a/services/sts/sts-war/pom.xml b/services/sts/sts-war/pom.xml
index 9675318..8b7fab9 100644
--- a/services/sts/sts-war/pom.xml
+++ b/services/sts/sts-war/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4
+3.1.5-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1bd8bd7/services/sts/systests/advanced/pom.xml
--
diff --git

[6/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

[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/a1bd8bd7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a1bd8bd7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a1bd8bd7

Branch: refs/heads/master
Commit: a1bd8bd7f0f3877c63c9491fe4c423f43bc58720
Parents: 16d789c
Author: Daniel Kulp 
Authored: Fri Oct 30 15:52:31 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 15:52:31 2015 -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 | 10 +-
 .../jax_rs/description_swagger2_osgi/pom.xml|  8 
 .../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 +++---
 .../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_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/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 +++---
 .../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 | 10 +-
 .../samples/w

[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.4

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/master 44a2a4502 -> a1bd8bd7f
Updated Tags:  refs/tags/cxf-3.1.4 [created] 55292609e


http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/rt/ws/eventing/pom.xml
--
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index e34a11c..b8457a8 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -9,7 +9,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/rt/ws/mex/pom.xml
--
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index 4b99d4a..b6cde82 100644
--- a/rt/ws/mex/pom.xml
+++ b/rt/ws/mex/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/rt/ws/policy/pom.xml
--
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index ac07d15..affa4d8 100644
--- a/rt/ws/policy/pom.xml
+++ b/rt/ws/policy/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/rt/ws/pom.xml
--
diff --git a/rt/ws/pom.xml b/rt/ws/pom.xml
index 17b5898..7b0ec6a 100644
--- a/rt/ws/pom.xml
+++ b/rt/ws/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-rt
-3.1.4-SNAPSHOT
+3.1.4
 
 
 policy

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/rt/ws/rm/pom.xml
--
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 96482fa..91c207c 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/rt/ws/security/pom.xml
--
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index bbeee16..b2e0f7a 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/rt/wsdl/pom.xml
--
diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml
index dc3c550..f1157ec 100644
--- a/rt/wsdl/pom.xml
+++ b/rt/wsdl/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/services/pom.xml
--
diff --git a/services/pom.xml b/services/pom.xml
index 92bc190..8727a6b 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -28,7 +28,7 @@
 org.apache.cxf
 cxf
 ../pom.xml
-3.1.4-SNAPSHOT
+3.1.4
 
 
 sts

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/services/sts/pom.xml
--
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 458218c..9de5c99 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.services
 cxf-services
-3.1.4-SNAPSHOT
+3.1.4
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/services/sts/sts-core/pom.xml
--
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index ab3d96c..6832bd1 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/16d789c4/services/sts/sts-war/pom.xml
--
diff --git a/services/sts/sts-war/pom.xml b/services/sts/sts-war/pom.xml
index 7651cd7..9675318 100644
--- a/services/sts/sts-war/pom.xml
+++ b/services/sts/sts-war/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.cxf
 cxf-parent
-3.1.4-SNAPSHOT
+3.1.4
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/

cxf git commit: Update release notes

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/master d58695e24 -> 44a2a4502


Update release notes


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

Branch: refs/heads/master
Commit: 44a2a45027c51d005a725ad95ca8a57288e29e49
Parents: d58695e
Author: Daniel Kulp 
Authored: Fri Oct 30 15:30:07 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 15:30:07 2015 -0400

--
 distribution/src/main/release/release_notes.txt | 92 +---
 1 file changed, 39 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/44a2a450/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 160798a..74dd8d2 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.3 Release Notes
+Apache CXF 3.1.4 Release Notes
 
 1. Overview
 
-The 3.1.3 version of Apache CXF is a significant new version of CXF 
+The 3.1.4 version 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.3 fixes over 40 JIRA issues reported by users and the community.
+3.1.4 fixes over 35 JIRA issues reported by users and the community.
 
 
 
@@ -72,60 +72,46 @@ to 3.1.
 7. Specific issues, features, and improvements fixed in this version
 
 ** Bug
-* [CXF-6198] - No SOAPFault for HTTP error code 400
-* [CXF-6488] - Binding style vs part type R2203 And R2204 problems in wsdl 
document
-* [CXF-6512] - The host property is missing in Swagger2 feature's 
configuration properties
-* [CXF-6515] - provider sorting not right
-* [CXF-6517] - Regression in 3.1.2 attachment handling
-* [CXF-6522] - ThreadLocalInvocationHandler doesn't handle 
InvocationTargetException
-* [CXF-6524] - Swagger 2 feature doesn't work with blueprint endpoints
-* [CXF-6527] - WSDLRefValidator reject valid target reference URI/IRI
-* [CXF-6534] - Kerberos delegation not possible if Authorization given
-* [CXF-6535] - Swagger2Feature's properties cannot be set when using 
Blueprint
-* [CXF-6536] - XML pretty printing produces double line spacing if 
incoming XML contains linefeeds
-* [CXF-6542] - Setting the signature digest algorithm on the SAMLCallback 
does not work for WS-Security
-* [CXF-6543] - It's not possible to specify the signature + digest 
algorithms for self-signed SAML Assertions with JAX-RS
-* [CXF-6548] - LoggingOutInterceptor logs the wrong Content-Type for some 
scenarios
-* [CXF-6550] - AsyncConduitHTTPFactory will throw NPE if passed properties 
are null 
-* [CXF-6551] - Digest authentication to intermediate HTTP proxy fails with 
407 without retry
-* [CXF-6552] - Multiple chained schema imports not handled correctly
-* [CXF-6553] - Unable to override Content-Type on GET requests
-* [CXF-6558] - DefaultEncryptingOAuthDataProvider.getAccessToken throws 
SecurityException on invalid accessToken format
-* [CXF-6559] - AbstractOAuthDataProvider.refreshAccessToken method can't 
handle an invalid refresh token
-* [CXF-6561] - ResourceOwnerGrantHandler: ResourceOwnerLoginHandler can't 
return null or throw exception
-* [CXF-6570] - FormattedServiceListWriter - meta http-equiv value not 
quoted
-* [CXF-6574] -  Issue with Digest Authentication
-* [CXF-6575] - WS-A Action generation defect
-* [CXF-6577] - MessageContextImpl needs to get a property from a current 
message first
-* [CXF-6579] - Inflated tokens can be corrupted if compression ratio is 
greater than 2:1
-* [CXF-6580] - wsdl2java - Issue with import to default namespace
-* [CXF-6582] - Support newer symmetric signature algorithms with 
WS-SecurityPolicy
-* [CXF-6583] - MessageListenerTest#testLocalTransaction fails 
intermittently
-* [CXF-6584] - EncryptSignature is ignored
-* [CXF-6585] - Possible to send invalid Soap 1.2 faults
-* [CXF-6588] - NPE in providers.getMessageBodyReader
-* [CXF-6590] - MAPCodec: memory leak with sync client when soapfaults 
returned from endpoint
-* [CXF-6591] - Aegis DataSourceType.getBytes fails to close the 
InputStream fetched from DataSource, which prevents the underlying file to be 
deleted on Windows
-* [CXF-6592] - Maven[cxf-java2wadl-plugin] when stylesheetReference are 
s

[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/services/xkms/xkms-features/pom.xml
--
diff --git a/services/xkms/xkms-features/pom.xml 
b/services/xkms/xkms-features/pom.xml
index d5498e4..1136e11 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.7
+3.0.8-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/services/xkms/xkms-itests/pom.xml
--
diff --git a/services/xkms/xkms-itests/pom.xml 
b/services/xkms/xkms-itests/pom.xml
index 46fa3ab..b70b36e 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.7
+3.0.8-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/services/xkms/xkms-osgi/pom.xml
--
diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml
index 2e28caf..db6be73 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.7
+3.0.8-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/services/xkms/xkms-service/pom.xml
--
diff --git a/services/xkms/xkms-service/pom.xml 
b/services/xkms/xkms-service/pom.xml
index 4cb2d2d..07de744 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.7
+3.0.8-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/services/xkms/xkms-war/pom.xml
--
diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml
index 7508b5d..9adc4d8 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.7
+3.0.8-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/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 ee87c13..771c2cf 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.7
+3.0.8-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/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 dddbded..5c4d2a3 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.cxf
 cxf-parent
-3.0.7
+3.0.8-SNAPSHOT
 ../../../parent/pom.xml
 
 org.apache.cxf.services.xkms

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/systests/cdi/pom.xml
--
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index edb0cdb..abf3952 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -21,7 +21,7 @@
 
 cxf-parent
 org.apache.cxf
-3.0.7
+3.0.8-SNAPSHOT
 ../../parent/pom.xml
 
 4.0.0

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/systests/container-integration/grizzly/pom.xml
--
diff --git a/systests/container-integration/grizzly/pom.xml 
b/systests/container-integration/grizzly/pom.xml
index 8e8060f..99d1789 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.cxf.systests
 cxf-systests-container-integration
-3.0.7
+3.0.8-SNAPSHOT
 ../pom.xml
 
 cxf-systests-ci-grizzly

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/systests/container-integration/pom.xml
--
diff --git a/systests/container-integration/pom.xml 
b/systests/container-integration/pom.xml
index 3eacf09..ee6f214 1

[6/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

[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/3b19269b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3b19269b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3b19269b

Branch: refs/heads/3.0.x-fixes
Commit: 3b19269b0feb26787eb82a02ea36bee3ade556bf
Parents: 77d7b77
Author: Daniel Kulp 
Authored: Fri Oct 30 14:37:12 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 14:37:12 2015 -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 
 .../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/pom.xml  |  8 
 .../release/samples/wsdl_first

[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.7

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/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 0a4ebb0..bcfa5d7 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.7-SNAPSHOT
+3.0.7
 
 
 ${project.version}
@@ -38,22 +38,22 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-service
-3.0.7-SNAPSHOT
+3.0.7
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/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 7d1fbc6..36ba9c6 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.7-SNAPSHOT
+3.0.7
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/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 556e3e7..827eef5 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.7-SNAPSHOT
+3.0.7
 
 
 ${project.version}
@@ -93,32 +93,32 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf
 cxf-rt-ws-addr
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf
 cxf-rt-ws-policy
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf.services.wsn
 cxf-services-wsn-core
-3.0.7-SNAPSHOT
+3.0.7
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/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 68480ac..ab74a0d 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.samples
 cxf-samples
-3.0.7-SNAPSHOT
+3.0.7
 
 
 ${project.version}
@@ -121,17 +121,17 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.0.7-SNAPSHOT
+3.0.7
 
 
 org.springframework

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index 40becf1..1863d15 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.0.7-SNAPSHOT
+3.0.7

Git Push Summary

2015-10-30 Thread dkulp

Repository: cxf
Updated Tags:  refs/tags/cxf-3.0.7 [created] b1cf6f7f3

[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/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 bcfa5d7..d6105cf 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.7
+3.0.8-SNAPSHOT
 
 
 ${project.version}
@@ -38,22 +38,22 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-service
-3.0.7
+3.0.8-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/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 36ba9c6..f3fc754 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.7
+3.0.8-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/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 827eef5..eef9b60 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.7
+3.0.8-SNAPSHOT
 
 
 ${project.version}
@@ -93,32 +93,32 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-ws-addr
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-ws-policy
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf.services.wsn
 cxf-services-wsn-core
-3.0.7
+3.0.8-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/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 ab74a0d..25a0536 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.samples
 cxf-samples
-3.0.7
+3.0.8-SNAPSHOT
 
 
 ${project.version}
@@ -121,17 +121,17 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.0.7
+3.0.8-SNAPSHOT
 
 
 org.springframework

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b19269b/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index 1863d15..247b956 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.0.7
+3.0.8-SNAPSHOT

[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.7

2015-10-30 Thread dkulp

[maven-release-plugin] prepare release cxf-3.0.7


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

Branch: refs/heads/3.0.x-fixes
Commit: 77d7b772f311464d68d2eadaf6de9eb3fd4959be
Parents: 8e85b48
Author: Daniel Kulp 
Authored: Fri Oct 30 14:37:09 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 14:37:09 2015 -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 
 .../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/pom.xml  |  8 
 .../release/samples/wsdl_first_xml_wrapped/

[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.7

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8e85b48f7 -> 3b19269b0


http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/services/xkms/xkms-common/pom.xml
--
diff --git a/services/xkms/xkms-common/pom.xml 
b/services/xkms/xkms-common/pom.xml
index 305e7cb..40fd74e 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.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/services/xkms/xkms-features/pom.xml
--
diff --git a/services/xkms/xkms-features/pom.xml 
b/services/xkms/xkms-features/pom.xml
index 2369747..d5498e4 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.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/services/xkms/xkms-itests/pom.xml
--
diff --git a/services/xkms/xkms-itests/pom.xml 
b/services/xkms/xkms-itests/pom.xml
index cc6bd99..46fa3ab 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.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/services/xkms/xkms-osgi/pom.xml
--
diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml
index a79e1b7..2e28caf 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.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/services/xkms/xkms-service/pom.xml
--
diff --git a/services/xkms/xkms-service/pom.xml 
b/services/xkms/xkms-service/pom.xml
index 7420c96..4cb2d2d 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.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/services/xkms/xkms-war/pom.xml
--
diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml
index f831f95..7508b5d 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.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/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 1977afb..ee87c13 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.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/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 51279b7..dddbded 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.cxf
 cxf-parent
-3.0.7-SNAPSHOT
+3.0.7
 ../../../parent/pom.xml
 
 org.apache.cxf.services.xkms

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/systests/cdi/pom.xml
--
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index e752f83..edb0cdb 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -21,7 +21,7 @@
 
 cxf-parent
 org.apache.cxf
-3.0.7-SNAPSHOT
+3.0.7
 ../../parent/pom.xml
 
 4.0.0

http://git-wip-us.apache.org/repos/asf/cxf/blob/77d7b772/systests/container-integration/grizzly/pom.xml
--
diff --git a/systests/container-integration/grizzly/pom.xml 
b/systests/container-integration/grizzly/pom.xml
index f9f7ddc..8e8060f 1

cxf git commit: Fix checkstyle errors

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 2fb9ad601 -> 8e85b48f7


Fix checkstyle errors


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

Branch: refs/heads/3.0.x-fixes
Commit: 8e85b48f78501a579de159ccea44dc7caadd7691
Parents: 2fb9ad6
Author: Daniel Kulp 
Authored: Fri Oct 30 14:23:13 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 14:23:13 2015 -0400

--
 .../src/main/java/demo/jaxrs/swagger/server/Sample.java | 1 -
 .../src/main/java/demo/jaxrs/swagger/server/Sample.java | 1 -
 .../src/main/java/demo/jaxrs/swagger/server/Sample.java | 1 -
 .../src/main/java/demo/jaxrs/swagger/server/Sample.java | 1 -
 4 files changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8e85b48f/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
 
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 7b83508..557cb1d 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -19,7 +19,6 @@
 
 package demo.jaxrs.swagger.server;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8e85b48f/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 4080348..f3c1765 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -19,7 +19,6 @@
 
 package demo.jaxrs.swagger.server;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8e85b48f/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 4080348..f3c1765 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -19,7 +19,6 @@
 
 package demo.jaxrs.swagger.server;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8e85b48f/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 4080348..f3c1765 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -19,7 +19,6 @@
 
 package demo.jaxrs.swagger.server;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;

[2/2] cxf git commit: Update release notes

2015-10-30 Thread dkulp

Update release notes


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

Branch: refs/heads/3.0.x-fixes
Commit: 2fb9ad60130cb1b26e67336dde533374d88fac23
Parents: 463296f
Author: Daniel Kulp 
Authored: Fri Oct 30 13:44:08 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 13:44:08 2015 -0400

--
 distribution/src/main/release/release_notes.txt | 150 +++
 1 file changed, 86 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2fb9ad60/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 4cca539..677eb1e 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.6 Release Notes
+Apache CXF 3.0.7 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.5 fixes over 55 JIRA issues reported by users and the community.
+3.0.7 fixes over 75 JIRA issues reported by users and the community.
 
 
 
@@ -66,69 +66,91 @@ for caveats when upgrading from CXF 2.7.x to 3.0.0
 
 7. Specific issues, features, and improvements fixed in this version
 
-
 ** Bug
-* [CXF-6307] - Wrong select the message body reader
-* [CXF-6388] - NPE has been swallowed in 
org.apache.cxf.jaxrs.impl.AsyncResponseImpl
-* [CXF-6389] - set initialSuspend=true incorrectly when resume the 
asyncresponse
-* [CXF-6390] - JAXRS Async Client does not always wrap the client side 
exceptions into ProcessingException
-* [CXF-6392] - Schema imports are not handled correctly in generated WSDL 
and XSD files
-* [CXF-6393] - JAXRS Async Client unwraps a parameterized type given to 
InvocationCallback
-* [CXF-6395] - Call setTimeout() in a second request cause 
illegalStateException from web container.
-* [CXF-6398] - AlgorithmSuitePolicyValidator rejects enveloped-signature 
Transform
-* [CXF-6402] - JettyHTTPServerEngine cannot set a provided Jetty Server
-* [CXF-6403] - Potential memory leak in PolicyBasedWSS4JInInterceptor and 
AbstractWSS4JStaxInterceptor
-* [CXF-6408] - HTTP Conduit throws NPE exception for "invalid" 401 HTTP 
response
-* [CXF-6409] - CXF web service cannot process MTOM/XOP-optimized content 
within a CipherValue element
-* [CXF-6412] - MessageBodyReader and MessageBodyWritter should follow 
different sorting rule
-* [CXF-6415] - WS-RM client persistent tests are failing
-* [CXF-6429] - Provider matching when nested generic type
-* [CXF-6430] - SwA: Wrong Content-Type of root part
-* [CXF-6431] - Attachment serialization does not conform to the relevant 
specs
-* [CXF-6433] - SOAPAction value may not be extracted correctly for SOAP 
1.2 with Attachments
-* [CXF-6444] - CrossOriginResourceSharingFilter.java should not set 
Origin=* when Credentials=true
-* [CXF-6446] - WADL JavaDocProvider misses operation markers for the docs 
built with Java 8
-* [CXF-6450] - Bad handling of JAX-RS generic interfaces
-* [CXF-6451] - Set-Cookie Header incorrectly parsed
-* [CXF-6464] - The derived key versions of sign/encrypt in 
SymmetricBindingHandler don't support attachments
-* [CXF-6466] - Closing JAX-RS clients from finalize affects clients 
sharing the same conduit
-* [CXF-6468] - Secure Conversation Renew is missing Instance creation
-* [CXF-6469] - schemaLocation in xsd import is not rewritten correctly in 
Java 8
-* [CXF-6472] - Cannot create ContextResolver for class extending 
HttpServletRequest, HttpServletResponse, etc.
-* [CXF-6473] - Double signatures while using AsymmetricBindingHandler
-* [CXF-6474] - UriTemplate should not always ignore an empty/null group 
value
-* [CXF-6479] - Denial of Service: Regular Expression in StringUtils
-* [CXF-6480] - InjectionUtils createThreadLocalServletApiContext better 
error message for invalid @Context classes
-* [CXF-6481] - Jetty HTTPJ session manager Blueprint configuration is not 
effective
-* [CXF-6484] - Regression in Content-id format
-* [CXF-6489] - Cannot set ClientSecretVerifier in AbstractTokenService
-* [CXF-6491] - wadl2java produces incorrect Consumes annotation for 
multiple representations on POST methods
-* [CXF-6495] - Inconsistent RMAsserion may be built for 3.0.x
-* [CXF-6496] - NPE in SamlAssertionWrapper.assertionToStr

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 2c4907143 -> 2fb9ad601


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/463296fa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/463296fa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/463296fa

Branch: refs/heads/3.0.x-fixes
Commit: 463296fac4c11b7d173bfc7c9e382aa4e6cbc9c5
Parents: 2c49071
Author: Daniel Kulp 
Authored: Fri Oct 30 13:41:52 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 13:41:52 2015 -0400

--
 .gitmergeinfo | 66 +-
 1 file changed, 65 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/463296fa/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5275beb..74fc47a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -14,6 +14,8 @@ B 0642440cd3114db0ca86ca99987617d98634697f
 B 07297f3c75c3d16a6d81b423d545ababd714f5b9
 B 07c6322a52c12077567a48c9a87e832ea9362886
 B 08d98fbb13440de2da3b19915d8dfe21531cb284
+B 091f8bef03e671f151e21a890159e5033b1c5d86
+B 0985e79ab47124fbe0a08b9653ae7d4d1c2b5b97
 B 09c7f359ed84a1df2cab07387b3ad135846df0db
 B 0aaa2b5742a53bf31704939e4bc21906100bbc54
 B 0ab9416fda31298e485f2a6864c263447e4b32de
@@ -68,6 +70,7 @@ B 26aba8ecb5c4c461e0feac9b1c60e83b3b6a81f8
 B 27c2c25dc3c2c3019543e31afdca7b166911f278
 B 280487512eb1c34a6c05bcfe3e2e182388359a25
 B 289ee01f0c874303d5e7b473482cdf46e5f59685
+B 28a4e2ea5a35247cc50a2013371bcc178ff1d390
 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0
 B 28e8f04af96d3e353f0da5018a4531d45592c663
 B 292fe2541e32bb31a59955975972cd6adfa1a9dc
@@ -96,6 +99,7 @@ B 34e083dd1c4cccf4bda941dace30134dad546ab0
 B 3506302369c0a28647056c1da469bd9844e45826
 B 350b51632f4c5dbd4891636261909c73136981c6
 B 354ac95b70a98b4f2e8f9f33c534b3e885e9a935
+B 3634fd60f85ae12f9de68c69cb2d15a38dac772c
 B 36fcf426a4946f57b051ce7a388c7190fc97aebd
 B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6
 B 384ad75433037358ea1607c4ddcb0cd978fae10c
@@ -112,8 +116,10 @@ B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
 B 3c2092b369f06d4f71134397240092a659bcbca1
 B 3cf195384c2175085c7840dc4469837a347c7d0a
 B 3d747fa0847db2798f6662a2540d4f3a79d83edd
+B 3ea1c784f248e29dcda46b16b82ad0e923c4b6e1
 B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
 B 42b3ae5ec3ae398082e892d6c37acb0809876894
+B 42e6fde997a3b7e7408414e79e2003ec067910f3
 B 42eba2f948a967d62dc0257a920715ae47ae4310
 B 4306144c1704d2cf085d387cf0be8d9cbdd5f5b8
 B 431db5275e3a056d6cedf4608533197580cb6073
@@ -123,7 +129,9 @@ B 43babb8fc1bfd034657eb44fe82fab960034c85d
 B 43c65b07658b8041f6689d16a34ff98132b8a424
 B 441cd2cecdd8a88d42e41324643f06a2fccf5a25
 B 449a10ca63d5b3507861eb4da9f56c215eddccfb
+B 44d7b57b7cbab26767eb3e485674210214d87673
 B 44ddee3a98918261f18699b895295b53785bb9a7
+B 450e3ff7725e1d9fa51ad2aa01d927343e9520da
 B 4534b29556a1da628c920c36e4245d0d35ca6905
 B 456eff5885d85e2cfe30b639bd5a442929a3f9de
 B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3
@@ -132,6 +140,8 @@ B 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd
 B 470bdcb40597dce5e5cf957000ab60b0b4c1fce4
 B 478de215af2da2c03f439bbbd8341b234bb7bee8
 B 47b1a4ae21cfc70cea3b48ebd2be72fd184f1370
+B 4800bc8de7d7626fab25d8ab775e3da1ecec5007
+B 480332043150dcc96843c3eb7c7c660118bfaf74
 B 481466c7a42a57c87c992a02ab560be046bf5797
 B 494ff7640d78b1667547c8aacfc1d517fff00ef8
 B 49829a180d3924f3dfc8ecf41ac904e8da020ba1
@@ -154,14 +164,18 @@ B 51f433d54a1d11eac25c32b0dd69f12fef62c060
 B 52c3b6a90314086ece3b7f6df63465434879b2cd
 B 53790b4670bc17af3fd101b01aff7b62d52fac03
 B 54508131155cc71099f6f54c5ee531e159d79ca2
+B 54723262aa1cc6f33a9b158e92694c454c3904d6
+B 54ae153226739bbe4d3166291e137e600158373c
 B 5577461dfa57cb8c7c49d788276afbd9253d81c5
 B 557dc292f63176ba971ebc8c8e23e1fb74c5c4a1
 B 55bda33699ea1c2e84a125253edd594cc2a32ea3
+B 5669ebf9b7f3ed1293458d5f3ff3e3e84fde21ef
 B 5743d5e9bf547bcd0066b2369adadcbb5a8bacbd
 B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e
 B 578a51c1ba7f12b35730b0d66ac6b4ab880fb94c
 B 587b85261f83306ccdbbc5e0e176436f7991a28b
 B 5891c0d23b776d41be02e74a3b98a3881970d08f
+B 58d40a843e50f7c581a9cc2373b431bf4a3f9780
 B 58d5200bdc0f15e99f1c624c53299120518a
 B 593525139909e081ae809278d301688c0ba03697
 B 59b7fd7072a71498aecb1b5da6ec51ea89f7381b
@@ -199,8 +213,10 @@ B 69176e3dd7c69901d03f6d93bb365df784f06525
 B 698227f4a2a9341e2d4de2de6a7d827f1958fd90
 B 698cd0483b99f9638ce05557e1137ffce86d4185
 B 6994a35eaf0a71dc392dcb094a6f418ef37a12f4
+B 6a778890e91542ce0f8b92c6bbf3c3d403fa7aaa
 B 6a77cd049fc39bfd27dfe364fc7c1970e58cc455
 B 6a9b6a5ebae8a1810374457eca74d09005a920cc
+B 6aa73265ae179bb4ebc3d826c1661ecab387067b
 B 6bdc9257b691e140f435a567e0b4f566c71be6cf
 B 6c58f0c8861c9e9a922d337da4ea8282c75255c1
 B 6c9fb62220345bce0b19561d95b38d55

[1/3] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 4ee08d32a -> d3901813b


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/services/ws-discovery/pom.xml
--
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 7789948..1d11883 100644
--- a/services/ws-discovery/pom.xml
+++ b/services/ws-discovery/pom.xml
@@ -21,14 +21,14 @@
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery
 pom
-2.7.18
+2.7.19-SNAPSHOT
 Apache CXF WS-Discovery
 http://cxf.apache.org
 
 
 org.apache.cxf.services
 cxf-services
-2.7.18
+2.7.19-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/services/ws-discovery/ws-discovery-api/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml 
b/services/ws-discovery/ws-discovery-api/pom.xml
index c2c0a7d..192ba72 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
 jar
-2.7.18
+2.7.19-SNAPSHOT
 Apache CXF WS-Discovery API
 Apache CXF WS-Discovery API
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18
+2.7.19-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/services/ws-discovery/ws-discovery-service/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-service/pom.xml 
b/services/ws-discovery/ws-discovery-service/pom.xml
index c6e2a12..1760da1 100644
--- a/services/ws-discovery/ws-discovery-service/pom.xml
+++ b/services/ws-discovery/ws-discovery-service/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-service
 jar
-2.7.18
+2.7.19-SNAPSHOT
 Apache CXF WS-Discovery Service
 Apache CXF WS-Discovery Service
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18
+2.7.19-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/services/wsn/pom.xml
--
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index 9d7730f..dee6ef5 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -21,14 +21,14 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn
 pom
-2.7.18
+2.7.19-SNAPSHOT
 Apache CXF WSN service
 http://cxf.apache.org
 
 
 org.apache.cxf.services
 cxf-services
-2.7.18
+2.7.19-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/services/wsn/wsn-api/pom.xml
--
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 171054e..b182058 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn-api
 bundle
-2.7.18
+2.7.19-SNAPSHOT
 Apache CXF WSN API
 Apache CXF WSN API
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18
+2.7.19-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/services/wsn/wsn-core/pom.xml
--
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 5782ee7..1e81094 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn-core
 bundle
-2.7.18
+2.7.19-SNAPSHOT
 Apache CXF WSN Core
 Apache CXF WSN Core Service
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18
+2.7.19-SNAPSHOT
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/services/wsn/wsn-osgi/pom.xml
--
diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml
index dacdb3f..92f7e0c 100644
--- a/services/wsn/wsn-osgi/pom.xml
+++ b/services/wsn/wsn-osgi/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn-osgi
 bundle
-2.7.18
+2.7.19-SNAPSHOT
 Apache CXF WSN OSGi
 Apache CXF WSN Full OSGi
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18
+2.7.19-SNAPSHOT

[3/3] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

[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/d3901813
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d3901813
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d3901813

Branch: refs/heads/2.7.x-fixes
Commit: d3901813b61884c20630b0a35c9ca72bd54db4e3
Parents: 4ee08d3
Author: Daniel Kulp 
Authored: Fri Oct 30 12:49:08 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 12:49:08 2015 -0400

--
 api/pom.xml   |  4 ++--
 common/pom.xml|  4 ++--
 common/wstx-msv-validation/pom.xml|  4 ++--
 common/xerces-xsd-validation/pom.xml  |  4 ++--
 distribution/manifest/pom.xml |  4 ++--
 distribution/pom.xml  |  4 ++--
 .../src/main/release/samples/aegis/pom.xml| 12 ++--
 .../main/release/samples/aegis_standalone/pom.xml |  6 +++---
 .../src/main/release/samples/callback/pom.xml | 10 +-
 .../samples/configuration_interceptor/pom.xml | 12 ++--
 .../src/main/release/samples/corba/bank/pom.xml   | 10 +-
 .../samples/corba/bank_ws_addressing/pom.xml  | 10 +-
 .../release/samples/corba/hello_world/pom.xml | 10 +-
 .../release/samples/groovy_spring_support/pom.xml | 10 +-
 .../main/release/samples/in_jvm_transport/pom.xml | 12 ++--
 .../main/release/samples/java_first_jaxws/pom.xml |  8 
 .../samples/java_first_jaxws_factory_bean/pom.xml | 10 +-
 .../main/release/samples/java_first_jms/pom.xml   |  8 
 .../main/release/samples/java_first_pojo/pom.xml  | 10 +-
 .../samples/java_first_spring_support/pom.xml | 10 +-
 .../src/main/release/samples/jax_rs/basic/pom.xml | 10 +-
 .../release/samples/jax_rs/basic_https/pom.xml|  4 ++--
 .../samples/jax_rs/content_negotiation/pom.xml| 12 ++--
 .../release/samples/jax_rs/minimal_osgi/pom.xml   |  4 ++--
 .../samples/jax_rs/spring_security/pom.xml| 10 +-
 .../samples/jax_server_aegis_client/pom.xml   | 12 ++--
 .../src/main/release/samples/jaxws_async/pom.xml  | 12 ++--
 .../samples/jaxws_dispatch_provider/pom.xml   | 10 +-
 .../main/release/samples/jaxws_handlers/pom.xml   | 10 +-
 .../src/main/release/samples/jms_pubsub/pom.xml   | 10 +-
 .../src/main/release/samples/jms_queue/pom.xml|  8 
 .../main/release/samples/jms_spec_demo/pom.xml|  8 
 .../release/samples/jms_spring_config/pom.xml |  8 
 .../samples/js_browser_client_java_first/pom.xml  | 12 ++--
 .../samples/js_browser_client_simple/pom.xml  | 12 ++--
 .../src/main/release/samples/js_client/pom.xml| 12 ++--
 .../src/main/release/samples/js_provider/pom.xml  | 10 +-
 .../src/main/release/samples/logbrowser/pom.xml   |  2 +-
 .../src/main/release/samples/mtom/pom.xml | 10 +-
 .../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 | 12 ++--
 .../release/samples/ruby_spring_support/pom.xml   | 10 +-
 .../src/main/release/samples/soap_header/pom.xml  | 10 +-
 distribution/src/main/release/samples/sts/pom.xml |  4 ++--
 .../main/release/samples/ws_addressing/pom.xml| 10 +-
 .../src/main/release/samples/ws_discovery/pom.xml | 12 ++--
 .../main/release/samples/ws_notification/pom.xml  | 16 
 .../src/main/release/samples/ws_policy/pom.xml| 10 +-
 .../src/main/release/samples/ws_rm/pom.xml| 12 ++--
 .../release/samples/ws_security/sign_enc/pom.xml  | 18 +-
 .../main/release/samples/ws_security/ut/pom.xml   | 12 ++--
 .../release/samples/ws_security/ut_policy/pom.xml |  4 ++--
 .../release/samples/ws_security/ut_sign/pom.xml   | 18 +-
 .../src/main/release/samples/wsdl_first/pom.xml   |  8 
 .../samples/wsdl_first_dynamic_client/pom.xml | 10 +-
 .../main/release/samples/wsdl_first_https/pom.xml |  4 ++--
 .../release/samples/wsdl_first_pure_xml/pom.xml   | 10 +-
 .../release/samples/wsdl_first_rpclit/pom.xml | 10 +-
 .../release/samples/wsdl_first_soap12/pom.xml | 10 +-
 .../samples/wsdl_first_xml_wrapped/pom.xml| 10 +-
 .../release/samples/wsdl_first_xmlbeans/pom.xml   | 12 ++--
 integration/jca/pom.xml   |  4 ++--
 integration/pom.xml   |  4 ++--
 .../archetypes/cxf-jaxrs-service/pom.xml  |  4 ++--
 .../archetypes/cxf-jaxws-javafirst/pom.xml

[2/3] cxf git commit: [maven-release-plugin] prepare for next development iteration

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/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 3ce7650..5252cdb 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -22,12 +22,12 @@
 ws_notification
 WS-Notification Demo
 WS-Notification Demo
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18
+2.7.19-SNAPSHOT
 
 
 ${project.version}
@@ -95,32 +95,32 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-ws-addr
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-ws-policy
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf.services.wsn
 cxf-services-wsn-core
-2.7.18
+2.7.19-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/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 a3a78aa..09bce19 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -22,12 +22,12 @@
 ws_policy
 WS-Policy Demo
 WS-Policy Demo
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18
+2.7.19-SNAPSHOT
 
 
 
@@ -124,17 +124,17 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.springframework

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index 87b6eea..54d829b 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -22,12 +22,12 @@
 ws_rm
 WS-RM Demo
 WS-RM Demo
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18
+2.7.19-SNAPSHOT
 
 
 ${project.version}
@@ -118,23 +118,23 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-http
-2.7.18
+2.7.19-SNAPSHOT
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-ws-rm
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.springframework

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3901813/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml 
b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
index a98f2b3..8f54988 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
@@ -22,12 +22,12 @@
 wssec_sign_enc
 CXF WS-Security Sign Encoding Demo
 CXF WS-Security Sign Encoding Demo
-2.7.18
+2.7.19-SNAPSHOT
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18
+2.7.19-SNAPSHOT
 ../..
 
 
@@ -130,38 +130,38 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18
+2.7.19-SNAPSHOT

[2/3] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.18

2015-10-30 Thread dkulp

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/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 6c8efc3..3ce7650 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -22,12 +22,12 @@
 ws_notification
 WS-Notification Demo
 WS-Notification Demo
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18-SNAPSHOT
+2.7.18
 
 
 ${project.version}
@@ -95,32 +95,32 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-transports-http
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-ws-addr
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-ws-policy
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf.services.wsn
 cxf-services-wsn-core
-2.7.18-SNAPSHOT
+2.7.18
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/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 7e6b4c6..a3a78aa 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -22,12 +22,12 @@
 ws_policy
 WS-Policy Demo
 WS-Policy Demo
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18-SNAPSHOT
+2.7.18
 
 
 
@@ -124,17 +124,17 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-transports-http
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.springframework

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index 6e3e846..87b6eea 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -22,12 +22,12 @@
 ws_rm
 WS-RM Demo
 WS-RM Demo
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18-SNAPSHOT
+2.7.18
 
 
 ${project.version}
@@ -118,23 +118,23 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-transports-http
-2.7.18-SNAPSHOT
+2.7.18
 
 
 
 org.apache.cxf
 cxf-rt-transports-http-jetty
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf
 cxf-rt-ws-rm
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.springframework

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml 
b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
index a4c8a4a..a98f2b3 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
@@ -22,12 +22,12 @@
 wssec_sign_enc
 CXF WS-Security Sign Encoding Demo
 CXF WS-Security Sign Encoding Demo
-2.7.18-SNAPSHOT
+2.7.18
 
 
 org.apache.cxf.samples
 cxf-samples
-2.7.18-SNAPSHOT
+2.7.18
 ../..
 
 
@@ -130,38 +130,38 @@
 
 org.apache.cxf
 cxf-rt-frontend-jaxws
-2.7.18-SNAPSHOT
+2.7.18

Git Push Summary

2015-10-30 Thread dkulp

Repository: cxf
Updated Tags:  refs/tags/cxf-2.7.18 [created] e653f59e0

[3/3] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.18

2015-10-30 Thread dkulp

[maven-release-plugin] prepare release cxf-2.7.18


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

Branch: refs/heads/2.7.x-fixes
Commit: 4ee08d32ab186f13fbf6d805744a420531d70491
Parents: 7dbada7
Author: Daniel Kulp 
Authored: Fri Oct 30 12:42:54 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 12:42:54 2015 -0400

--
 api/pom.xml   |  4 ++--
 common/pom.xml|  4 ++--
 common/wstx-msv-validation/pom.xml|  4 ++--
 common/xerces-xsd-validation/pom.xml  |  4 ++--
 distribution/manifest/pom.xml |  4 ++--
 distribution/pom.xml  |  4 ++--
 .../src/main/release/samples/aegis/pom.xml| 12 ++--
 .../main/release/samples/aegis_standalone/pom.xml |  6 +++---
 .../src/main/release/samples/callback/pom.xml | 10 +-
 .../samples/configuration_interceptor/pom.xml | 12 ++--
 .../src/main/release/samples/corba/bank/pom.xml   | 10 +-
 .../samples/corba/bank_ws_addressing/pom.xml  | 10 +-
 .../release/samples/corba/hello_world/pom.xml | 10 +-
 .../release/samples/groovy_spring_support/pom.xml | 10 +-
 .../main/release/samples/in_jvm_transport/pom.xml | 12 ++--
 .../main/release/samples/java_first_jaxws/pom.xml |  8 
 .../samples/java_first_jaxws_factory_bean/pom.xml | 10 +-
 .../main/release/samples/java_first_jms/pom.xml   |  8 
 .../main/release/samples/java_first_pojo/pom.xml  | 10 +-
 .../samples/java_first_spring_support/pom.xml | 10 +-
 .../src/main/release/samples/jax_rs/basic/pom.xml | 10 +-
 .../release/samples/jax_rs/basic_https/pom.xml|  4 ++--
 .../samples/jax_rs/content_negotiation/pom.xml| 12 ++--
 .../release/samples/jax_rs/minimal_osgi/pom.xml   |  4 ++--
 .../samples/jax_rs/spring_security/pom.xml| 10 +-
 .../samples/jax_server_aegis_client/pom.xml   | 12 ++--
 .../src/main/release/samples/jaxws_async/pom.xml  | 12 ++--
 .../samples/jaxws_dispatch_provider/pom.xml   | 10 +-
 .../main/release/samples/jaxws_handlers/pom.xml   | 10 +-
 .../src/main/release/samples/jms_pubsub/pom.xml   | 10 +-
 .../src/main/release/samples/jms_queue/pom.xml|  8 
 .../main/release/samples/jms_spec_demo/pom.xml|  8 
 .../release/samples/jms_spring_config/pom.xml |  8 
 .../samples/js_browser_client_java_first/pom.xml  | 12 ++--
 .../samples/js_browser_client_simple/pom.xml  | 12 ++--
 .../src/main/release/samples/js_client/pom.xml| 12 ++--
 .../src/main/release/samples/js_provider/pom.xml  | 10 +-
 .../src/main/release/samples/logbrowser/pom.xml   |  2 +-
 .../src/main/release/samples/mtom/pom.xml | 10 +-
 .../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 | 12 ++--
 .../release/samples/ruby_spring_support/pom.xml   | 10 +-
 .../src/main/release/samples/soap_header/pom.xml  | 10 +-
 distribution/src/main/release/samples/sts/pom.xml |  4 ++--
 .../main/release/samples/ws_addressing/pom.xml| 10 +-
 .../src/main/release/samples/ws_discovery/pom.xml | 12 ++--
 .../main/release/samples/ws_notification/pom.xml  | 16 
 .../src/main/release/samples/ws_policy/pom.xml| 10 +-
 .../src/main/release/samples/ws_rm/pom.xml| 12 ++--
 .../release/samples/ws_security/sign_enc/pom.xml  | 18 +-
 .../main/release/samples/ws_security/ut/pom.xml   | 12 ++--
 .../release/samples/ws_security/ut_policy/pom.xml |  4 ++--
 .../release/samples/ws_security/ut_sign/pom.xml   | 18 +-
 .../src/main/release/samples/wsdl_first/pom.xml   |  8 
 .../samples/wsdl_first_dynamic_client/pom.xml | 10 +-
 .../main/release/samples/wsdl_first_https/pom.xml |  4 ++--
 .../release/samples/wsdl_first_pure_xml/pom.xml   | 10 +-
 .../release/samples/wsdl_first_rpclit/pom.xml | 10 +-
 .../release/samples/wsdl_first_soap12/pom.xml | 10 +-
 .../samples/wsdl_first_xml_wrapped/pom.xml| 10 +-
 .../release/samples/wsdl_first_xmlbeans/pom.xml   | 12 ++--
 integration/jca/pom.xml   |  4 ++--
 integration/pom.xml   |  4 ++--
 .../archetypes/cxf-jaxrs-service/pom.xml  |  4 ++--
 .../archetypes/cxf-jaxws-javafirst/pom.xml|  4 ++-

[1/3] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.18

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 7dbada761 -> 4ee08d32a


http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/services/ws-discovery/pom.xml
--
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 8125b85..7789948 100644
--- a/services/ws-discovery/pom.xml
+++ b/services/ws-discovery/pom.xml
@@ -21,14 +21,14 @@
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery
 pom
-2.7.18-SNAPSHOT
+2.7.18
 Apache CXF WS-Discovery
 http://cxf.apache.org
 
 
 org.apache.cxf.services
 cxf-services
-2.7.18-SNAPSHOT
+2.7.18
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/services/ws-discovery/ws-discovery-api/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml 
b/services/ws-discovery/ws-discovery-api/pom.xml
index 8187ebb..c2c0a7d 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
 jar
-2.7.18-SNAPSHOT
+2.7.18
 Apache CXF WS-Discovery API
 Apache CXF WS-Discovery API
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18-SNAPSHOT
+2.7.18
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/services/ws-discovery/ws-discovery-service/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-service/pom.xml 
b/services/ws-discovery/ws-discovery-service/pom.xml
index fcfbafc..c6e2a12 100644
--- a/services/ws-discovery/ws-discovery-service/pom.xml
+++ b/services/ws-discovery/ws-discovery-service/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-service
 jar
-2.7.18-SNAPSHOT
+2.7.18
 Apache CXF WS-Discovery Service
 Apache CXF WS-Discovery Service
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18-SNAPSHOT
+2.7.18
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/services/wsn/pom.xml
--
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index 4165576..9d7730f 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -21,14 +21,14 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn
 pom
-2.7.18-SNAPSHOT
+2.7.18
 Apache CXF WSN service
 http://cxf.apache.org
 
 
 org.apache.cxf.services
 cxf-services
-2.7.18-SNAPSHOT
+2.7.18
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/services/wsn/wsn-api/pom.xml
--
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 4466d95..171054e 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn-api
 bundle
-2.7.18-SNAPSHOT
+2.7.18
 Apache CXF WSN API
 Apache CXF WSN API
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18-SNAPSHOT
+2.7.18
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/services/wsn/wsn-core/pom.xml
--
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 3e6ffc8..5782ee7 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn-core
 bundle
-2.7.18-SNAPSHOT
+2.7.18
 Apache CXF WSN Core
 Apache CXF WSN Core Service
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18-SNAPSHOT
+2.7.18
 ../../../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4ee08d32/services/wsn/wsn-osgi/pom.xml
--
diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml
index 201b1fe..dacdb3f 100644
--- a/services/wsn/wsn-osgi/pom.xml
+++ b/services/wsn/wsn-osgi/pom.xml
@@ -21,7 +21,7 @@
 org.apache.cxf.services.wsn
 cxf-services-wsn-osgi
 bundle
-2.7.18-SNAPSHOT
+2.7.18
 Apache CXF WSN OSGi
 Apache CXF WSN Full OSGi
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
 org.apache.cxf
 cxf-parent
-2.7.18-SNAPSHOT
+2.7.18

cxf git commit: Minor update to OIDC service

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master d21d47f63 -> d58695e24


Minor update to OIDC service


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

Branch: refs/heads/master
Commit: d58695e24fa0cc7f951ba4894f0dc946fdfb27f6
Parents: d21d47f
Author: Sergey Beryozkin 
Authored: Fri Oct 30 16:08:30 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 16:08:30 2015 +

--
 .../cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d58695e2/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
index bb3b27e..e1e7c3f 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java
@@ -37,7 +37,7 @@ public class OidcAuthorizationCodeService extends 
AuthorizationCodeGrantService
 // No need to challenge the authenticated user with the authorization 
form 
 // if all the client application redirecting a user needs is to get 
this user authenticated
 // with OIDC IDP
-return requestedScope.size() == 1 && skipAuthorizationWithOidcScope
+return requestedScope.size() == 1 && permissions.size() == 1 && 
skipAuthorizationWithOidcScope
 && OPEN_ID_CONNECT_SCOPE.equals(requestedScope.get(0));
 }
 public void setSkipAuthorizationWithOidcScope(boolean 
skipAuthorizationWithOidcScope) {

cxf git commit: Fix test failures

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes ec5a2135a -> 7dbada761


Fix test failures


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

Branch: refs/heads/2.7.x-fixes
Commit: 7dbada76113a5ac539f70319ba90a9427bdde0fe
Parents: ec5a213
Author: Daniel Kulp 
Authored: Fri Oct 30 11:56:59 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:56:59 2015 -0400

--
 .../systest/jms/JMSClientServerGzipTest.java| 23 
 .../systest/jms/JMSClientServerSoap12Test.java  | 22 ---
 2 files changed, 28 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7dbada76/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
--
diff --git 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
index b372232..97b7b71 100644
--- 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
+++ 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
@@ -47,8 +47,8 @@ public class JMSClientServerGzipTest extends 
AbstractBusClientServerTestBase {
 public static final String PORT = allocatePort(GzipServer.class);
 
 static EmbeddedJMSBrokerLauncher broker;
-private String wsdlString;
-
+private static String serverWsdlString;
+private static String wsdlString;
 
 public static class GzipServer extends AbstractBusTestServerBase {
 Endpoint ep;
@@ -58,7 +58,14 @@ public class JMSClientServerGzipTest extends 
AbstractBusClientServerTestBase {
 Bus bus = bf.createBus("org/apache/cxf/systest/jms/gzipBus.xml");
 BusFactory.setDefaultBus(bus);
 setBus(bus);
-broker.updateWsdl(bus, "testutils/hello_world_doc_lit.wsdl");
+
+serverWsdlString = "testutils/hello_world_doc_lit.wsdl".intern();
+broker.updateWsdl(bus, serverWsdlString);
+
+URL u = getClass().getResource("/wsdl/hello_world_doc_lit.wsdl");
+wsdlString = u.toString().intern();
+broker.updateWsdl(getBus(), wsdlString);
+
 ep = Endpoint.publish(null, impleDoc);
 }
 public void tearDown() {
@@ -74,12 +81,10 @@ public class JMSClientServerGzipTest extends 
AbstractBusClientServerTestBase {
 
 }
 
-public URL getWSDLURL(String s) throws Exception {
+public URL getWSDLURL(String s, Bus bus) throws Exception {
 URL u = getClass().getResource(s);
 wsdlString = u.toString().intern();
-broker.updateWsdl(getBus(), wsdlString);
-System.gc();
-System.gc();
+broker.updateWsdl(bus, wsdlString);
 return u;
 }
 public QName getServiceName(QName q) {
@@ -94,10 +99,10 @@ public class JMSClientServerGzipTest extends 
AbstractBusClientServerTestBase {
 SpringBusFactory bf = new SpringBusFactory();
 Bus bus = bf.createBus("org/apache/cxf/systest/jms/gzipBus.xml");
 BusFactory.setDefaultBus(bus);
-QName serviceName = getServiceName(new 
QName("http://apache.org/hello_world_doc_lit";, 
+QName serviceName = getServiceName(new 
QName("http://apache.org/hello_world_doc_lit";,
  "SOAPService2"));
 QName portName = getPortName(new 
QName("http://apache.org/hello_world_doc_lit";, "SoapPort2"));
-URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl");
+URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl", bus);
 assertNotNull(wsdl);
 
 SOAPService2 service = new SOAPService2(wsdl, serviceName);

http://git-wip-us.apache.org/repos/asf/cxf/blob/7dbada76/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
--
diff --git 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
index 5fa1620..4b2a9e9 100644
--- 
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
+++ 
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
@@ -50,7 +50,8 @@ public class JMSClientServerSoap12Test extends 
AbstractBusClientServerTestBase {
 
 static EmbeddedJMSBrokerLaunc

[9/9] cxf git commit: Fix compile/checktyle issues after merges

2015-10-30 Thread dkulp

Fix compile/checktyle issues after merges


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

Branch: refs/heads/2.7.x-fixes
Commit: ec5a2135a31395f82d09c78a0b7efee4ded8a110
Parents: 39fde3b
Author: Daniel Kulp 
Authored: Fri Oct 30 11:22:09 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:22:09 2015 -0400

--
 .../src/main/java/org/apache/cxf/transport/http/Headers.java| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ec5a2135/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index 310fa2a..7c562c0 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -26,9 +26,11 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import java.util.logging.Level;
@@ -38,6 +40,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.HttpHeaderHelper;
 import org.apache.cxf.message.Message;
@@ -58,7 +61,6 @@ public class Headers {
 public static final String HTTP_HEADERS_LINK = "Link";
 public static final String EMPTY_REQUEST_PROPERTY = 
"org.apache.cxf.empty.request";
 private static final String SET_EMPTY_REQUEST_CT_PROPERTY = 
"set.content.type.for.empty.request";
-private static final TimeZone TIME_ZONE_GMT = TimeZone.getTimeZone("GMT");
 private static final Logger LOG = LogUtils.getL7dLogger(Headers.class);
 
 /**
@@ -72,7 +74,6 @@ public class Headers {
 HTTP_HEADERS_SINGLE_VALUE_ONLY.add(HTTP_HEADERS_LINK);
 }
 
-private static final Logger LOG = LogUtils.getL7dLogger(Headers.class);
 private final Message message;
 private final Map> headers;

[2/9] cxf git commit: Recording .gitmergeinfo Changes

2015-10-30 Thread dkulp

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/298a0de8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/298a0de8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/298a0de8

Branch: refs/heads/2.7.x-fixes
Commit: 298a0de85652613b5d8248b986a64a45ba7e3f2a
Parents: 1c9c358
Author: Daniel Kulp 
Authored: Fri Oct 30 10:57:42 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 10:57:42 2015 -0400

--
 .gitmergeinfo | 165 +
 1 file changed, 165 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/298a0de8/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 11233ee..f6acfc7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -38,6 +38,7 @@ B 02ab1002aaca0285f1f600ea2b0438defc8274a9
 B 02c588ce4ea5b26934da57cc920bfa13bdeceb98
 B 02d40450239d978d477b3ec63714c427c588e553
 B 02dbc11048a67628b3f5e4f4ea9b307acbb3130d
+B 02ec499af6967608692f0c534805c3260aa65d01
 B 02f4a46b0ccdace54f2c72854226704f9d2395e9
 B 02f690f7daee782ba51495d66dacfe222b13ac15
 B 02fe28753987ad8a2e47f1ce30b5de546357676b
@@ -63,15 +64,18 @@ B 04a3c603e46f529e9f2a3602168a051db96e1657
 B 04b535bbb4667e43492515718a061553d50644d8
 B 05935e926a50cdd5f3a9db57b2f3772f628b1929
 B 0646fdbf971885ca605cd27d5b46a413bc0e8f84
+B 0650df652c10de80c958e959ba32b9e87fa15dad
 B 0652be3b049bb06e90f93eaac8cbe6baf0db785d
 B 06696d589fbba7af84994392ffb67def0096c2a3
 B 06698761a7ba32be4fb16dc8446885dfd2885ddf
 B 067cb1017d2035f686c8ce8703ff7b26b4533f61
+B 068c2916f8c7f74e5f3154c43775be74fdad5816
 B 06a72bcaf87b6e46774b6a86189cb9b19c3a7ada
 B 06b9345031e37084fb0ed44b08cb6c6787ac3886
 B 06bb31c09125924233db7a9031e70ae6e8ce7216
 B 06bb3853d7e5998dbebd8d042114a06f4827d76f
 B 06cff924029e5bf9454fb8e3a5d07f5587268b64
+B 06e7064de67d93a68e725309260b8fe69aa57c3c
 B 0709775589ac5310bf6a68689f89db8f33463645
 B 070c8eb6a4871b78568045703eac9dffadb32db1
 B 07108f9a1f81eee219bfab33fc90391e8b9edc44
@@ -140,7 +144,9 @@ B 0e5b958dfc41d7debd5ee68b9eb8ba117ea6db75
 B 0e7bb9cdbb5f335147e2f2f82881e66f7d2000cd
 B 0e8b0570cfae8ffb7d8e0678cea09ae8d68b018c
 B 0e8efba29ee1b2151645a3714436d9546007f382
+B 0e9101fa56000500ef97573d24a899c161d4af4b
 B 0eaa88b5b1e580b660f861412d692e97cc93bdea
+B 0ebebdf58e50c47de7acf08eb5b5a075c13e179d
 B 0ec15341e8dde3ebf8956da8587a95bc0028a564
 B 0ed845dbe70783e0311ef934ed144525e7f3f705
 B 0ed88c54f0f9e0be0d6054f9cd56f0d07b4827d3
@@ -162,6 +168,7 @@ B 0ff365aa8bb9b7b2180dbf1afd17b4cc39020f40
 B 100bf13fe2cf118167f0d0aaf02c34e6337c12ec
 B 101c99fc1c7a80a0adf32f5549e5f65937c3ca28
 B 103a6aef91a0760a4bf78e53c94f5624a0af30f4
+B 106ffec44da536f4d505c912bff86ae137ce2ca8
 B 1075d1f4775b02fe7305d9b71379a857dd358fca
 B 10c0903e2efaa8e5d05aaa2d11002b64167d089a
 B 11068eb42d8598f41fb9632722eac0303be46316
@@ -172,9 +179,12 @@ B 117061fed2242b6a927467e2b6488c9fb111565a
 B 1176da8d2285120605aaede0673982f173c2b0aa
 B 118eceb436013ae2c2f94fa3dfeadc615149a0e8
 B 11bccec4f48f65f36907cd04230b1b751a34d0e1
+B 11ccc56390191c7897775dfe2f4f4a9e85de0cb3
 B 11f1414fed14e737c033122086bc95bbfd24d286
 B 1224a400fbbcb08e47b86c8079477f3eddf7b49f
+B 1242d343014ed1fa36c0d26e322be4ba7b1c0a56
 B 124d5731716007c1d9098da54a3de7d920acf6ad
+B 128a58093c90990c99ffe04081dc3c919d008c39
 B 12a73a9486961dce563f25b376626d9ae3453005
 B 12c2906a1958a1e669c6dd9ff8b7555719bee898
 B 12c910c524c8dd40149b087312763b3d2a4434b0
@@ -194,6 +204,8 @@ B 1419bea39cbfadca226db7a54d0a2f5d114b2ef9
 B 1429dd09caa3d0e0637669dbbf2b512f4c8bed24
 B 143293760b2228a8d8e67f04d8f5c63dc27e5261
 B 14585ed2de2c51a7683e392523db1a5c8c2621d5
+B 146a2a38caea493d74afadcd56532427b9d28f06
+B 146ce34e3180503de7faa0e393981e1242623517
 B 148bbc8f4a30ecd801e87db7b6621c5d39deb478
 B 14949c37fc9ac90a410137721c5ab46ff71367c1
 B 149836a341b37a494a86b251e63b136f2150f5e8
@@ -214,6 +226,7 @@ B 155751283fd85ce63d83d1636ac06f094280e82d
 B 155852427a7f9f14ace64a93295f175a9bae2d0c
 B 15693ecf4fdeb260215c71e3616aac6948a59fdc
 B 1584291eb208b918e3a232c796b69dd1bfe7776a
+B 1591faf1b9877f9a27f1a51c99ee5130bcb1e248
 B 1592a677343fb389a004e828a177a51447109584
 B 15af3fab6e707801d2cad4c1cf0ffecfecfa714b
 B 15b1671292b6e2858e7513de01d36e47aa5db102
@@ -253,6 +266,8 @@ B 186cab6a97027e54e8785deccf4433d41ad0139e
 B 187d35e7fff245c66fc582d20b390534371a6fde
 B 18ae0bda4f44425072a634f48985e3bab2f71451
 B 18b5bd970c0d44d26fa215c5917f5ba7502dc9cf
+B 18b65240a881a52528940d65833e9928f42fe29f
+B 18ef59e0115e54efe583fd124781a1f5fe2b2a1d
 B 1900e1f4ace53bc112c16f36d846f25905daab4c
 B 190b89b8630ca5f630c6af377f83db39e2cb1273
 B 190f6e24de6404ae937a02a4530e17fea8434f42
@@ -266,6 +281,7 @@ B 19d7e7275c680451273669004afa2a3f2f615ef3
 B 19e3be79a2c508666985014dcecb8dfa64c10e9b
 B 19e7643b6c7bab7a01bfae

[6/9] cxf git commit: [CXF-6347] Add the Bundle-ActivationPolicy header

2015-10-30 Thread dkulp

[CXF-6347] Add the Bundle-ActivationPolicy header

# Conflicts:
#   parent/pom.xml


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

Branch: refs/heads/2.7.x-fixes
Commit: dbc72f696b96f66c36c5dc440e587a67aa38723d
Parents: 5c08c8d
Author: Daniel Kulp 
Authored: Wed Oct 21 15:49:03 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:07:15 2015 -0400

--
 parent/pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/dbc72f69/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index d71fec2..874b6ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -514,6 +514,7 @@
 
 
 
${cxf.osgi.symbolic.name}
+
lazy
 The Apache Software 
Foundation
 
org.apache
 
${cxf.osgi.version.clean}

[3/9] cxf git commit: [CXF-6528] Adding a property for users to disable sending CT with empty requests

2015-10-30 Thread dkulp

[CXF-6528] Adding a property for users to disable sending CT with empty requests


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

Branch: refs/heads/2.7.x-fixes
Commit: 35d200341f131cdf8019f805df152aca7cee4d5d
Parents: 298a0de
Author: Sergey Beryozkin 
Authored: Thu Aug 13 13:07:26 2015 +0100
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:04:32 2015 -0400

--
 .../org/apache/cxf/transport/http/Headers.java  | 33 ++--
 1 file changed, 31 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/35d20034/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index 2cd8d91..f1d5b70 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -55,6 +55,22 @@ public class Headers {
 public static final String PROTOCOL_HEADERS_CONTENT_TYPE = 
Message.CONTENT_TYPE.toLowerCase();
 public static final String ADD_HEADERS_PROPERTY = 
"org.apache.cxf.http.add-headers"; 
 public static final String HTTP_HEADERS_SETCOOKIE = "Set-Cookie";
+public static final String HTTP_HEADERS_LINK = "Link";
+public static final String EMPTY_REQUEST_PROPERTY = 
"org.apache.cxf.empty.request";
+private static final String SET_EMPTY_REQUEST_CT_PROPERTY = 
"set.content.type.for.empty.request";
+private static final TimeZone TIME_ZONE_GMT = TimeZone.getTimeZone("GMT");
+private static final Logger LOG = LogUtils.getL7dLogger(Headers.class);
+
+/**
+ * Known HTTP headers whose values have to be represented as individual 
HTTP headers
+ */
+private static final Set HTTP_HEADERS_SINGLE_VALUE_ONLY;
+
+static {
+HTTP_HEADERS_SINGLE_VALUE_ONLY = new HashSet();
+HTTP_HEADERS_SINGLE_VALUE_ONLY.add(HTTP_HEADERS_SETCOOKIE);
+HTTP_HEADERS_SINGLE_VALUE_ONLY.add(HTTP_HEADERS_LINK);
+}
 
 private static final Logger LOG = LogUtils.getL7dLogger(Headers.class);
 private final Message message;
@@ -272,8 +288,21 @@ public class Headers {
  * @throws IOException
  */
 public void setProtocolHeadersInConnection(HttpURLConnection connection) 
throws IOException {
-String ct = determineContentType();
-connection.setRequestProperty(HttpHeaderHelper.CONTENT_TYPE, ct);
+// If no Content-Type is set for empty requests then HttpUrlConnection:
+// - sets a form Content-Type for empty POST 
+// - replaces custom Accept value with */* if HTTP proxy is used
+
+boolean dropContentType = false;
+boolean emptyRequest = 
PropertyUtils.isTrue(message.get(EMPTY_REQUEST_PROPERTY));
+if (emptyRequest) { 
+// drop only if a user explicitly requested it by setting the 
property to false
+dropContentType = !MessageUtils.getContextualBoolean(message, 
SET_EMPTY_REQUEST_CT_PROPERTY, true);
+}
+if (!dropContentType) {
+String ct = emptyRequest ? "*/*" : determineContentType();
+connection.setRequestProperty(HttpHeaderHelper.CONTENT_TYPE, ct);
+}
+ 
 transferProtocolHeadersToURLConnection(connection);
 logProtocolHeaders(Level.FINE);
 }

[4/9] cxf git commit: [CXF-6548] Updating ClientProxyImpl to avoid setting CT if the body is null and transport Headers to let custom CT stay even if the request is empty if overriding CT / is neede

2015-10-30 Thread dkulp

[CXF-6548] Updating ClientProxyImpl to avoid setting CT if the body is null and 
transport Headers to let custom CT stay even if the request is empty if 
overriding CT */* is needed


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

Branch: refs/heads/2.7.x-fixes
Commit: de02871d47a84961bff19def786236844db937f9
Parents: 35d2003
Author: Sergey Beryozkin 
Authored: Wed Aug 19 12:00:42 2015 +0100
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:05:52 2015 -0400

--
 .../http/src/main/java/org/apache/cxf/transport/http/Headers.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/de02871d/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index f1d5b70..f3a63b9 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -299,7 +299,7 @@ public class Headers {
 dropContentType = !MessageUtils.getContextualBoolean(message, 
SET_EMPTY_REQUEST_CT_PROPERTY, true);
 }
 if (!dropContentType) {
-String ct = emptyRequest ? "*/*" : determineContentType();
+String ct = emptyRequest && 
!headers.containsKey(Message.CONTENT_TYPE) ? "*/*" : determineContentType();
 connection.setRequestProperty(HttpHeaderHelper.CONTENT_TYPE, ct);
 }

[1/9] cxf git commit: Avoid useless string concat when logs are disabled

2015-10-30 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes ea7d7c750 -> ec5a2135a


Avoid useless string concat when logs are disabled


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

Branch: refs/heads/2.7.x-fixes
Commit: 1c9c358d476ad55e74626cd91499b3e7b61ce379
Parents: ea7d7c7
Author: Alessio Soldano 
Authored: Wed Jun 3 10:19:38 2015 +0200
Committer: Daniel Kulp 
Committed: Fri Oct 30 10:51:26 2015 -0400

--
 .../main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1c9c358d/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 17d6763..0516bec 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -34,6 +34,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -308,7 +309,9 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 if (cls == null 
 && ReflectionUtil.getDeclaredConstructors(claz).length > 0 
 && !Modifier.isAbstract(claz.getModifiers())) {
-LOG.info("Class " + claz.getName() + " does not have a default 
constructor which JAXB requires.");
+if (LOG.isLoggable(Level.INFO)) {
+LOG.info("Class " + claz.getName() + " does not have a 
default constructor which JAXB requires.");
+}
 //there is no init(), but other constructors
 Object factory = createFactory(claz, 
ReflectionUtil.getDeclaredConstructors(claz)[0]);
 unmarshallerProperties.put("com.sun.xml.bind.ObjectFactory", 
factory);

[5/9] cxf git commit: [CXF-6648] CT should be dropped for GETs by default

2015-10-30 Thread dkulp

[CXF-6648] CT should be dropped for GETs by default


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

Branch: refs/heads/2.7.x-fixes
Commit: 5c08c8d80e20f1afb8d28dcd2a184496537522ee
Parents: de02871
Author: Sergey Beryozkin 
Authored: Wed Oct 21 12:47:03 2015 +0100
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:06:01 2015 -0400

--
 .../java/org/apache/cxf/transport/http/Headers.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5c08c8d8/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index f3a63b9..310fa2a 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -295,8 +295,16 @@ public class Headers {
 boolean dropContentType = false;
 boolean emptyRequest = 
PropertyUtils.isTrue(message.get(EMPTY_REQUEST_PROPERTY));
 if (emptyRequest) { 
-// drop only if a user explicitly requested it by setting the 
property to false
-dropContentType = !MessageUtils.getContextualBoolean(message, 
SET_EMPTY_REQUEST_CT_PROPERTY, true);
+Object setCtForEmptyRequestProp = 
message.getContextualProperty(SET_EMPTY_REQUEST_CT_PROPERTY);
+if (setCtForEmptyRequestProp != null) {
+// If SET_EMPTY_REQUEST_CT_PROPERTY is set then do as a user 
prefers.
+// CT will be dropped if setting CT for empty requests was 
explicitly disabled
+dropContentType = 
PropertyUtils.isFalse(setCtForEmptyRequestProp);
+} else if 
("GET".equals((String)message.get(Message.HTTP_REQUEST_METHOD))) {
+// otherwise if it is GET then just drop it
+dropContentType = true;
+}
+
 }
 if (!dropContentType) {
 String ct = emptyRequest && 
!headers.containsKey(Message.CONTENT_TYPE) ? "*/*" : determineContentType();

[8/9] cxf git commit: Update release notes

2015-10-30 Thread dkulp

Update release notes


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

Branch: refs/heads/2.7.x-fixes
Commit: 39fde3bf4761adc4eff5861705f4bcc764d625dd
Parents: 7b0c84a
Author: Daniel Kulp 
Authored: Fri Oct 30 11:13:41 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:13:41 2015 -0400

--
 distribution/src/main/release/release_notes.txt | 55 
 1 file changed, 32 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/39fde3bf/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 a845c00..a4c7164 100644
--- a/distribution/src/main/release/release_notes.txt
+++ b/distribution/src/main/release/release_notes.txt
@@ -1,7 +1,10 @@
-Apache CXF 2.7.17 Release Notes
+Apache CXF 2.7.18 Release Notes
 
 1. Overview
 
+Note: 2.7.18 will be the last release on the 2.7.x line.  Users are
+STRONGLY encouraged to upgrade to the latest CXF 3.x versions.
+
 The 2.7.x versions of Apache CXF are significant new versions of CXF 
 that provides several new features and enhancements.  
 
@@ -28,8 +31,7 @@ In particular, Apache CXF no longer supports Java5.   Users 
must upgrade to
 Java 6 in order to upgrade to Apache CXF 2.7.x.
 
 
-2.7.17 fixes over 18 JIRA issues reported by users and the community.
-
+2.7.18 fixes over 25 JIRA issues reported by users and the community.
 
 
 2. Installation Prerequisites 
@@ -72,28 +74,35 @@ for caveats when upgrading from CXF 2.6.x to 2.7.x.
 
 7. Specific issues, features, and improvements fixed in this version
 
-
 ** Bug
-* [CXF-6392] - Schema imports are not handled correctly in generated WSDL 
and XSD files
-* [CXF-6402] - JettyHTTPServerEngine cannot set a provided Jetty Server
-* [CXF-6408] - HTTP Conduit throws NPE exception for "invalid" 401 HTTP 
response
-* [CXF-6430] - SwA: Wrong Content-Type of root part
-* [CXF-6431] - Attachment serialization does not conform to the relevant 
specs
-* [CXF-6433] - SOAPAction value may not be extracted correctly for SOAP 
1.2 with Attachments
-* [CXF-6444] - CrossOriginResourceSharingFilter.java should not set 
Origin=* when Credentials=true
-* [CXF-6467] - Jaxrs client handles array type property in a form object 
as a single element
-* [CXF-6469] - schemaLocation in xsd import is not rewritten correctly in 
Java 8
-* [CXF-6473] - Double signatures while using AsymmetricBindingHandler
-* [CXF-6479] - Denial of Service: Regular Expression in StringUtils
-* [CXF-6480] - InjectionUtils createThreadLocalServletApiContext better 
error message for invalid @Context classes
-* [CXF-6484] - Regression in Content-id format
-* [CXF-6502] - JAXRSInInterceptor throw 
java.lang.IndexOutOfBoundsException if content-type header is empty
+* [CXF-6198] - No SOAPFault for HTTP error code 400
+* [CXF-6413] - WSDL Import SchemaLocation Error on Relative Path
+* [CXF-6488] - Binding style vs part type R2203 And R2204 problems in wsdl 
document
+* [CXF-6517] - Regression in 3.1.2 attachment handling
+* [CXF-6519] - WS-RM - Invalid response for CloseSequence
+* [CXF-6522] - ThreadLocalInvocationHandler doesn't handle 
InvocationTargetException
+* [CXF-6527] - WSDLRefValidator reject valid target reference URI/IRI
+* [CXF-6551] - Digest authentication to intermediate HTTP proxy fails with 
407 without retry
+* [CXF-6570] - FormattedServiceListWriter - meta http-equiv value not 
quoted
+* [CXF-6574] -  Issue with Digest Authentication
+* [CXF-6575] - WS-A Action generation defect
+* [CXF-6579] - Inflated tokens can be corrupted if compression ratio is 
greater than 2:1
+* [CXF-6580] - wsdl2java - Issue with import to default namespace
+* [CXF-6591] - Aegis DataSourceType.getBytes fails to close the 
InputStream fetched from DataSource, which prevents the underlying file to be 
deleted on Windows
+* [CXF-6593] - Some thread-local contexts may get lost on the client side 
after a refresh
+* [CXF-6599] - CXF ProxyHelper might cause OOM like conditions
+* [CXF-6606] - Encoded characters in URI are decoded multiple times during 
preprocess
+* [CXF-6609] - Data Race in 
org/apache/cxf/transport/http/HTTPConduit.prepare 
+* [CXF-6614] - "Comparison method violates its general contract" in 
DestinationRegistryImpl.getSortedDestinations
+* [CXF-6621] - Schema imports are not handled correctly in generated WSDL 
and XSD files when using catalog rewrites
+* [CXF-6632] - M

[7/9] cxf git commit: Recording .gitmergeinfo Changes

2015-10-30 Thread dkulp

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/7b0c84ab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7b0c84ab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7b0c84ab

Branch: refs/heads/2.7.x-fixes
Commit: 7b0c84abd100f086c1de10c40fcee3fde749d6a4
Parents: dbc72f6
Author: Daniel Kulp 
Authored: Fri Oct 30 11:07:40 2015 -0400
Committer: Daniel Kulp 
Committed: Fri Oct 30 11:07:40 2015 -0400

--
 .gitmergeinfo | 112 +
 1 file changed, 112 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7b0c84ab/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f6acfc7..9d36c8c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -88,6 +88,7 @@ B 0806c75d3dc7a43847f5d4ab263d15c4ed5d093b
 B 080bd762e7e09f7fe1d1fa2d7c55bc6626f539d9
 B 0877b2a7bfc496b6d8d57083abbee2fbfd50c221
 B 0885ab9c1e8e11a217214473255bfae817c92261
+B 088ede7b409faceb7bfd9e007c2b13839a22345f
 B 089343fe8e895c7d348158787468082bb62ef668
 B 08d1696db5290e00b82ee42ac72fe40383028cb6
 B 08f29acf03e6aa1b227bf4c12b1c76c64d31c625
@@ -108,6 +109,7 @@ B 0a34954aef0f90ac704a2d0305dd5b7f361e8d2e
 B 0a58aeb558b8b45ed3158f881437cc03018af020
 B 0a7a0d023cffec2db34da7df4582c832dabbcdcd
 B 0aa3a159bc3657110e1fc6810f0c34ed578eb11d
+B 0ac4ffd4ca8da307a53d50fbceedb55c53fe01f8
 B 0ae6e7910f19193866e7224d6caf7700e4e1f53d
 B 0b09918a2a3b5165e8d2a05f1f30736defd5e6e1
 B 0b388f815173f01ed8c599868689cb39724d8da6
@@ -158,6 +160,7 @@ B 0f3d4a6f0b6469e89fa1a3338c40ce54c47fbc2e
 B 0f45b4dce39e9674876c3ea1a6fae65f24fd47e1
 B 0f65c53f8e82600b64ebd83afaf00637a70fc8eb
 B 0f941edd39a0f5e31298ba4757019fabd3044809
+B 0f990ec1fd6450f401010e9981e5b294de03dbfd
 B 0fa7477274ea6c430f764d5c6a013bb09cae9409
 B 0fafa8c78969bb4b0f34a39e002fcb8975879db3
 B 0fcacad057b33107b82ac05db59b1a1ebc69a963
@@ -181,6 +184,7 @@ B 118eceb436013ae2c2f94fa3dfeadc615149a0e8
 B 11bccec4f48f65f36907cd04230b1b751a34d0e1
 B 11ccc56390191c7897775dfe2f4f4a9e85de0cb3
 B 11f1414fed14e737c033122086bc95bbfd24d286
+B 12100800fbf439363728a83554ff26c7f575ae54
 B 1224a400fbbcb08e47b86c8079477f3eddf7b49f
 B 1242d343014ed1fa36c0d26e322be4ba7b1c0a56
 B 124d5731716007c1d9098da54a3de7d920acf6ad
@@ -218,6 +222,7 @@ B 14c434a1a6a3b96f7092f639d639f7ffc09ed700
 B 14c7b1996bf6c77b0ca34be4211ee6af300a627e
 B 14e26574a82629afefcda69cfd2929735b84c622
 B 14e5105e661009d47a1759b6decaa11fe58bbdb5
+B 14fcfdfba181dbbdf0fbe167edae5400dbd3ccb0
 B 150dc1a3198f35876640cbc708ae9d3e96a88058
 B 1512a124d1516e8dbf482d791735d9f4f31133fb
 B 1523d2db534fcd588cfd2d1f3d02cb8ee64a68d0
@@ -237,6 +242,7 @@ B 1645e0e7edf81287a2b6d6f47d18a4619c4949d2
 B 164762235a9dcfdbaee6eb4f88f26db10f4c3204
 B 166996384129e52460fdfe71b4e503ff0af15b33
 B 1698674ee0fbf4d7d5aace49c4a275ef4359641d
+B 16a5d26bdd2669d0657575b4e87b58f2242fa663
 B 16aa7aa8eafa9fbfaaf988466dbaf4a405e5e39a
 B 16c3c8706077a4cfeea9be62446b1ee18ec77cb3
 B 16cff265ea0002e225b1bdbbaa6b5a621e0a182b
@@ -244,6 +250,7 @@ B 16d26a02d5496df1e6cc406a3ff8dad0efd96573
 B 16ed4ea3179c5c19e7baca9c4d1380fd5d995006
 B 16f33edc9fe9e055834b1f8d15c69663250894e9
 B 16f7e32ba9059bac2898464232f5f58d7730eb7d
+B 16fd4475dc9aa1f104a2214cf284d86d2085a457
 B 17049b58a2629089d043e374432be733d9f4cca9
 B 1704fa3169b05c9e41e0c10b4c5cbd8ea83f1826
 B 1731258de6957803540284199f3a4b9863e19d0d
@@ -344,9 +351,11 @@ B 1f53a422fff66fa4c96ab0b2ea9a942d6462763a
 B 1f5a2ffd40913b8463463ef53c9efcfbae3678c4
 B 1f6f2b34e95d321fa055e110c5dac01534eb6e89
 B 1f7316fecd392173b7a50be4c4d6b6ccd9b1e277
+B 1f7509eb554a8d3fef35a69b38d89e92bab66577
 B 1f7d6ad5c95532a3523f940d9daf277c6a03f4d9
 B 1f82b3bd4deda1394df81d623897693f168e28e6
 B 1f85add51a0952d026a94172b1cb2ac957abd055
+B 1fa10032597f71057b31efd7967152dc23c503aa
 B 1fa8b744f529ec4aa341522c9a722234d5bdc15b
 B 1fc25ea2bcefd89cceb70ffe25b2f91b400ea232
 B 1fc4ba5e78e3b4c1790e2364aff29b2fcf9cb79e
@@ -389,6 +398,8 @@ B 2296e119c02a1ac5d95492bb5fc4e24e0c02b979
 B 229bc4ccaed5d4989b3ec363b1964cb2df00cf6e
 B 22ac3203afc7c5017b266e25fdde0df16c294b54
 B 22bc02ff306aba39fc89bbd205d73523a0c4b566
+B 22c81c35d553d19ede8682ec7c81a608c7e27398
+B 22cc2a6dab1c9e0b9f80efc60d9a47b8b2c09c0b
 B 22dbf10ed281f3ec94b159829e21333f4afc0bf9
 B 22e352f442b62be811b25fba200f2f3158d41132
 B 22f0802eb1755df93e7a992fa308d3d909e830f4
@@ -441,6 +452,7 @@ B 27dd4216bcf72e0a4589aa92583c3e2293305cd7
 B 27e7ac7cfb52bbab1051d23b002ec7996f1939cc
 B 27e80bbffacc5d119d53f203ed1044a406969497
 B 27fa54fcf7220076503106fa554b1eb74d8103ac
+B 27feb091601c7fb2bb416e0c88119775ff579223
 B 2806c0f0d94c3f3f594d47cdc2c1c2bfdac375e7
 B 2816469014ec116559cd405720271457f13432b9
 B 28244858cadc3596f760b37c1e1f9331441364d2
@@ -456,6 +468,7 @@ B 2932201285b61c4e267a90648500

cxf git commit: Few more OIDC RP changes

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 7557d5fcf -> 2c4907143


Few more OIDC RP changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 2c4907143d59297a3f94fdd8cf096863535bc9c6
Parents: 7557d5f
Author: Sergey Beryozkin 
Authored: Fri Oct 30 14:37:19 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 14:38:07 2015 +

--
 .../security/oidc/rp/OidcSecurityContext.java   | 11 ---
 .../cxf/rs/security/oidc/utils/OidcUtils.java   | 20 +++-
 2 files changed, 19 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2c490714/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
index df0242f..d31c189 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
@@ -31,17 +31,22 @@ public class OidcSecurityContext extends 
SimpleSecurityContext implements Securi
 this(new OidcClientTokenContextImpl(token));
 }
 public OidcSecurityContext(OidcClientTokenContext oidcContext) {
-super(getUserName(oidcContext));
+super(getPrincipalName(oidcContext));
 this.oidcContext = oidcContext;
 }
 public OidcClientTokenContext getOidcContext() {
 return oidcContext;
 }
-private static String getUserName(OidcClientTokenContext oidcContext) {
+private static String getPrincipalName(OidcClientTokenContext oidcContext) 
{
 if (oidcContext.getUserInfo() != null) {
 return oidcContext.getUserInfo().getEmail();
 } else {
-return oidcContext.getIdToken().getEmail();
+IdToken token = oidcContext.getIdToken();
+String name = token.getEmail();
+if (name == null) {
+name = token.getSubject();
+}
+return name;
 }
 }
 @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/2c490714/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index 1a0c3de..ccad6d7 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -92,21 +92,23 @@ public final class OidcUtils {
 validateAccessTokenHash(at, jwt, true);
 }
 public static void validateAccessTokenHash(ClientAccessToken at, JwtToken 
jwt, boolean required) {
-validateHash(at.getTokenKey(),
- (String)jwt.getClaims().getClaim("at_hash"),
- jwt.getHeaders().getAlgorithm(),
- required);
+if (required) {
+validateHash(at.getTokenKey(),
+ (String)jwt.getClaims().getClaim("at_hash"),
+ jwt.getHeaders().getAlgorithm());
+}
 }
 public static void validateCodeHash(String code, JwtToken jwt) {
 validateCodeHash(code, jwt, true);
 }
 public static void validateCodeHash(String code, JwtToken jwt, boolean 
required) {
-validateHash(code,
- (String)jwt.getClaims().getClaim("c_hash"),
- jwt.getHeaders().getAlgorithm(),
- required);
+if (required) {
+validateHash(code,
+ (String)jwt.getClaims().getClaim("c_hash"),
+ jwt.getHeaders().getAlgorithm());
+}
 }
-private static void validateHash(String value, String theHash, String 
joseAlgo, boolean required) {
+private static void validateHash(String value, String theHash, String 
joseAlgo) {
 String hash = calculateHash(value, joseAlgo);
 if (!hash.equals(theHash)) {
 throw new SecurityException("Invalid hash");

cxf git commit: Few more OIDC RP changes

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master 671cfa85a -> d21d47f63


Few more OIDC RP changes


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

Branch: refs/heads/master
Commit: d21d47f632669b5fd025815b267926a9e19e4d64
Parents: 671cfa8
Author: Sergey Beryozkin 
Authored: Fri Oct 30 14:37:19 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 14:37:19 2015 +

--
 .../security/oidc/rp/OidcSecurityContext.java   | 11 ---
 .../cxf/rs/security/oidc/utils/OidcUtils.java   | 20 +++-
 2 files changed, 19 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d21d47f6/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
index df0242f..d31c189 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcSecurityContext.java
@@ -31,17 +31,22 @@ public class OidcSecurityContext extends 
SimpleSecurityContext implements Securi
 this(new OidcClientTokenContextImpl(token));
 }
 public OidcSecurityContext(OidcClientTokenContext oidcContext) {
-super(getUserName(oidcContext));
+super(getPrincipalName(oidcContext));
 this.oidcContext = oidcContext;
 }
 public OidcClientTokenContext getOidcContext() {
 return oidcContext;
 }
-private static String getUserName(OidcClientTokenContext oidcContext) {
+private static String getPrincipalName(OidcClientTokenContext oidcContext) 
{
 if (oidcContext.getUserInfo() != null) {
 return oidcContext.getUserInfo().getEmail();
 } else {
-return oidcContext.getIdToken().getEmail();
+IdToken token = oidcContext.getIdToken();
+String name = token.getEmail();
+if (name == null) {
+name = token.getSubject();
+}
+return name;
 }
 }
 @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/d21d47f6/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index 1a0c3de..ccad6d7 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -92,21 +92,23 @@ public final class OidcUtils {
 validateAccessTokenHash(at, jwt, true);
 }
 public static void validateAccessTokenHash(ClientAccessToken at, JwtToken 
jwt, boolean required) {
-validateHash(at.getTokenKey(),
- (String)jwt.getClaims().getClaim("at_hash"),
- jwt.getHeaders().getAlgorithm(),
- required);
+if (required) {
+validateHash(at.getTokenKey(),
+ (String)jwt.getClaims().getClaim("at_hash"),
+ jwt.getHeaders().getAlgorithm());
+}
 }
 public static void validateCodeHash(String code, JwtToken jwt) {
 validateCodeHash(code, jwt, true);
 }
 public static void validateCodeHash(String code, JwtToken jwt, boolean 
required) {
-validateHash(code,
- (String)jwt.getClaims().getClaim("c_hash"),
- jwt.getHeaders().getAlgorithm(),
- required);
+if (required) {
+validateHash(code,
+ (String)jwt.getClaims().getClaim("c_hash"),
+ jwt.getHeaders().getAlgorithm());
+}
 }
-private static void validateHash(String value, String theHash, String 
joseAlgo, boolean required) {
+private static void validateHash(String value, String theHash, String 
joseAlgo) {
 String hash = calculateHash(value, joseAlgo);
 if (!hash.equals(theHash)) {
 throw new SecurityException("Invalid hash");

[4/4] cxf git commit: Recording .gitmergeinfo Changes

2015-10-30 Thread asoldano

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/7557d5fc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7557d5fc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7557d5fc

Branch: refs/heads/3.0.x-fixes
Commit: 7557d5fcf6fb7b11d665e0778f80c139a0dc66bc
Parents: 3ed8496
Author: Alessio Soldano 
Authored: Fri Oct 30 15:18:38 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:48 2015 +0100

--
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7557d5fc/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ea84691..5275beb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -485,6 +485,7 @@ B ffb10f12d5b84cef8fbd411da3d3fd54729f4893
 B ffc766ccd1d800c10d8ee52c74d69087dcc19c62
 B ffd429be404953874e141c52a9c8ba46812d73ca
 M 008c8835a460736b6491204aa999712442c7b364
+M 01860c78f6fd7554cf89a9bc912ca78d2b304efe
 M 00a5a1d6b1da5f3b679c25d4bd988d1277ee62e7
 M 00b626af504d3d59419ec2d1eb5e39943ec5b8aa
 M 05383ffcfc3fe16c6acadf1a343375c00fa1116c
@@ -653,6 +654,7 @@ M ad75192db72294e6d117e020aea890a50c166f79
 M af2f7d3a52076f60d0f98a2635e2adef256a9efe
 M b283eeb95544b6088331b37567c851564655bff4
 M b33b7d7ab68f4002b4302a26e6fb339cd495765b
+M b3bf20abb23f186dbdb0e16519d5c02bbaf5a3ce
 M b4aa01a0de28462f7338d232e2e88be8512882af
 M b5320827561467de7e04afdba15a6063d26493a3
 M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
@@ -701,6 +703,7 @@ M eb3dd938052b3e853b0cf85dacf31ef7f802af38
 M eb9e13e2dd4a22b1d777095a5d92139829d550b8
 M efaf05170b4f76ad61ff423e30ece58bdd226ae5
 M f02b02934bf78504ffc462c364dc43e386e727b2
+M f1a015924d53e5e253aad55a49ef9a1853b6c26f
 M f399b9290e42726e30333f261d8d7f6abc4768cc
 M f3cfadb6e7bae9233a03fa6bf862ed8eb64ce237
 M f456dd41b6352dd55404272d351b1580b53558f7

[2/4] cxf git commit: [CXF-6655] Modifying test to reproduce the failure scenario

2015-10-30 Thread asoldano

[CXF-6655] Modifying test to reproduce the failure scenario


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

Branch: refs/heads/3.0.x-fixes
Commit: 6dd411a93c3f8c936f54f47e0d66873c9ae35530
Parents: 0ac4ffd
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:07 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:47 2015 +0100

--
 .../org/apache/cxf/systest/jaxws/CXF6655Test.java   | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6dd411a9/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
index d8eca96..6dcd38b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -80,12 +80,24 @@ public class CXF6655Test extends 
AbstractClientServerTestBase {
new HashMap());
 proxy.start();
 }
+
+@Test
+public void testConnection() throws Exception {
+QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/";, 
"HelloService");
+HelloService service = new HelloService(null, serviceName);
+assertNotNull(service);
+Hello hello = service.getHelloPort();
+
+
((BindingProvider)hello).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + 
PORT + "/hello");
+assertEquals("getSayHi", hello.sayHi("SayHi"));
+
+}
 
 @Test
 public void testConnectionWithProxy() throws Exception {
 QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/";, 
"HelloService");
-HelloService service = new 
HelloService(getClass().getResource("/wsdl/others/hello.wsdl"),
-serviceName);
+HelloService service = new HelloService(null, serviceName);
 assertNotNull(service);
 Hello hello = service.getHelloPort();

[1/4] cxf git commit: [CXF-6655] Do not early fail when the HTTPConduit is initialized before a target address is set in the client (and there's no reference to a wsdl contract), perhaps because the u

2015-10-30 Thread asoldano

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c9b4c04b2 -> 7557d5fcf


[CXF-6655] Do not early fail when the HTTPConduit is initialized before a 
target address is set in the client (and there's no reference to a wsdl 
contract), perhaps because the user is setting up a proxy in the conduit; try 
using the endpoint address set in the request context just before performing 
the invocation (and fail if that's not available either).


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

Branch: refs/heads/3.0.x-fixes
Commit: 3ed849631e4f817d5d988e4d642575c9dd5b7b16
Parents: 6dd411a
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:32 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:47 2015 +0100

--
 .../apache/cxf/transport/http/HTTPConduit.java  | 38 ++--
 1 file changed, 28 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3ed84963/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 83e5960..7f9b6fd 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -676,10 +676,14 @@ public abstract class HTTPConduit
 setAndGetDefaultAddress();
 if (result == null) {
 if (pathInfo == null && queryString == null) {
-message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 return defaultAddress;
 }
-message.put(Message.ENDPOINT_ADDRESS, defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 }
 
 // REVISIT: is this really correct?
@@ -688,8 +692,12 @@ public abstract class HTTPConduit
 }
 if (queryString != null) {
 result = result + "?" + queryString;
-}
-return result.equals(defaultAddress.getString()) ? defaultAddress : 
new Address(result);
+}
+if (defaultAddress == null) {
+return setAndGetDefaultAddress(result);
+} else {
+return result.equals(defaultAddress.getString()) ? defaultAddress 
: new Address(result);
+}
 }
 
 /**
@@ -726,12 +734,7 @@ public abstract class HTTPConduit
 if (defaultAddress == null) {
 if (fromEndpointReferenceType && 
getTarget().getAddress().getValue() != null) {
 defaultAddress = new 
Address(this.getTarget().getAddress().getValue());
-} else {
-if (endpointInfo.getAddress() == null) {
-throw new URISyntaxException("", 
- "Invalid address. 
Endpoint address cannot be null.",
- 0);
-}
+} else if (endpointInfo.getAddress() != null) {
 defaultAddress = new 
Address(endpointInfo.getAddress());
 }
 }
@@ -740,6 +743,21 @@ public abstract class HTTPConduit
 return defaultAddress;
 }
 
+private Address setAndGetDefaultAddress(String curAddr) throws 
URISyntaxException {
+if (defaultAddress == null) {
+synchronized (this) {
+if (defaultAddress == null) {
+if (curAddr != null) {
+defaultAddress = new Address(curAddr);
+} else {
+throw new URISyntaxException("",
+ "Invalid address. 
Endpoint address cannot be null.", 0);
+}
+}
+}
+}
+return defaultAddress;
+}
 /**
  * This call places HTTP Header strings into the headers that are relevant
  * to the Authorization policies that are set on this conduit by

[3/4] cxf git commit: [CXF-6655] Adding testcase

2015-10-30 Thread asoldano

[CXF-6655] Adding testcase


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

Branch: refs/heads/3.0.x-fixes
Commit: 0ac4ffd4ca8da307a53d50fbceedb55c53fe01f8
Parents: c9b4c04
Author: Alessio Soldano 
Authored: Fri Oct 30 00:15:20 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:47 2015 +0100

--
 systests/jaxws/pom.xml  |  15 +++
 .../apache/cxf/systest/jaxws/CXF6655Test.java   | 109 +++
 2 files changed, 124 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0ac4ffd4/systests/jaxws/pom.xml
--
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 372c2b7..3cf699a 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -249,6 +249,21 @@
 ${cxf.netty3.version}
 test
 
+
+org.littleshoot
+littleproxy
+0.4
+
+
+log4j
+log4j
+
+
+org.slf4j
+slf4j-log4j12
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/0ac4ffd4/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
new file mode 100644
index 000..d8eca96
--- /dev/null
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -0,0 +1,109 @@
+/**
+ * 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.jaxws;
+
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.apache.cxf.transports.http.configuration.ProxyServerType;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.littleshoot.proxy.DefaultHttpProxyServer;
+import org.littleshoot.proxy.HttpFilter;
+import org.littleshoot.proxy.ProxyUtils;
+
+public class CXF6655Test extends AbstractClientServerTestBase {
+static final String PORT = allocatePort(Server.class);
+static final int PROXY_PORT = 
Integer.parseInt(allocatePort(CXF6655Test.class));
+static DefaultHttpProxyServer proxy;
+
+public static class Server extends AbstractBusTestServerBase {
+
+protected void run() {
+Object implementor = new HelloImpl();
+String address = "http://localhost:"; + PORT + "/hello";
+Endpoint.publish(address, implementor);
+}
+
+public static void main(String[] args) {
+try {
+Server s = new Server();
+s.start();
+} catch (Exception ex) {
+ex.printStackTrace();
+System.exit(-1);
+} finally {
+System.out.println("done!");
+}
+}
+}
+
+@AfterClass
+public static void stopProxy() {
+proxy.stop();
+proxy = null;
+}
+
+@BeforeClass
+public static void startServers() throws Exception {
+assertTrue("server did not launch correctly", 
launchServer(Server.class, true)

cxf git commit: Updating one of IdTokenReader setters

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c0cb4ccad -> c9b4c04b2


Updating one of IdTokenReader setters


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

Branch: refs/heads/3.0.x-fixes
Commit: c9b4c04b257cdaa1c3cde2903872227ad0aab1fb
Parents: c0cb4cc
Author: Sergey Beryozkin 
Authored: Fri Oct 30 14:13:31 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 14:15:03 2015 +

--
 .../java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c9b4c04b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
index 5e61a36..b5bbbf1 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
@@ -48,7 +48,7 @@ public class IdTokenReader extends AbstractTokenValidator {
 private IdToken getIdTokenFromJwt(JwtToken jwt) {
 return new IdToken(jwt.getClaims().asMap());
 }
-public void setRequireAtHash(boolean requireAtHash) {
-this.requireAtHash = requireAtHash;
+public void setRequireAccessTokenHash(boolean require) {
+this.requireAtHash = require;
 }
 }

cxf git commit: Updating one of IdTokenReader setters

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master f1a015924 -> 671cfa85a


Updating one of IdTokenReader setters


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

Branch: refs/heads/master
Commit: 671cfa85a894687499789f0949349e2c682edbea
Parents: f1a0159
Author: Sergey Beryozkin 
Authored: Fri Oct 30 14:13:31 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 14:13:31 2015 +

--
 .../java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/671cfa85/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
index e5dc3c7..9072add 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenReader.java
@@ -48,7 +48,7 @@ public class IdTokenReader extends AbstractTokenValidator {
 private IdToken getIdTokenFromJwt(JwtToken jwt) {
 return new IdToken(jwt.getClaims().asMap());
 }
-public void setRequireAtHash(boolean requireAtHash) {
-this.requireAtHash = requireAtHash;
+public void setRequireAccessTokenHash(boolean require) {
+this.requireAtHash = require;
 }
 }

[3/3] cxf git commit: [CXF-6655] Adding testcase

2015-10-30 Thread asoldano

[CXF-6655] Adding testcase


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

Branch: refs/heads/master
Commit: b3bf20abb23f186dbdb0e16519d5c02bbaf5a3ce
Parents: 8dc621b
Author: Alessio Soldano 
Authored: Fri Oct 30 00:15:20 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 14:17:37 2015 +0100

--
 systests/jaxws/pom.xml  |  15 +++
 .../apache/cxf/systest/jaxws/CXF6655Test.java   | 109 +++
 2 files changed, 124 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3bf20ab/systests/jaxws/pom.xml
--
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 3c9d960..634e3cd 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -262,6 +262,21 @@
 ${cxf.netty3.version}
 test
 
+
+org.littleshoot
+littleproxy
+0.4
+
+
+log4j
+log4j
+
+
+org.slf4j
+slf4j-log4j12
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b3bf20ab/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
new file mode 100644
index 000..d8eca96
--- /dev/null
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -0,0 +1,109 @@
+/**
+ * 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.jaxws;
+
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.apache.cxf.transports.http.configuration.ProxyServerType;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.littleshoot.proxy.DefaultHttpProxyServer;
+import org.littleshoot.proxy.HttpFilter;
+import org.littleshoot.proxy.ProxyUtils;
+
+public class CXF6655Test extends AbstractClientServerTestBase {
+static final String PORT = allocatePort(Server.class);
+static final int PROXY_PORT = 
Integer.parseInt(allocatePort(CXF6655Test.class));
+static DefaultHttpProxyServer proxy;
+
+public static class Server extends AbstractBusTestServerBase {
+
+protected void run() {
+Object implementor = new HelloImpl();
+String address = "http://localhost:"; + PORT + "/hello";
+Endpoint.publish(address, implementor);
+}
+
+public static void main(String[] args) {
+try {
+Server s = new Server();
+s.start();
+} catch (Exception ex) {
+ex.printStackTrace();
+System.exit(-1);
+} finally {
+System.out.println("done!");
+}
+}
+}
+
+@AfterClass
+public static void stopProxy() {
+proxy.stop();
+proxy = null;
+}
+
+@BeforeClass
+public static void startServers() throws Exception {
+assertTrue("server did not launch correctly", 
launchServer(Server.class, true));
+

[1/3] cxf git commit: [CXF-6655] Do not early fail when the HTTPConduit is initialized before a target address is set in the client (and there's no reference to a wsdl contract), perhaps because the u

2015-10-30 Thread asoldano

Repository: cxf
Updated Branches:
  refs/heads/master 8dc621b15 -> f1a015924


[CXF-6655] Do not early fail when the HTTPConduit is initialized before a 
target address is set in the client (and there's no reference to a wsdl 
contract), perhaps because the user is setting up a proxy in the conduit; try 
using the endpoint address set in the request context just before performing 
the invocation (and fail if that's not available either).


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

Branch: refs/heads/master
Commit: f1a015924d53e5e253aad55a49ef9a1853b6c26f
Parents: 01860c7
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:32 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 14:17:37 2015 +0100

--
 .../apache/cxf/transport/http/HTTPConduit.java  | 38 ++--
 1 file changed, 28 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f1a01592/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index f120abb..bb21424 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -676,10 +676,14 @@ public abstract class HTTPConduit
 setAndGetDefaultAddress();
 if (result == null) {
 if (pathInfo == null && queryString == null) {
-message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 return defaultAddress;
 }
-message.put(Message.ENDPOINT_ADDRESS, defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 }
 
 // REVISIT: is this really correct?
@@ -688,8 +692,12 @@ public abstract class HTTPConduit
 }
 if (queryString != null) {
 result = result + "?" + queryString;
-}
-return result.equals(defaultAddress.getString()) ? defaultAddress : 
new Address(result);
+}
+if (defaultAddress == null) {
+return setAndGetDefaultAddress(result);
+} else {
+return result.equals(defaultAddress.getString()) ? defaultAddress 
: new Address(result);
+}
 }
 
 /**
@@ -726,12 +734,7 @@ public abstract class HTTPConduit
 if (defaultAddress == null) {
 if (fromEndpointReferenceType && 
getTarget().getAddress().getValue() != null) {
 defaultAddress = new 
Address(this.getTarget().getAddress().getValue());
-} else {
-if (endpointInfo.getAddress() == null) {
-throw new URISyntaxException("", 
- "Invalid address. 
Endpoint address cannot be null.",
- 0);
-}
+} else if (endpointInfo.getAddress() != null) {
 defaultAddress = new 
Address(endpointInfo.getAddress());
 }
 }
@@ -740,6 +743,21 @@ public abstract class HTTPConduit
 return defaultAddress;
 }
 
+private Address setAndGetDefaultAddress(String curAddr) throws 
URISyntaxException {
+if (defaultAddress == null) {
+synchronized (this) {
+if (defaultAddress == null) {
+if (curAddr != null) {
+defaultAddress = new Address(curAddr);
+} else {
+throw new URISyntaxException("",
+ "Invalid address. 
Endpoint address cannot be null.", 0);
+}
+}
+}
+}
+return defaultAddress;
+}
 /**
  * This call places HTTP Header strings into the headers that are relevant
  * to the Authorization policies that are set on this conduit by

[2/3] cxf git commit: [CXF-6655] Modifying test to reproduce the failure scenario

2015-10-30 Thread asoldano

[CXF-6655] Modifying test to reproduce the failure scenario


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

Branch: refs/heads/master
Commit: 01860c78f6fd7554cf89a9bc912ca78d2b304efe
Parents: b3bf20a
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:07 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 14:17:37 2015 +0100

--
 .../org/apache/cxf/systest/jaxws/CXF6655Test.java   | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/01860c78/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
index d8eca96..6dcd38b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -80,12 +80,24 @@ public class CXF6655Test extends 
AbstractClientServerTestBase {
new HashMap());
 proxy.start();
 }
+
+@Test
+public void testConnection() throws Exception {
+QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/";, 
"HelloService");
+HelloService service = new HelloService(null, serviceName);
+assertNotNull(service);
+Hello hello = service.getHelloPort();
+
+
((BindingProvider)hello).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + 
PORT + "/hello");
+assertEquals("getSayHi", hello.sayHi("SayHi"));
+
+}
 
 @Test
 public void testConnectionWithProxy() throws Exception {
 QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/";, 
"HelloService");
-HelloService service = new 
HelloService(getClass().getResource("/wsdl/others/hello.wsdl"),
-serviceName);
+HelloService service = new HelloService(null, serviceName);
 assertNotNull(service);
 Hello hello = service.getHelloPort();

cxf git commit: [CXF-6658] Optionally ignoring ServletContextResourceResolver

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 45adf06d5 -> ea7d7c750


[CXF-6658] Optionally ignoring ServletContextResourceResolver


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

Branch: refs/heads/2.7.x-fixes
Commit: ea7d7c7509eb44043477685ebc7e60a570e2d301
Parents: 45adf06
Author: Sergey Beryozkin 
Authored: Fri Oct 30 12:39:39 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 12:45:09 2015 +

--
 .../cxf/transport/servlet/CXFNonSpringServlet.java| 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ea7d7c75/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
index f3f3ca9..3f56405 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
@@ -50,6 +50,8 @@ import 
org.apache.cxf.transport.servlet.servicelist.ServiceListGeneratorServlet;
 public class CXFNonSpringServlet extends AbstractHTTPServlet {
 
 private static final long serialVersionUID = -2437897227486327166L;
+private static final String IGNORE_SERVLET_CONTEXT_RESOLVER = 
"ignore.servlet.context.resolver";
+
 private DestinationRegistry destinationRegistry;
 private boolean globalRegistry;
 private Bus bus;
@@ -77,8 +79,7 @@ public class CXFNonSpringServlet extends AbstractHTTPServlet {
 }
 if (this.bus != null) {
 loader = initClassLoader();
-ResourceManager resourceManager = 
bus.getExtension(ResourceManager.class);
-resourceManager.addResourceResolver(new 
ServletContextResourceResolver(sc.getServletContext()));
+registerServletContextResolver(sc);
 if (destinationRegistry == null) {
 this.destinationRegistry = 
getDestinationRegistryFromBus(this.bus);
 }
@@ -88,6 +89,15 @@ public class CXFNonSpringServlet extends AbstractHTTPServlet 
{
 finalizeServletInit(sc);
 }
 
+protected void registerServletContextResolver(ServletConfig sc) {
+if 
(Boolean.valueOf(sc.getInitParameter(IGNORE_SERVLET_CONTEXT_RESOLVER))) {
+return;
+}
+
+ResourceManager resourceManager = 
bus.getExtension(ResourceManager.class);
+resourceManager.addResourceResolver(new 
ServletContextResourceResolver(sc.getServletContext()));
+}
+
 protected ClassLoader initClassLoader() {
 return bus.getExtension(ClassLoader.class);
 }

cxf git commit: [CXF-6658] Optionally ignoring ServletContextResourceResolver

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 6becd2b95 -> c0cb4ccad


[CXF-6658] Optionally ignoring ServletContextResourceResolver


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

Branch: refs/heads/3.0.x-fixes
Commit: c0cb4ccadb0c12b66cdb58ca1dca91638b44f047
Parents: 6becd2b
Author: Sergey Beryozkin 
Authored: Fri Oct 30 12:39:39 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 12:40:54 2015 +

--
 .../cxf/transport/servlet/CXFNonSpringServlet.java   | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c0cb4cca/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
index 5fba47b..86b0470 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
@@ -49,7 +49,8 @@ import 
org.apache.cxf.transport.servlet.servicelist.ServiceListGeneratorServlet;
 
 public class CXFNonSpringServlet extends AbstractHTTPServlet {
 private static final long serialVersionUID = -2437897227486327166L;
-   
+private static final String IGNORE_SERVLET_CONTEXT_RESOLVER = 
"ignore.servlet.context.resolver";
+
 protected Bus bus;
 private DestinationRegistry destinationRegistry;
 private boolean globalRegistry;
@@ -77,8 +78,7 @@ public class CXFNonSpringServlet extends AbstractHTTPServlet {
 }
 if (this.bus != null) {
 loader = initClassLoader();
-ResourceManager resourceManager = 
bus.getExtension(ResourceManager.class);
-resourceManager.addResourceResolver(new 
ServletContextResourceResolver(sc.getServletContext()));
+registerServletContextResolver(sc);
 if (destinationRegistry == null) {
 this.destinationRegistry = getDestinationRegistryFromBus();
 }
@@ -88,6 +88,15 @@ public class CXFNonSpringServlet extends AbstractHTTPServlet 
{
 finalizeServletInit(sc);
 }
 
+protected void registerServletContextResolver(ServletConfig sc) {
+if 
(Boolean.valueOf(sc.getInitParameter(IGNORE_SERVLET_CONTEXT_RESOLVER))) {
+return;
+}
+
+ResourceManager resourceManager = 
bus.getExtension(ResourceManager.class);
+resourceManager.addResourceResolver(new 
ServletContextResourceResolver(sc.getServletContext()));
+}
+
 protected ClassLoader initClassLoader() {
 return bus.getExtension(ClassLoader.class);
 }

cxf git commit: [CXF-6658] Optionally ignoring ServletContextResourceResolver

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master 4d4df394a -> 8dc621b15


[CXF-6658] Optionally ignoring ServletContextResourceResolver


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

Branch: refs/heads/master
Commit: 8dc621b15eea527f090edbe61533e3345eb7aea8
Parents: 4d4df39
Author: Sergey Beryozkin 
Authored: Fri Oct 30 12:39:39 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 12:39:39 2015 +

--
 .../cxf/transport/servlet/CXFNonSpringServlet.java   | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8dc621b1/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
index e914b1d..d1220bc 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
@@ -49,7 +49,8 @@ import 
org.apache.cxf.transport.servlet.servicelist.ServiceListGeneratorServlet;
 
 public class CXFNonSpringServlet extends AbstractHTTPServlet {
 private static final long serialVersionUID = -2437897227486327166L;
-   
+private static final String IGNORE_SERVLET_CONTEXT_RESOLVER = 
"ignore.servlet.context.resolver";
+
 protected Bus bus;
 private DestinationRegistry destinationRegistry;
 private boolean globalRegistry;
@@ -77,8 +78,7 @@ public class CXFNonSpringServlet extends AbstractHTTPServlet {
 }
 if (this.bus != null) {
 loader = initClassLoader();
-ResourceManager resourceManager = 
bus.getExtension(ResourceManager.class);
-resourceManager.addResourceResolver(new 
ServletContextResourceResolver(sc.getServletContext()));
+registerServletContextResolver(sc);
 if (destinationRegistry == null) {
 this.destinationRegistry = getDestinationRegistryFromBus();
 }
@@ -88,6 +88,15 @@ public class CXFNonSpringServlet extends AbstractHTTPServlet 
{
 finalizeServletInit(sc);
 }
 
+protected void registerServletContextResolver(ServletConfig sc) {
+if 
(Boolean.valueOf(sc.getInitParameter(IGNORE_SERVLET_CONTEXT_RESOLVER))) {
+return;
+}
+
+ResourceManager resourceManager = 
bus.getExtension(ResourceManager.class);
+resourceManager.addResourceResolver(new 
ServletContextResourceResolver(sc.getServletContext()));
+}
+
 protected ClassLoader initClassLoader() {
 return bus.getExtension(ClassLoader.class);
 }

cxf git commit: [CXF-6657] Making ResponseExceptionMapper work with FailoverFeature, patch from Florian Léger applied with tiny modifications

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master 0c7f3e166 -> 4d4df394a


[CXF-6657] Making ResponseExceptionMapper work with FailoverFeature, patch from 
Florian LÃ©ger applied with tiny modifications


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

Branch: refs/heads/master
Commit: 4d4df394a121f7b00ae073092b708d5e421bb38e
Parents: 0c7f3e1
Author: Sergey Beryozkin 
Authored: Fri Oct 30 11:55:22 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 12:14:56 2015 +

--
 .../cxf/clustering/FailoverTargetSelector.java  | 21 
 .../apache/cxf/jaxrs/client/AbstractClient.java | 18 -
 .../apache/cxf/transport/http/HTTPConduit.java  |  7 +++
 3 files changed, 29 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4d4df394/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
--
diff --git 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index 639895c..d364a55 100644
--- 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++ 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -47,8 +47,10 @@ import org.apache.cxf.transport.Conduit;
  */
 public class FailoverTargetSelector extends AbstractConduitSelector {
 
-private static final Logger LOG =
-LogUtils.getL7dLogger(FailoverTargetSelector.class);
+private static final Logger LOG = 
LogUtils.getL7dLogger(FailoverTargetSelector.class);
+private static final String COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY = 
+"org.apache.cxf.transport.complete_if_service_not_available";
+
 protected ConcurrentHashMap inProgress 
 = new ConcurrentHashMap();
 protected FailoverStrategy failoverStrategy;
@@ -99,7 +101,10 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 }
 
 protected void setupExchangeExceptionProperties(Exchange ex) {
-ex.remove("org.apache.cxf.transport.no_io_exceptions");
+if (!isSupportNotAvailableErrorsOnly()) {
+ex.remove("org.apache.cxf.transport.no_io_exceptions");
+}
+ex.put(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY, true);
 }
 
 /**
@@ -144,6 +149,7 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 removeConduit(old);
 failover = performFailover(exchange, invocation);
 } else {
+exchange.remove(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY);
 setOriginalEndpoint(invocation);
 }
 } else {
@@ -273,12 +279,11 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 "CHECK_FAILURE_IN_TRANSPORT",
 new Object[] {ex, failover});
 }
-if (failover 
-&& isSupportNotAvailableErrorsOnly()
-&& exchange.get(Message.RESPONSE_CODE) != null
-&& 
!PropertyUtils.isTrue(exchange.get("org.apache.cxf.transport.service_not_available")))
 { 
-failover = false;
+
+if (isSupportNotAvailableErrorsOnly() && 
exchange.get(Message.RESPONSE_CODE) != null) {
+failover = 
PropertyUtils.isTrue(exchange.get("org.apache.cxf.transport.service_not_available"));
 }
+
 return failover;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4d4df394/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 46ed4cb..d190fc4 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -58,6 +58,7 @@ import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
 import org.apache.cxf.endpoint.ClientLifeCycleManager;
 import org.apache.cxf.endpoint.ConduitSelector;
 import org.apache.cxf.endpoint.Endpoint;
@@ -106,8 +107,11 @@ public abstract class AbstractClient implements Client {
 protected static final String HTTP_SCHEME = "http";
 
 private static final Str

cxf git commit: [CXF-6657] Making ResponseExceptionMapper work with FailoverFeature, patch from Florian Léger applied with tiny modifications

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes dcec2eee1 -> 6becd2b95


[CXF-6657] Making ResponseExceptionMapper work with FailoverFeature, patch from 
Florian LÃ©ger applied with tiny modifications


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

Branch: refs/heads/3.0.x-fixes
Commit: 6becd2b9544cca83e7ff8d17a4b0ae07f097ae55
Parents: dcec2ee
Author: Sergey Beryozkin 
Authored: Fri Oct 30 11:55:22 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 12:13:58 2015 +

--
 .../cxf/clustering/FailoverTargetSelector.java  | 21 
 .../apache/cxf/jaxrs/client/AbstractClient.java | 18 -
 .../apache/cxf/transport/http/HTTPConduit.java  |  7 +++
 3 files changed, 29 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6becd2b9/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
--
diff --git 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index 722beab..61fce66 100644
--- 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++ 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -47,8 +47,10 @@ import org.apache.cxf.transport.Conduit;
  */
 public class FailoverTargetSelector extends AbstractConduitSelector {
 
-private static final Logger LOG =
-LogUtils.getL7dLogger(FailoverTargetSelector.class);
+private static final Logger LOG = 
LogUtils.getL7dLogger(FailoverTargetSelector.class);
+private static final String COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY = 
+"org.apache.cxf.transport.complete_if_service_not_available";
+
 protected ConcurrentHashMap inProgress 
 = new ConcurrentHashMap();
 protected FailoverStrategy failoverStrategy;
@@ -99,7 +101,10 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 }
 
 protected void setupExchangeExceptionProperties(Exchange ex) {
-ex.remove("org.apache.cxf.transport.no_io_exceptions");
+if (!isSupportNotAvailableErrorsOnly()) {
+ex.remove("org.apache.cxf.transport.no_io_exceptions");
+}
+ex.put(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY, true);
 }
 
 /**
@@ -144,6 +149,7 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 removeConduit(old);
 failover = performFailover(exchange, invocation);
 } else {
+exchange.remove(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY);
 setOriginalEndpoint(invocation);
 }
 } else {
@@ -273,12 +279,11 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 "CHECK_FAILURE_IN_TRANSPORT",
 new Object[] {ex, failover});
 }
-if (failover 
-&& isSupportNotAvailableErrorsOnly()
-&& exchange.get(Message.RESPONSE_CODE) != null
-&& 
!PropertyUtils.isTrue(exchange.get("org.apache.cxf.transport.service_not_available")))
 { 
-failover = false;
+
+if (isSupportNotAvailableErrorsOnly() && 
exchange.get(Message.RESPONSE_CODE) != null) {
+failover = 
PropertyUtils.isTrue(exchange.get("org.apache.cxf.transport.service_not_available"));
 }
+
 return failover;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6becd2b9/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index a25d0f7..cb74ed8 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -58,6 +58,7 @@ import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
 import org.apache.cxf.endpoint.ClientLifeCycleManager;
 import org.apache.cxf.endpoint.ConduitSelector;
 import org.apache.cxf.endpoint.Endpoint;
@@ -106,8 +107,11 @@ public abstract class AbstractClient implements Client {
 protected static final String HTTP_SCHEME = "http";
 
 private static

cxf git commit: [CXF-6657] Making ResponseExceptionMapper work with FailoverFeature, patch from Florian Léger applied with tiny modifications

2015-10-30 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 426206197 -> 45adf06d5


[CXF-6657] Making ResponseExceptionMapper work with FailoverFeature, patch from 
Florian LÃ©ger applied with tiny modifications


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

Branch: refs/heads/2.7.x-fixes
Commit: 45adf06d56aeb8f670b1b2dc5732f4a7ddf75772
Parents: 4262061
Author: Sergey Beryozkin 
Authored: Fri Oct 30 11:55:22 2015 +
Committer: Sergey Beryozkin 
Committed: Fri Oct 30 11:55:22 2015 +

--
 .../cxf/clustering/FailoverTargetSelector.java  | 21 +++---
 .../apache/cxf/jaxrs/client/AbstractClient.java | 23 +---
 .../apache/cxf/transport/http/HTTPConduit.java  |  7 +++---
 3 files changed, 31 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45adf06d/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
--
diff --git 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index 3938831..a2dc8c8 100644
--- 
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++ 
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -47,8 +47,10 @@ import org.apache.cxf.transport.Conduit;
  */
 public class FailoverTargetSelector extends AbstractConduitSelector {
 
-private static final Logger LOG =
-LogUtils.getL7dLogger(FailoverTargetSelector.class);
+private static final Logger LOG = 
LogUtils.getL7dLogger(FailoverTargetSelector.class);
+private static final String COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY = 
+"org.apache.cxf.transport.complete_if_service_not_available";
+
 protected ConcurrentHashMap inProgress 
 = new ConcurrentHashMap();;
 protected FailoverStrategy failoverStrategy;
@@ -99,7 +101,10 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 }
 
 protected void setupExchangeExceptionProperties(Exchange ex) {
-ex.remove("org.apache.cxf.transport.no_io_exceptions");
+if (!isSupportNotAvailableErrorsOnly()) {
+ex.remove("org.apache.cxf.transport.no_io_exceptions");
+}
+ex.put(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY, true);
 }
 
 /**
@@ -169,6 +174,7 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 }
 }
 } else {
+exchange.remove(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY);
 setEndpoint(invocation.retrieveOriginalEndpoint(endpoint));
 }
 }
@@ -249,12 +255,11 @@ public class FailoverTargetSelector extends 
AbstractConduitSelector {
 "CHECK_FAILURE_IN_TRANSPORT",
 new Object[] {ex, failover});
 }
-if (failover 
-&& isSupportNotAvailableErrorsOnly()
-&& exchange.get(Message.RESPONSE_CODE) != null
-&& 
!PropertyUtils.isTrue(exchange.get("org.apache.cxf.transport.service_not_available")))
 { 
-failover = false;
+
+if (isSupportNotAvailableErrorsOnly() && 
exchange.get(Message.RESPONSE_CODE) != null) {
+failover = 
PropertyUtils.isTrue(exchange.get("org.apache.cxf.transport.service_not_available"));
 }
+
 return failover;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/45adf06d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index f1f7ee3..411fd24 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -59,6 +59,7 @@ import javax.xml.stream.XMLStreamWriter;
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
 import org.apache.cxf.endpoint.ClientLifeCycleManager;
 import org.apache.cxf.endpoint.ConduitSelector;
 import org.apache.cxf.endpoint.Endpoint;
@@ -105,8 +106,10 @@ public abstract class AbstractClient implements Client, 
Retryable {
 protected static final String HT

svn commit: r970760 - in /websites/production/cxf/content: cache/main.pageCache mailing-lists.html

2015-10-30 Thread buildbot

Author: buildbot
Date: Fri Oct 30 10:47:39 2015
New Revision: 970760

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/main.pageCache
websites/production/cxf/content/mailing-lists.html

Modified: websites/production/cxf/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/mailing-lists.html
==
--- websites/production/cxf/content/mailing-lists.html (original)
+++ websites/production/cxf/content/mailing-lists.html Fri Oct 30 10:47:39 2015
@@ -99,7 +99,7 @@ Apache CXF -- Mailing Lists
  


-Mailing 
ListsFeel free to participate in Apache CXF mailing lists, IRCs and 
user groups.Apache CXF Mailing 
ListsList NameSubscribeUnsubscribeArchiveNabbleCXF User Listmailto:users-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:users-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-users/";>Archivehttp://cxf.547215.n5.nabble.com/cxf-user-f547216.html"; 
rel="nofollow">NabbleCXF Developer Listmailto:dev-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:dev-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/
 mod_mbox/cxf-dev/">Archivehttp://cxf.547215.n5.nabble.com/cxf-dev-f569328.html"; 
rel="nofollow">NabbleCXF Commits Listmailto:commits-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:commits-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-commits/";>Archivehttp://cxf.547215.n5.nabble.com/cxf-commits-f577170.html"; rel="nofoll
 ow">NabbleCXF Issues Listmailto:issues-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:issues-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-issues/";>Archivehttp://cxf.547215.n5.nabble.com/cxf-issues-f586616.html"; 
rel="nofollow">NabbleCXF Build Notification Listmailto:notifications-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:notifications-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-notifications/";>Archive To keep 
the mailing list archives useful for searching, please use the cxf-user's list 
for any questions related to using Apache CXF. The developers on cxf-dev are 
also on cxf-user, along with many other readers who can also provide help for 
your question. The cxf-dev list is just for programming the internals of Apache 
CXF itself.Apache CXF IRCsNew 
channel #mailto:apache-...@irc.freenode.net"; 
rel="nofollow">apache-...@irc.freenode.netIRC logs are at: http://irclogs.dankulp.com/logs/irclogger_logs/cxf"; 
rel="nofollow">http://irclogs.dankulp.com/logs/irclogger_logs/cxfOlder
 IRC logs at: http://irc.rectang.com/logs/codehaus/%23cxf/"; 
rel="nofollow">http://irc.rectang.com/logs/codehaus/%23cxf/Apache CXF User ListsThere is also 
an Apache CXF http://groups.google.com/group/cxf-zh"; rel="nofollow">Chinese language 
CXF User's List available at Google Groups. Please join!
+Mailing 
ListsFeel free to participate in Apache CXF mailing lists, IRCs and 
user groups.Apache CXF Mailing 
ListsList NameSubscribeUnsubscribeArchiveNabbleCXF User Listmailto:users-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:users-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-users/";>Archivehttp://cxf.547215.n5.nabble.com/cxf-user-f547216.html"; 
rel="nofollow">NabbleCXF Developer Listmailto:dev-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:dev-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/
 mod_mbox/cxf-dev/">Archivehttp://cxf.547215.n5.nabble.com/cxf-dev-f569328.html"; 
rel="nofollow">NabbleCXF Commits Listmailto:commits-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:commits-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-commits/";>Archivehttp://cxf.547215.n5.nabble.com/cxf-commits-f577170.html"; rel="nofoll
 ow">NabbleCXF Issues Listmailto:issues-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:issues-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-issues/";>Archivehttp://cxf.547215.n5.nabble.com/cxf-issues-f586616.html"; 
rel="nofollow">NabbleCXF Build Notification Listmailto:notifications-subscr...@cxf.apache.org"; 
rel="nofollow">Subscribemailto:notifications-unsubscr...@cxf.apache.org"; 
rel="nofollow">Unsubscribehttp://mail-archives.apache.org/mod_mbox/cxf-notifications/";>Archive To keep 
the mailing list archives useful for searching, please use the cxf-user's list 
for any questions related to using Apache CXF. The developers on cxf-dev are 
also on cxf-user, along

53 matches

Mail list logo