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

2016-10-13 Thread coheigea 
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/4b8ade62
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4b8ade62
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4b8ade62

Branch: refs/heads/3.0.x-fixes
Commit: 4b8ade623ef14253635dfa3e6e2b21e6dd971594
Parents: 763507b
Author: Colm O hEigeartaigh 
Authored: Thu Oct 13 17:09:25 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 13 17:09:25 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/4b8ade62/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a54b323..f1d0f39 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -771,6 +771,7 @@ B a78e2e4d67628577ee9418412e8f89fe0c3c243b
 B a79bb058aaf71e85dcb5c90e7b2f6e4ab8e63cba
 B a7b79ea692add4f9da0f1232e3bfb338099f4147
 B a7c6e78b491c4feb6797a632a6249189a552
+B a7c9bdd8c8bb2a95cbed2990c5fca4e9886e8b08
 B a7cc783a5036e2900a22290738f6aa76d9fcf271
 B a7d9370485d0c3940bfefa56af292b6ccd208b80
 B a857810da69c43cde90073c77929b5d213d8dc28
@@ -876,6 +877,7 @@ B bc3ccc3ab7fc4a76d53b380cdba7592a5a88d2ae
 B bc5bbe8959a6767051b58a41b24a7d748b67fa84
 B bc752dc5bd89b5d70d00435fc1185e72659d7e4d
 B bc9e3714adc8848f37694eea62d33748b01fbb91
+B bca4630627ab979a5c688677614646d985c6d7db
 B bca5ead51899b3aa4864d8b4a675c829096bcd3b
 B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
 B bd94b4c8778e360d538d5acb3f6a3710af92e6f1

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

2016-10-13 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 5a132146b -> 4b8ade623


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

Branch: refs/heads/3.0.x-fixes
Commit: 763507be9894981e4413c83631cfb6fcdbbad897
Parents: 5a13214
Author: Colm O hEigeartaigh 
Authored: Thu Oct 13 17:07:54 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 13 17:07:54 2016 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/763507be/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ad166db..a54b323 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -36,6 +36,7 @@ B 091f8bef03e671f151e21a890159e5033b1c5d86
 B 09355c667243314e64e2c54f8e21abb22f463d37
 B 0985e79ab47124fbe0a08b9653ae7d4d1c2b5b97
 B 09c7f359ed84a1df2cab07387b3ad135846df0db
+B 09d49660f13d36b848dbc979321d956c21f4b666
 B 0aaa2b5742a53bf31704939e4bc21906100bbc54
 B 0ab9416fda31298e485f2a6864c263447e4b32de
 B 0ac5dde071c9c2731fca757a2108f5dd698f8af5

[2/3] cxf git commit: CXF-7090 - BOM added wss4j entries. This closes #180

2016-10-13 Thread coheigea 
CXF-7090 - BOM added wss4j entries. This closes #180

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

Branch: refs/heads/3.1.x-fixes
Commit: a7c9bdd8c8bb2a95cbed2990c5fca4e9886e8b08
Parents: 75d35ef
Author: Paolo Antinori 
Authored: Thu Oct 13 17:10:24 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 13 17:06:08 2016 +0100

--
 distribution/javadoc/pom.xml  |  4 
 parent/pom.xml| 28 
 rt/rs/security/xml/pom.xml|  1 -
 rt/security-saml/pom.xml  |  1 -
 rt/ws/rm/pom.xml  |  1 -
 rt/ws/security/pom.xml|  4 
 services/xkms/xkms-client/pom.xml |  1 -
 services/xkms/xkms-common/pom.xml |  1 -
 8 files changed, 28 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/distribution/javadoc/pom.xml
--
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 6d6a92a..ce620d3 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -209,22 +209,18 @@
 
 org.apache.wss4j
 wss4j-ws-security-dom
-${cxf.wss4j.version}
 
 
 org.apache.wss4j
 wss4j-policy
-${cxf.wss4j.version}
 
 
 org.apache.wss4j
 wss4j-ws-security-stax
-${cxf.wss4j.version}
 
 
 org.apache.wss4j
 wss4j-ws-security-policy-stax
-${cxf.wss4j.version}
 
 
 org.bouncycastle

http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 98a0243..8d9377a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1895,6 +1895,34 @@
 htrace-core4
 ${cxf.htrace.version}
 
+<<< HEAD
+===
+
+org.qi4j.library
+org.qi4j.library.circuitbreaker
+${cxf.zest.version}
+
+
+org.apache.wss4j
+wss4j-ws-security-dom
+${cxf.wss4j.version}
+
+
+org.apache.wss4j
+wss4j-policy
+${cxf.wss4j.version}
+
+
+org.apache.wss4j
+wss4j-ws-security-stax
+${cxf.wss4j.version}
+
+
+org.apache.wss4j
+wss4j-ws-security-policy-stax
+${cxf.wss4j.version}
+
+>>> 19d8da7... CXF-7090 - BOM added wss4j entries. This closes #180
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/rs/security/xml/pom.xml
--
diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml
index 054e77f..47aeefc 100644
--- a/rt/rs/security/xml/pom.xml
+++ b/rt/rs/security/xml/pom.xml
@@ -59,7 +59,6 @@
 
 org.apache.wss4j
 wss4j-ws-security-dom
