You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/20 16:53:55 UTC
[1/3] cxf git commit: CXF-7255 - Allow empty ("") passwords when
calling a service
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 030437b55 -> b2bad7f9e
CXF-7255 - Allow empty ("") passwords when calling a service
# Conflicts:
# rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5aaf49b1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5aaf49b1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5aaf49b1
Branch: refs/heads/3.1.x-fixes
Commit: 5aaf49b18e4c2962eeb2260ad30072b553838efb
Parents: 030437b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Feb 20 16:02:13 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Feb 20 16:53:29 2017 +0000
----------------------------------------------------------------------
.../security/wss4j/policyhandlers/AbstractBindingBuilder.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5aaf49b1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index f187e9c..2b53c20 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -803,8 +803,13 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
if (StringUtils.isEmpty(password)) {
password = getPassword(userName, token, WSPasswordCallback.USERNAME_TOKEN);
}
+<<<<<<< HEAD
if (!StringUtils.isEmpty(password)) {
+=======
+
+ if (password != null) {
+>>>>>>> f91541b... CXF-7255 - Allow empty ("") passwords when calling a service
// If the password is available then build the token
if (token.getPasswordType() == UsernameToken.PasswordType.HashPassword) {
utBuilder.setPasswordType(WSConstants.PASSWORD_DIGEST);
[3/3] cxf git commit: Fixing backmerge
Posted by co...@apache.org.
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2bad7f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2bad7f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2bad7f9
Branch: refs/heads/3.1.x-fixes
Commit: b2bad7f9eba17cac427edbab18b4b6f9c8ef7556
Parents: 07fc13e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Feb 20 16:53:45 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Feb 20 16:53:45 2017 +0000
----------------------------------------------------------------------
.../security/wss4j/policyhandlers/AbstractBindingBuilder.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b2bad7f9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 2b53c20..499583e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -803,13 +803,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
if (StringUtils.isEmpty(password)) {
password = getPassword(userName, token, WSPasswordCallback.USERNAME_TOKEN);
}
-<<<<<<< HEAD
-
- if (!StringUtils.isEmpty(password)) {
-=======
-
if (password != null) {
->>>>>>> f91541b... CXF-7255 - Allow empty ("") passwords when calling a service
// If the password is available then build the token
if (token.getPasswordType() == UsernameToken.PasswordType.HashPassword) {
utBuilder.setPasswordType(WSConstants.PASSWORD_DIGEST);
[2/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
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/07fc13ec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/07fc13ec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/07fc13ec
Branch: refs/heads/3.1.x-fixes
Commit: 07fc13ec7be25b4f62c0a8858194f36c1699bf51
Parents: 5aaf49b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Feb 20 16:53:30 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Feb 20 16:53:30 2017 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/07fc13ec/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 82cd724..ce6f2d0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -378,6 +378,7 @@ M ed9298066428c0dfc4590a556876d696a4ba13c0
M f462c797eab75e9b6c6c352b4baeb84429866068
M f7f017f2187d59369a7b94bb053f1e297972dce7
M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5
+M f91541bed7e44624556b394cfba9b1a43c9bbdca
M f9a42a528f4edfa7bcc62d5885eebaeb25224cec
M fa973bd7ab43099151f83beea351b80c7140eaab
M faf461150f178f7f7ae89a3b7c345671e53b8b04