-${cxf.wss4j.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/security-saml/pom.xml
--
diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml
index 1039336..ab4df5f 100644
--- a/rt/security-saml/pom.xml
+++ b/rt/security-saml/pom.xml
@@ -44,7 +44,6 @@
 
 org.apache.wss4j
 wss4j-ws-security-dom
-${cxf.wss4j.version}
 
 
 org.slf4j

http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/ws/rm/pom.xml
--
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 099ffdc..93e8c69 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -97,7 +97,6 @@
 
 org.apache.wss4j
 wss4j-policy
-${cxf.wss4j.version}
 
 
 junit

http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/ws/security/pom.xml
--
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index d481c85..51d54b2 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -92,22 +92,18 @@
 
 org.apache.wss4j

[3/3] cxf git commit: Fixing merge

2016-10-13 Thread coheigea 
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: bca4630627ab979a5c688677614646d985c6d7db
Parents: 09d4966
Author: Colm O hEigeartaigh 
Authored: Thu Oct 13 17:06:30 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 13 17:06:30 2016 +0100

--
 parent/pom.xml | 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bca46306/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d9377a..b680cdc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1895,13 +1895,6 @@
 htrace-core4
 ${cxf.htrace.version}
 
-<<< HEAD
-===
-
-org.qi4j.library
-org.qi4j.library.circuitbreaker
-${cxf.zest.version}
-
 
 org.apache.wss4j
 wss4j-ws-security-dom
@@ -1922,7 +1915,6 @@
 wss4j-ws-security-policy-stax
 ${cxf.wss4j.version}
 
->>> 19d8da7... CXF-7090 - BOM added wss4j entries. This closes #180

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

2016-10-13 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 75d35efc8 -> bca463062


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

Branch: refs/heads/3.1.x-fixes
Commit: 09d49660f13d36b848dbc979321d956c21f4b666
Parents: a7c9bdd
Author: Colm O hEigeartaigh 
Authored: Thu Oct 13 17:06:08 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 13 17:06:08 2016 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/09d49660/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d5a81e1..4f6889a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -98,6 +98,7 @@ M 0865c3a85b9687f857b51d1ae56c8f8e97bdbf5b
 M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 11e18bf5622cafdb10723cee895885d676b35a7b
+M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
 M 20d0a2811c15cb65a402eb063e1359236d7014ea
 M 21031e3ab2ae227540e2a078d0336d894361acba

cxf git commit: [CXF-6981] Adding a missing test resource

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 158121633 -> 5a132146b


[CXF-6981] Adding a missing test resource


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

Branch: refs/heads/3.0.x-fixes
Commit: 5a132146bfa0b4555021a688463d383bbe197982
Parents: 1581216
Author: Sergey Beryozkin 
Authored: Thu Oct 13 17:03:18 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 17:05:06 2016 +0100

--
 .../cxf/io/CacheAndWriteOutputStreamTest.java   | 41 
 1 file changed, 41 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5a132146/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
--
diff --git 
a/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java 
b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
new file mode 100644
index 000..6b95eb3
--- /dev/null
+++ b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
@@ -0,0 +1,41 @@
+/**
+ * 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.io;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class CacheAndWriteOutputStreamTest extends CachedOutputStreamTest {
+
+ByteArrayOutputStream baos = new ByteArrayOutputStream() {
+boolean isClosed;
+@Override
+public void close() throws IOException {
+if (isClosed) {
+throw new IOException("stream already closed");
+}
+isClosed = true;
+}
+};
+
+@Override
+protected Object createCache() {
+return new CacheAndWriteOutputStream(baos);
+}
+}

cxf git commit: CXF-7090 - BOM added wss4j entries. This closes #180

2016-10-13 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master f060b8742 -> 19d8da7f0


CXF-7090 - BOM added wss4j entries. This closes #180


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

Branch: refs/heads/master
Commit: 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
Parents: f060b87
Author: Paolo Antinori 
Authored: Thu Oct 13 17:10:24 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 13 17:05:06 2016 +0100

--
 distribution/javadoc/pom.xml  |  4 
 parent/pom.xml| 20 
 rt/rs/security/xml/pom.xml|  1 -
 rt/security-saml/pom.xml  |  1 -
 rt/ws/rm/pom.xml  |  1 -
 rt/ws/security/pom.xml|  4 
 services/xkms/xkms-client/pom.xml |  1 -
 services/xkms/xkms-common/pom.xml |  1 -
 8 files changed, 20 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/19d8da7f/distribution/javadoc/pom.xml
--
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index e1c4480..258bb7f 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -209,22 +209,18 @@
 
 org.apache.wss4j
 wss4j-ws-security-dom
-${cxf.wss4j.version}
 
 
 org.apache.wss4j
 wss4j-policy
-${cxf.wss4j.version}
 
 
 org.apache.wss4j
 wss4j-ws-security-stax
-${cxf.wss4j.version}
 
 
 org.apache.wss4j
 wss4j-ws-security-policy-stax
-${cxf.wss4j.version}
 
 
 org.bouncycastle

http://git-wip-us.apache.org/repos/asf/cxf/blob/19d8da7f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3630054..42709d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1914,6 +1914,26 @@
 org.qi4j.library.circuitbreaker
 ${cxf.zest.version}
 
+
+org.apache.wss4j
+wss4j-ws-security-dom
+${cxf.wss4j.version}
+
+
+org.apache.wss4j
+wss4j-policy
+${cxf.wss4j.version}
+
+
+org.apache.wss4j
+wss4j-ws-security-stax
+${cxf.wss4j.version}
+
+
+org.apache.wss4j
+wss4j-ws-security-policy-stax
+${cxf.wss4j.version}
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/19d8da7f/rt/rs/security/xml/pom.xml
--
diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml
index c75b07e..b0bacd6 100644
--- a/rt/rs/security/xml/pom.xml
+++ b/rt/rs/security/xml/pom.xml
@@ -59,7 +59,6 @@
 
 org.apache.wss4j
 wss4j-ws-security-dom
-${cxf.wss4j.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/19d8da7f/rt/security-saml/pom.xml
--
diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml
index 530b2cd..3261ea0 100644
--- a/rt/security-saml/pom.xml
+++ b/rt/security-saml/pom.xml
@@ -44,7 +44,6 @@
 
 org.apache.wss4j
 wss4j-ws-security-dom
-${cxf.wss4j.version}
 
 
 org.slf4j

http://git-wip-us.apache.org/repos/asf/cxf/blob/19d8da7f/rt/ws/rm/pom.xml
--
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 51097d6..b5fc5a4 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -97,7 +97,6 @@
 
 org.apache.wss4j
 wss4j-policy
-${cxf.wss4j.version}
 
 
 junit

http://git-wip-us.apache.org/repos/asf/cxf/blob/19d8da7f/rt/ws/security/pom.xml
--
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index c88110c..3029bff 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -92,22 +92,18 @@
 
 org.apache.wss4j
 wss4j-ws-security-dom
-${cxf.wss4j.version}
 
 
 org.apache.wss4j
 wss4j-policy
-${cxf.wss4j.version}

cxf git commit: [CXF-6981] Adding a missing test resource

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c99d22610 -> 75d35efc8


[CXF-6981] Adding a missing test resource


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

Branch: refs/heads/3.1.x-fixes
Commit: 75d35efc8d18eefc8901f12b39be9dd9fb886398
Parents: c99d226
Author: Sergey Beryozkin 
Authored: Thu Oct 13 17:03:18 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 17:04:24 2016 +0100

--
 .../cxf/io/CacheAndWriteOutputStreamTest.java   | 41 
 1 file changed, 41 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/75d35efc/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
--
diff --git 
a/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java 
b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
new file mode 100644
index 000..6b95eb3
--- /dev/null
+++ b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
@@ -0,0 +1,41 @@
+/**
+ * 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.io;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class CacheAndWriteOutputStreamTest extends CachedOutputStreamTest {
+
+ByteArrayOutputStream baos = new ByteArrayOutputStream() {
+boolean isClosed;
+@Override
+public void close() throws IOException {
+if (isClosed) {
+throw new IOException("stream already closed");
+}
+isClosed = true;
+}
+};
+
+@Override
+protected Object createCache() {
+return new CacheAndWriteOutputStream(baos);
+}
+}

cxf git commit: [CXF-6981] Adding a missing test resource

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master e7895d6a7 -> f060b8742


[CXF-6981] Adding a missing test resource


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

Branch: refs/heads/master
Commit: f060b8742e2bea22c0abf218a43f62bc91b91143
Parents: e7895d6
Author: Sergey Beryozkin 
Authored: Thu Oct 13 17:03:18 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 17:03:18 2016 +0100

--
 .../cxf/io/CacheAndWriteOutputStreamTest.java   | 41 
 1 file changed, 41 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f060b874/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
--
diff --git 
a/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java 
b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
new file mode 100644
index 000..6b95eb3
--- /dev/null
+++ b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
@@ -0,0 +1,41 @@
+/**
+ * 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.io;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class CacheAndWriteOutputStreamTest extends CachedOutputStreamTest {
+
+ByteArrayOutputStream baos = new ByteArrayOutputStream() {
+boolean isClosed;
+@Override
+public void close() throws IOException {
+if (isClosed) {
+throw new IOException("stream already closed");
+}
+isClosed = true;
+}
+};
+
+@Override
+protected Object createCache() {
+return new CacheAndWriteOutputStream(baos);
+}
+}

cxf git commit: Minor update to the 404 RxJava test

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master e45cc2543 -> e7895d6a7


Minor update to the 404 RxJava test


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

Branch: refs/heads/master
Commit: e7895d6a7cb071fdea57f6d2607dabe2d22db47f
Parents: e45cc25
Author: Sergey Beryozkin 
Authored: Thu Oct 13 17:01:30 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 17:01:30 2016 +0100

--
 .../systest/jaxrs/reactive/JAXRSReactiveTest.java| 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e7895d6a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSReactiveTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSReactiveTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSReactiveTest.java
index 10ce5ea..d581bbe 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSReactiveTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSReactiveTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.jaxrs.reactive;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.core.GenericType;
@@ -140,14 +141,16 @@ public class JAXRSReactiveTest extends 
AbstractBusClientServerTestBase {
 public void testGetHelloWorldAsyncObservable404() throws Exception {
 String address = "http://localhost:; + PORT + "/reactive/textAsync404";
 WebClient wc = WebClient.create(address);
-try {
-wc.rx(ObservableRxInvoker.class).get(String.class).subscribe(s -> 
System.out.println());
-fail("Exception expected");
-} catch (Throwable ex) {
-assertTrue(ex.getCause().getCause() instanceof NotFoundException);
-}
+wc.rx(ObservableRxInvoker.class).get(String.class).subscribe(
+s -> {
+fail("Exception expected");
+},
+t -> validateT((ExecutionException)t));
 }
 
+private void validateT(ExecutionException t) {
+assertTrue(t.getCause() instanceof NotFoundException);
+}
 private void assertDuplicateResponse(String s) {
 assertEquals("Hello, world!Hello, world!", s);
 }

svn commit: r999323 - in /websites/production/cxf/content: cache/docs.pageCache docs/jaxrs-testing.html

2016-10-13 Thread buildbot 
Author: buildbot
Date: Thu Oct 13 13:47:21 2016
New Revision: 999323

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jaxrs-testing.html

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

Modified: websites/production/cxf/content/docs/jaxrs-testing.html
==
--- websites/production/cxf/content/docs/jaxrs-testing.html (original)
+++ websites/production/cxf/content/docs/jaxrs-testing.html Thu Oct 13 13:47:21 
2016
@@ -117,13 +117,15 @@ Apache CXF -- JAXRS Testing
  


- JAX-RS 
Testing/**/
-Embedded JettyLocal Transport
+JAX-RS Testing/**/
+Embedded JettyLocal Transport
+Mocking HTTP contexts
+
 JAX-RS endpoints can be easily tested using the embedded Jetty or CXF 
Local Transport.Embedded JettyMaven 
Dependency
 dependency
groupIdorg.apache.cxf/groupId
@@ -317,7 +319,22 @@ public void testAddBookWithProxyDirectDi
 assertEquals(123L, book.getId());
 }
 
-
+Mocking 
HTTP contextsIf you test a code which depends on the injected HTTP 
contexts such as HttpServletRequest then these contexts will have to be 
mocked.For example:
+JAXRSServerFactoryBean sf = new 
JAXRSServerFactoryBean();
+sf.setInvoker(new Invoker() {
+
+  Invoker jarsInvoker = new JAXRSInvoker();
+  @Override
+  public Object invoke(Exchange exchange, Object o) {
+
+   HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+   Mockito.when(request.getRemoteHost()).thenReturn("host");
+   exchange.getInMessage().put(AbstractHTTPDestination.HTTP_REQUEST, request);
+   return jarsInvoker.invoke(exchange, o);
+  }
+
+});
+

cxf git commit: [CXF-6981] Avoid double close in CacheAndWriteOutputStream, patch from Andy McCright applied, This closes #179

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 3533b2858 -> 158121633


[CXF-6981] Avoid double close in CacheAndWriteOutputStream, patch from Andy 
McCright applied, This closes #179


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

Branch: refs/heads/3.0.x-fixes
Commit: 1581216339423241d7b64b2c8f51b2a0e0fd2094
Parents: 3533b28
Author: Sergey Beryozkin 
Authored: Thu Oct 13 13:44:14 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 13:45:39 2016 +0100

--
 .../main/java/org/apache/cxf/io/CachedOutputStream.java   | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/15812163/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
--
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java 
b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index 6bb597a..e6698c6 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -211,8 +211,9 @@ public class CachedOutputStream extends OutputStream {
 }
 doClose();
 currentStream.close();
-maybeDeleteTempFile(currentStream);
-postClose();
+if (!maybeDeleteTempFile(currentStream)) {
+postClose();
+}
 }
 
 public boolean equals(Object obj) {
@@ -542,7 +543,8 @@ public class CachedOutputStream extends OutputStream {
 FileUtils.delete(file);
 }
 }
-private void maybeDeleteTempFile(Object stream) {
+private boolean maybeDeleteTempFile(Object stream) {
+boolean postClosedInvoked = false;
 streamList.remove(stream);
 if (!inmem && tempFile != null && streamList.isEmpty() && 
allowDeleteOfFile) {
 if (currentStream != null) {
@@ -552,11 +554,13 @@ public class CachedOutputStream extends OutputStream {
 } catch (Exception e) {
 //ignore
 }
+postClosedInvoked = true;
 }
 deleteTempFile();
 currentStream = new LoadingByteArrayOutputStream(1024);
 inmem = true;
 }
+return postClosedInvoked;
 }
 
 public void setOutputDir(File outputDir) throws IOException {

cxf git commit: [CXF-6981] Avoid double close in CacheAndWriteOutputStream, patch from Andy McCright applied, This closes #179

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b6191970a -> c99d22610


[CXF-6981] Avoid double close in CacheAndWriteOutputStream, patch from Andy 
McCright applied, This closes #179


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

Branch: refs/heads/3.1.x-fixes
Commit: c99d226104c260943b1d5306889f6fb6b5bcc623
Parents: b619197
Author: Sergey Beryozkin 
Authored: Thu Oct 13 13:44:14 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 13:45:01 2016 +0100

--
 .../main/java/org/apache/cxf/io/CachedOutputStream.java   | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c99d2261/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
--
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java 
b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index eeced83..9c8175f 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -212,8 +212,9 @@ public class CachedOutputStream extends OutputStream {
 }
 doClose();
 currentStream.close();
-maybeDeleteTempFile(currentStream);
-postClose();
+if (!maybeDeleteTempFile(currentStream)) {
+postClose();
+}
 }
 
 public boolean equals(Object obj) {
@@ -527,7 +528,8 @@ public class CachedOutputStream extends OutputStream {
 FileUtils.delete(file);
 }
 }
-private void maybeDeleteTempFile(Object stream) {
+private boolean maybeDeleteTempFile(Object stream) {
+boolean postClosedInvoked = false;
 streamList.remove(stream);
 if (!inmem && tempFile != null && streamList.isEmpty() && 
allowDeleteOfFile) {
 if (currentStream != null) {
@@ -537,11 +539,13 @@ public class CachedOutputStream extends OutputStream {
 } catch (Exception e) {
 //ignore
 }
+postClosedInvoked = true;
 }
 deleteTempFile();
 currentStream = new LoadingByteArrayOutputStream(1024);
 inmem = true;
 }
+return postClosedInvoked;
 }
 
 public void setOutputDir(File outputDir) throws IOException {

cxf git commit: [CXF-6981] Avoid double close in CacheAndWriteOutputStream, patch from Andy McCright applied, This closes #179

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master eb1049f81 -> e45cc2543


[CXF-6981] Avoid double close in CacheAndWriteOutputStream, patch from Andy 
McCright applied, This closes #179


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

Branch: refs/heads/master
Commit: e45cc2543940de2d8587a1c86cf7db28b8dd7203
Parents: eb1049f
Author: Sergey Beryozkin 
Authored: Thu Oct 13 13:44:14 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 13:44:14 2016 +0100

--
 .../main/java/org/apache/cxf/io/CachedOutputStream.java   | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e45cc254/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
--
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java 
b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index eeced83..9c8175f 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -212,8 +212,9 @@ public class CachedOutputStream extends OutputStream {
 }
 doClose();
 currentStream.close();
-maybeDeleteTempFile(currentStream);
-postClose();
+if (!maybeDeleteTempFile(currentStream)) {
+postClose();
+}
 }
 
 public boolean equals(Object obj) {
@@ -527,7 +528,8 @@ public class CachedOutputStream extends OutputStream {
 FileUtils.delete(file);
 }
 }
-private void maybeDeleteTempFile(Object stream) {
+private boolean maybeDeleteTempFile(Object stream) {
+boolean postClosedInvoked = false;
 streamList.remove(stream);
 if (!inmem && tempFile != null && streamList.isEmpty() && 
allowDeleteOfFile) {
 if (currentStream != null) {
@@ -537,11 +539,13 @@ public class CachedOutputStream extends OutputStream {
 } catch (Exception e) {
 //ignore
 }
+postClosedInvoked = true;
 }
 deleteTempFile();
 currentStream = new LoadingByteArrayOutputStream(1024);
 inmem = true;
 }
+return postClosedInvoked;
 }
 
 public void setOutputDir(File outputDir) throws IOException {

cxf git commit: [CXF-7087] Fixing a typo

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes da66c89c1 -> 3533b2858


[CXF-7087] Fixing a typo


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

Branch: refs/heads/3.0.x-fixes
Commit: 3533b2858328e4b63b4f84842456188beb9275fd
Parents: da66c89
Author: Sergey Beryozkin 
Authored: Thu Oct 13 13:37:26 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 13:38:58 2016 +0100

--
 .../java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3533b285/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
index 07f835f..cbd9b71 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
@@ -53,10 +53,11 @@ public class WSDLGetOutInterceptor extends 
AbstractPhaseInterceptor {
 }
 message.put(Message.CONTENT_TYPE, "text/xml");
 try {
-StaxUtils.writeDocument(doc, writer, true,
+StaxUtils.writeDocument(doc, writer,
 
!MessageUtils.getContextualBoolean(message, 

StaxOutInterceptor.FORCE_START_DOCUMENT, 
-   false));
+   false),
+true);
 } catch (XMLStreamException e) {
 throw new Fault(e);
 }

cxf git commit: [CXF-7087] Fixing a typo

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b86ac6d0d -> b6191970a


[CXF-7087] Fixing a typo


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

Branch: refs/heads/3.1.x-fixes
Commit: b6191970a3fa77dae288b1aa72d0315fec13791a
Parents: b86ac6d
Author: Sergey Beryozkin 
Authored: Thu Oct 13 13:37:26 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 13:38:16 2016 +0100

--
 .../java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b6191970/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
index 07f835f..cbd9b71 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
@@ -53,10 +53,11 @@ public class WSDLGetOutInterceptor extends 
AbstractPhaseInterceptor {
 }
 message.put(Message.CONTENT_TYPE, "text/xml");
 try {
-StaxUtils.writeDocument(doc, writer, true,
+StaxUtils.writeDocument(doc, writer,
 
!MessageUtils.getContextualBoolean(message, 

StaxOutInterceptor.FORCE_START_DOCUMENT, 
-   false));
+   false),
+true);
 } catch (XMLStreamException e) {
 throw new Fault(e);
 }

cxf git commit: [CXF-7087] Fixing a typo

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master d5aed7c04 -> eb1049f81


[CXF-7087] Fixing a typo


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

Branch: refs/heads/master
Commit: eb1049f812f49052f6bf9b954dea4cb74ea983a3
Parents: d5aed7c
Author: Sergey Beryozkin 
Authored: Thu Oct 13 13:37:26 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 13:37:26 2016 +0100

--
 .../java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/eb1049f8/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
index 07f835f..cbd9b71 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java
@@ -53,10 +53,11 @@ public class WSDLGetOutInterceptor extends 
AbstractPhaseInterceptor {
 }
 message.put(Message.CONTENT_TYPE, "text/xml");
 try {
-StaxUtils.writeDocument(doc, writer, true,
+StaxUtils.writeDocument(doc, writer,
 
!MessageUtils.getContextualBoolean(message, 

StaxOutInterceptor.FORCE_START_DOCUMENT, 
-   false));
+   false),
+true);
 } catch (XMLStreamException e) {
 throw new Fault(e);
 }

cxf git commit: [CXF-7070] Avoiding logging the well-known senstive header values by default, patch from Andy McCright applied with a minor update, This closes #178

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 25ae30750 -> da66c89c1


[CXF-7070] Avoiding logging the well-known senstive header values by default, 
patch from Andy McCright applied with a minor update, This closes #178


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

Branch: refs/heads/3.0.x-fixes
Commit: da66c89c10e60aa4faf6e05869529e9166ea6157
Parents: 25ae307
Author: Sergey Beryozkin 
Authored: Thu Oct 13 12:50:34 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 13:09:17 2016 +0100

--
 .../org/apache/cxf/transport/http/Headers.java  | 110 +++---
 .../apache/cxf/transport/http/HeadersTest.java  | 112 ---
 2 files changed, 163 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/da66c89c/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 4879d97..dee9d61 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
@@ -29,7 +29,6 @@ import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -62,8 +61,8 @@ public class Headers {
  * Each header value is added as a separate HTTP header, example, given A 
header with 'a' and 'b'
  * values, two A headers will be added as opposed to a single A header 
with the "a,b" value. 
  */
-public static final String ADD_HEADERS_PROPERTY = 
"org.apache.cxf.http.add-headers"; 
-   
+public static final String ADD_HEADERS_PROPERTY = 
"org.apache.cxf.http.add-headers";
+
 public static final String PROTOCOL_HEADERS_CONTENT_TYPE = 
Message.CONTENT_TYPE.toLowerCase();
 public static final String HTTP_HEADERS_SETCOOKIE = "Set-Cookie";
 public static final String HTTP_HEADERS_LINK = "Link";
@@ -71,7 +70,10 @@ public class Headers {
 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);
-
+
+private static final List SENSITIVE_HEADERS = 
Arrays.asList("Authorization", "Proxy-Authorization");
+private static final List SENSITIVE_HEADER_MARKER = 
Arrays.asList("***");
+private static final String ALLOW_LOGGING_SENSITIVE_HEADERS = 
"allow.logging.sensitive.headers";
 /**
  * Known HTTP headers whose values have to be represented as individual 
HTTP headers
  */
@@ -95,6 +97,25 @@ public class Headers {
 this.message = null;
 }
 
+/**
+ * Returns a traceable string representation of the passed-in headers map.
+ * The value for any keys in the map that are in the 
SENSITIVE_HEADERS
+ * array will be filtered out of the returned string.
+ * Note that this method is expensive as it will copy the map (except for 
the
+ * filtered keys), so it should be used sparingly - i.e. only when debug is
+ * enabled.
+ */
+static String toString(Map headers, boolean 
logSensitiveHeaders) {
+Map filteredHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+filteredHeaders.putAll(headers);
+if (!logSensitiveHeaders) {
+for (String filteredKey : SENSITIVE_HEADERS) {
+filteredHeaders.put(filteredKey, SENSITIVE_HEADER_MARKER);
+}
+}
+return filteredHeaders.toString();
+}
+
 public Map headerMap() {
 return headers;
 }
@@ -176,7 +197,7 @@ public class Headers {
 createMutableList(policy.getReferer()));
 }
 }
-
+
 void setFromServerPolicy(HTTPServerPolicy policy) {
 if (policy.isSetCacheControl()) {
 headers.put("Cache-Control",
@@ -204,9 +225,8 @@ public class Headers {
 } else if (policy.isSetKeepAliveParameters()) {
 headers.put("Keep-Alive", 
createMutableList(policy.getKeepAliveParameters()));
 }
-
-
-
+
+
 /*
  * TODO - hook up these policies
 
@@ -228,8 +248,8 @@ public class Headers {

cxf git commit: [CXF-7070] Avoiding logging the well-known senstive header values by default, patch from Andy McCright applied with a minor update, This closes #178

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6eb9cd56b -> b86ac6d0d


[CXF-7070] Avoiding logging the well-known senstive header values by default, 
patch from Andy McCright applied with a minor update, This closes #178


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

Branch: refs/heads/3.1.x-fixes
Commit: b86ac6d0d12c25ca8a50e8e4fcc494db258387f1
Parents: 6eb9cd5
Author: Sergey Beryozkin 
Authored: Thu Oct 13 12:50:34 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 12:52:06 2016 +0100

--
 .../org/apache/cxf/transport/http/Headers.java  |  98 ++--
 .../apache/cxf/transport/http/HeadersTest.java  | 111 ---
 2 files changed, 156 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b86ac6d0/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 23b7975..7ec9f4a 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
@@ -61,8 +61,8 @@ public class Headers {
  * Each header value is added as a separate HTTP header, example, given A 
header with 'a' and 'b'
  * values, two A headers will be added as opposed to a single A header 
with the "a,b" value. 
  */
-public static final String ADD_HEADERS_PROPERTY = 
"org.apache.cxf.http.add-headers"; 
-   
+public static final String ADD_HEADERS_PROPERTY = 
"org.apache.cxf.http.add-headers";
+
 public static final String PROTOCOL_HEADERS_CONTENT_TYPE = 
Message.CONTENT_TYPE.toLowerCase();
 public static final String HTTP_HEADERS_SETCOOKIE = "Set-Cookie";
 public static final String HTTP_HEADERS_LINK = "Link";
@@ -70,7 +70,10 @@ public class Headers {
 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);
-
+
+private static final List SENSITIVE_HEADERS = 
Arrays.asList("Authorization", "Proxy-Authorization");
+private static final List SENSITIVE_HEADER_MARKER = 
Arrays.asList("***");
+private static final String ALLOW_LOGGING_SENSITIVE_HEADERS = 
"allow.logging.sensitive.headers";
 /**
  * Known HTTP headers whose values have to be represented as individual 
HTTP headers
  */
@@ -108,6 +111,25 @@ public class Headers {
 return name + "/" + version;
 }
 
+/**
+ * Returns a traceable string representation of the passed-in headers map.
+ * The value for any keys in the map that are in the 
SENSITIVE_HEADERS
+ * array will be filtered out of the returned string.
+ * Note that this method is expensive as it will copy the map (except for 
the
+ * filtered keys), so it should be used sparingly - i.e. only when debug is
+ * enabled.
+ */
+static String toString(Map headers, boolean 
logSensitiveHeaders) {
+Map filteredHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+filteredHeaders.putAll(headers);
+if (!logSensitiveHeaders) {
+for (String filteredKey : SENSITIVE_HEADERS) {
+filteredHeaders.put(filteredKey, SENSITIVE_HEADER_MARKER);
+}
+}
+return filteredHeaders.toString();
+}
+
 public Map headerMap() {
 return headers;
 }
@@ -189,7 +211,7 @@ public class Headers {
 createMutableList(policy.getReferer()));
 }
 }
-
+
 void setFromServerPolicy(HTTPServerPolicy policy) {
 if (policy.isSetCacheControl()) {
 headers.put("Cache-Control",
@@ -217,9 +239,8 @@ public class Headers {
 } else if (policy.isSetKeepAliveParameters()) {
 headers.put("Keep-Alive", 
createMutableList(policy.getKeepAliveParameters()));
 }
-
-
-
+
+
 /*
  * TODO - hook up these policies
 
@@ -241,8 +262,8 @@ public class Headers {
 headers.put("Proxy-Authorization",
 createMutableList(authorization));
 }
-
-
+
+
 /**
  * While extracting the Message.PROTOCOL_HEADERS property from the Message,
  * this call ensures that

cxf git commit: [CXF-7070] Avoiding logging the well-known senstive header values by default, patch from Andy McCright applied with a minor update, This closes #178

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 68e437939 -> d5aed7c04


[CXF-7070] Avoiding logging the well-known senstive header values by default, 
patch from Andy McCright applied with a minor update, This closes #178


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

Branch: refs/heads/master
Commit: d5aed7c04cf97455afc7e9090372670ece014e9f
Parents: 68e4379
Author: Sergey Beryozkin 
Authored: Thu Oct 13 12:50:34 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 12:50:34 2016 +0100

--
 .../org/apache/cxf/transport/http/Headers.java  |  98 ++--
 .../apache/cxf/transport/http/HeadersTest.java  | 111 ---
 2 files changed, 156 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d5aed7c0/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 23b7975..7ec9f4a 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
@@ -61,8 +61,8 @@ public class Headers {
  * Each header value is added as a separate HTTP header, example, given A 
header with 'a' and 'b'
  * values, two A headers will be added as opposed to a single A header 
with the "a,b" value. 
  */
-public static final String ADD_HEADERS_PROPERTY = 
"org.apache.cxf.http.add-headers"; 
-   
+public static final String ADD_HEADERS_PROPERTY = 
"org.apache.cxf.http.add-headers";
+
 public static final String PROTOCOL_HEADERS_CONTENT_TYPE = 
Message.CONTENT_TYPE.toLowerCase();
 public static final String HTTP_HEADERS_SETCOOKIE = "Set-Cookie";
 public static final String HTTP_HEADERS_LINK = "Link";
@@ -70,7 +70,10 @@ public class Headers {
 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);
-
+
+private static final List SENSITIVE_HEADERS = 
Arrays.asList("Authorization", "Proxy-Authorization");
+private static final List SENSITIVE_HEADER_MARKER = 
Arrays.asList("***");
+private static final String ALLOW_LOGGING_SENSITIVE_HEADERS = 
"allow.logging.sensitive.headers";
 /**
  * Known HTTP headers whose values have to be represented as individual 
HTTP headers
  */
@@ -108,6 +111,25 @@ public class Headers {
 return name + "/" + version;
 }
 
+/**
+ * Returns a traceable string representation of the passed-in headers map.
+ * The value for any keys in the map that are in the 
SENSITIVE_HEADERS
+ * array will be filtered out of the returned string.
+ * Note that this method is expensive as it will copy the map (except for 
the
+ * filtered keys), so it should be used sparingly - i.e. only when debug is
+ * enabled.
+ */
+static String toString(Map headers, boolean 
logSensitiveHeaders) {
+Map filteredHeaders = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+filteredHeaders.putAll(headers);
+if (!logSensitiveHeaders) {
+for (String filteredKey : SENSITIVE_HEADERS) {
+filteredHeaders.put(filteredKey, SENSITIVE_HEADER_MARKER);
+}
+}
+return filteredHeaders.toString();
+}
+
 public Map headerMap() {
 return headers;
 }
@@ -189,7 +211,7 @@ public class Headers {
 createMutableList(policy.getReferer()));
 }
 }
-
+
 void setFromServerPolicy(HTTPServerPolicy policy) {
 if (policy.isSetCacheControl()) {
 headers.put("Cache-Control",
@@ -217,9 +239,8 @@ public class Headers {
 } else if (policy.isSetKeepAliveParameters()) {
 headers.put("Keep-Alive", 
createMutableList(policy.getKeepAliveParameters()));
 }
-
-
-
+
+
 /*
  * TODO - hook up these policies
 
@@ -241,8 +262,8 @@ public class Headers {
 headers.put("Proxy-Authorization",
 createMutableList(authorization));
 }
-
-
+
+
 /**
  * While extracting the Message.PROTOCOL_HEADERS property from the Message,
  * this call ensures that the

cxf git commit: [CXF-7089] et ParamConverters handle null proxy path parameters

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 56267745c -> 25ae30750


[CXF-7089] et ParamConverters handle null proxy path parameters


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

Branch: refs/heads/3.0.x-fixes
Commit: 25ae30750a2216af5f9c16e0db31d7fc07585cb1
Parents: 5626774
Author: Sergey Beryozkin 
Authored: Thu Oct 13 11:24:32 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 11:26:26 2016 +0100

--
 .../apache/cxf/jaxrs/client/AbstractClient.java |  8 +++---
 .../cxf/jaxrs/client/ClientProxyImpl.java   |  4 ++-
 .../jaxrs/JAXRSClientServerSpringBookTest.java  | 26 +++-
 3 files changed, 33 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/25ae3075/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 0a5956e..f2e28af 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
@@ -747,7 +747,10 @@ public abstract class AbstractClient implements Client {
 
 
 protected String convertParamValue(Object pValue, Annotation[] anns) {
-if (pValue == null) {
+return convertParamValue(pValue, pValue == null ? null : 
pValue.getClass(), anns);
+}
+protected String convertParamValue(Object pValue, Class pClass, 
Annotation[] anns) {
+if (pValue == null && pClass == null) {
 return null;
 }
 ProviderFactory pf = 
ClientProviderFactory.getInstance(cfg.getEndpoint());
@@ -760,7 +763,6 @@ public abstract class AbstractClient implements Client {
 m.getExchange().setOutMessage(m);
 m.getExchange().put(Endpoint.class, cfg.getEndpoint());
 }
-Class pClass = pValue.getClass();
 @SuppressWarnings("unchecked")
 ParamConverter prov = 
 (ParamConverter)pf.createParameterHandler(pClass, 
pClass, anns, m);
@@ -774,7 +776,7 @@ public abstract class AbstractClient implements Client {
 }
 }
 }
-return pValue.toString();
+return pValue == null ? null : pValue.toString();
 }
 
 protected static void reportMessageHandlerProblem(String name, Class 
cls, MediaType ct, Throwable ex) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/25ae3075/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 3a2dd9c..27a626a 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -444,7 +444,9 @@ public class ClientProxyImpl extends AbstractClient 
implements
 for (String varName : methodVars) {
 Parameter p = paramsMap.remove(varName);
 if (p != null) {
-list.add(convertParamValue(params[p.getIndex()], 
getParamAnnotations(m, p)));
+list.add(convertParamValue(params[p.getIndex()],
+   m.getParameterTypes()[p.getIndex()],
+   getParamAnnotations(m, p)));
 } else if (beanParamValues.containsKey(varName)) {
 BeanPair pair = beanParamValues.get(varName);
 list.add(convertParamValue(pair.getValue(), pair.getAnns()));

http://git-wip-us.apache.org/repos/asf/cxf/blob/25ae3075/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index a2e2d6a..bb0b82e 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -23,6 +23,8 @@ import java.io.BufferedReader;
 import

cxf git commit: [CXF-7089] et ParamConverters handle null proxy path parameters

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 9a46a89c4 -> 6eb9cd56b


[CXF-7089] et ParamConverters handle null proxy path parameters


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

Branch: refs/heads/3.1.x-fixes
Commit: 6eb9cd56b2566e45b1682d3dcd3eabb77ca5c767
Parents: 9a46a89
Author: Sergey Beryozkin 
Authored: Thu Oct 13 11:24:32 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 11:25:27 2016 +0100

--
 .../apache/cxf/jaxrs/client/AbstractClient.java |  8 +++---
 .../cxf/jaxrs/client/ClientProxyImpl.java   |  4 ++-
 .../jaxrs/JAXRSClientServerSpringBookTest.java  | 26 +++-
 3 files changed, 33 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6eb9cd56/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 23e1ca7..3139934 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
@@ -761,7 +761,10 @@ public abstract class AbstractClient implements Client {
 
 
 protected String convertParamValue(Object pValue, Annotation[] anns) {
-if (pValue == null) {
+return convertParamValue(pValue, pValue == null ? null : 
pValue.getClass(), anns);
+}
+protected String convertParamValue(Object pValue, Class pClass, 
Annotation[] anns) {
+if (pValue == null && pClass == null) {
 return null;
 }
 ProviderFactory pf = 
ClientProviderFactory.getInstance(cfg.getEndpoint());
@@ -774,7 +777,6 @@ public abstract class AbstractClient implements Client {
 m.getExchange().setOutMessage(m);
 m.getExchange().put(Endpoint.class, cfg.getEndpoint());
 }
-Class pClass = pValue.getClass();
 @SuppressWarnings("unchecked")
 ParamConverter prov = 
 (ParamConverter)pf.createParameterHandler(pClass, 
pClass, anns, m);
@@ -788,7 +790,7 @@ public abstract class AbstractClient implements Client {
 }
 }
 }
-return pValue.toString();
+return pValue == null ? null : pValue.toString();
 }
 
 protected static void reportMessageHandlerProblem(String name, Class 
cls, MediaType ct, Throwable ex) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/6eb9cd56/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index c5bb980..c82b942 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -444,7 +444,9 @@ public class ClientProxyImpl extends AbstractClient 
implements
 for (String varName : methodVars) {
 Parameter p = paramsMap.remove(varName);
 if (p != null) {
-list.add(convertParamValue(params[p.getIndex()], 
getParamAnnotations(m, p)));
+list.add(convertParamValue(params[p.getIndex()],
+   m.getParameterTypes()[p.getIndex()],
+   getParamAnnotations(m, p)));
 } else if (beanParamValues.containsKey(varName)) {
 BeanPair pair = beanParamValues.get(varName);
 list.add(convertParamValue(pair.getValue(), pair.getAnns()));

http://git-wip-us.apache.org/repos/asf/cxf/blob/6eb9cd56/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index 9597911..9dae3ae 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -23,6 +23,8 @@ import java.io.BufferedReader;
 import

cxf git commit: [CXF-7089] et ParamConverters handle null proxy path parameters

2016-10-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 1304bc2ff -> 68e437939


[CXF-7089] et ParamConverters handle null proxy path parameters


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

Branch: refs/heads/master
Commit: 68e437939102a94340e4133edb23feafc5645df5
Parents: 1304bc2
Author: Sergey Beryozkin 
Authored: Thu Oct 13 11:24:32 2016 +0100
Committer: Sergey Beryozkin 
Committed: Thu Oct 13 11:24:32 2016 +0100

--
 .../apache/cxf/jaxrs/client/AbstractClient.java |  8 +++---
 .../cxf/jaxrs/client/ClientProxyImpl.java   |  4 ++-
 .../jaxrs/JAXRSClientServerSpringBookTest.java  | 26 +++-
 3 files changed, 33 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/68e43793/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 23e1ca7..3139934 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
@@ -761,7 +761,10 @@ public abstract class AbstractClient implements Client {
 
 
 protected String convertParamValue(Object pValue, Annotation[] anns) {
-if (pValue == null) {
+return convertParamValue(pValue, pValue == null ? null : 
pValue.getClass(), anns);
+}
+protected String convertParamValue(Object pValue, Class pClass, 
Annotation[] anns) {
+if (pValue == null && pClass == null) {
 return null;
 }
 ProviderFactory pf = 
ClientProviderFactory.getInstance(cfg.getEndpoint());
@@ -774,7 +777,6 @@ public abstract class AbstractClient implements Client {
 m.getExchange().setOutMessage(m);
 m.getExchange().put(Endpoint.class, cfg.getEndpoint());
 }
-Class pClass = pValue.getClass();
 @SuppressWarnings("unchecked")
 ParamConverter prov = 
 (ParamConverter)pf.createParameterHandler(pClass, 
pClass, anns, m);
@@ -788,7 +790,7 @@ public abstract class AbstractClient implements Client {
 }
 }
 }
-return pValue.toString();
+return pValue == null ? null : pValue.toString();
 }
 
 protected static void reportMessageHandlerProblem(String name, Class 
cls, MediaType ct, Throwable ex) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/68e43793/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index c5bb980..c82b942 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -444,7 +444,9 @@ public class ClientProxyImpl extends AbstractClient 
implements
 for (String varName : methodVars) {
 Parameter p = paramsMap.remove(varName);
 if (p != null) {
-list.add(convertParamValue(params[p.getIndex()], 
getParamAnnotations(m, p)));
+list.add(convertParamValue(params[p.getIndex()],
+   m.getParameterTypes()[p.getIndex()],
+   getParamAnnotations(m, p)));
 } else if (beanParamValues.containsKey(varName)) {
 BeanPair pair = beanParamValues.get(varName);
 list.add(convertParamValue(pair.getValue(), pair.getAnns()));

http://git-wip-us.apache.org/repos/asf/cxf/blob/68e43793/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index 9597911..9dae3ae 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -23,6 +23,8 @@ import java.io.BufferedReader;
 import java.io.File;

cxf-fediz git commit: Take SamlRealmCodec from fediz-sts.xml

2016-10-13 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master c4ca0c083 -> f260b413c


Take SamlRealmCodec from fediz-sts.xml


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

Branch: refs/heads/master
Commit: f260b413ca7b565340535b1a899a9351d86aca37
Parents: c4ca0c0
Author: Colm O hEigeartaigh 
Authored: Thu Oct 13 10:36:18 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 13 10:36:18 2016 +0100

--
 services/sts/src/main/webapp/WEB-INF/cxf-transport.xml | 4 
 services/sts/src/main/webapp/WEB-INF/fediz-sts.xml | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f260b413/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
--
diff --git a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml 
b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
index c06fed8..524a51e 100644
--- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
+++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
@@ -56,12 +56,16 @@
 
 
 
+
+
 
 
 
 
 
 
+
 
 
 http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f260b413/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
--
diff --git a/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml 
b/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
index 3e3ae36..dece37e 100644
--- a/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
+++ b/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
@@ -106,12 +106,8 @@
 
 
 
-
-
 
-