buildbot success in on cxf-site-production

2016-01-27 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/5083

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot success in on cxf-site-production

2016-01-27 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/5086

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

cxf git commit: Passing the nonce via a TL storage too

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 45f3d5944 -> ee76fe358


Passing the nonce via a TL storage too


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

Branch: refs/heads/master
Commit: ee76fe358aeb36d95204ec10f8cec674163b8fcf
Parents: 45f3d59
Author: Sergey Beryozkin 
Authored: Wed Jan 27 16:55:00 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 16:55:00 2016 +

--
 .../oauth2/grants/code/AuthorizationCodeGrantHandler.java| 4 
 .../oauth2/services/AbstractImplicitGrantService.java| 4 
 .../cxf/rs/security/oidc/idp/IdTokenResponseFilter.java  | 8 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ee76fe35/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
index c8e6655..9844a30 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.cxf.rs.security.oauth2.common.AccessTokenRegistration;
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
@@ -111,6 +112,9 @@ public class AuthorizationCodeGrantHandler extends 
AbstractGrantHandler {
 
grant.getRequestedScopes(), 
 
getAudiences(client, grant.getAudience()));
 if (token != null) {
+if (grant.getNonce() != null) {
+
JAXRSUtils.getCurrentMessage().getExchange().put(OAuthConstants.NONCE, 
grant.getNonce());
+}
 return token;
 } else {
 // the grant was issued based on the authorization time check 
confirming the

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee76fe35/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
index 6f8a01f..5133374 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.jaxrs.utils.HttpUtils;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.cxf.rs.security.oauth2.common.AccessTokenRegistration;
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
@@ -84,6 +85,9 @@ public abstract class AbstractImplicitGrantService extends 
RedirectionBasedGrant
 }
 } else {
 token = preAuthorizedToken;
+if (state.getNonce() != null) {
+
JAXRSUtils.getCurrentMessage().getExchange().put(OAuthConstants.NONCE, 
state.getNonce());
+}
 }
 
 ClientAccessToken clientToken = null;

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee76fe35/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
index 509648a..6edcc7a 100644
---

cxf git commit: Reverting some nonce related changes for now

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8e9c9571f -> cbcdc107d


Reverting some nonce related changes for now


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

Branch: refs/heads/3.1.x-fixes
Commit: cbcdc107da88f28e772f3a943013743a033781de
Parents: 8e9c957
Author: Sergey Beryozkin 
Authored: Wed Jan 27 15:48:13 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 15:49:19 2016 +

--
 .../oauth2/grants/code/AbstractCodeDataProvider.java| 9 +++--
 .../oauth2/grants/code/DefaultEHCacheCodeDataProvider.java  | 2 +-
 .../security/oauth2/provider/AbstractOAuthDataProvider.java | 7 +--
 .../cxf/rs/security/oidc/idp/IdTokenResponseFilter.java | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cbcdc107/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
index b89c247..c03ccf3 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
@@ -39,7 +39,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
 }
 
 public void setCodeLifetime(long codeLifetime) {
@@ -51,8 +51,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 }
 }
 public static ServerAuthorizationCodeGrant 
initCodeGrant(AuthorizationCodeRegistration reg, 
- long lifetime,
- boolean useNonce) 
{
+ long lifetime) {
 ServerAuthorizationCodeGrant grant = new 
ServerAuthorizationCodeGrant(reg.getClient(), lifetime);
 grant.setRedirectUri(reg.getRedirectUri());
 grant.setSubject(reg.getSubject());
@@ -61,9 +60,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 grant.setApprovedScopes(reg.getApprovedScope());
 grant.setAudience(reg.getAudience());
 grant.setClientCodeChallenge(reg.getClientCodeChallenge());
-if (useNonce) {
-grant.setNonce(reg.getNonce());
-}
+grant.setNonce(reg.getNonce());
 return grant;
 }
 protected abstract void saveCodeGrant(ServerAuthorizationCodeGrant grant);

http://git-wip-us.apache.org/repos/asf/cxf/blob/cbcdc107/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index f43d69e..12edf9b 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -79,7 +79,7 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
 }
 
 public List getCodeGrants(Client c, 
UserSubject sub) {

cxf git commit: Reverting some nonce related changes for now

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 72653fd11 -> 45f3d5944


Reverting some nonce related changes for now


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

Branch: refs/heads/master
Commit: 45f3d59446327197a4fce267c51bdc7d8fafa03f
Parents: 72653fd
Author: Sergey Beryozkin 
Authored: Wed Jan 27 15:48:13 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 15:48:13 2016 +

--
 .../oauth2/grants/code/AbstractCodeDataProvider.java| 9 +++--
 .../oauth2/grants/code/DefaultEHCacheCodeDataProvider.java  | 2 +-
 .../security/oauth2/provider/AbstractOAuthDataProvider.java | 7 +--
 .../cxf/rs/security/oidc/idp/IdTokenResponseFilter.java | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45f3d594/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
index b89c247..c03ccf3 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
@@ -39,7 +39,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
 }
 
 public void setCodeLifetime(long codeLifetime) {
@@ -51,8 +51,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 }
 }
 public static ServerAuthorizationCodeGrant 
initCodeGrant(AuthorizationCodeRegistration reg, 
- long lifetime,
- boolean useNonce) 
{
+ long lifetime) {
 ServerAuthorizationCodeGrant grant = new 
ServerAuthorizationCodeGrant(reg.getClient(), lifetime);
 grant.setRedirectUri(reg.getRedirectUri());
 grant.setSubject(reg.getSubject());
@@ -61,9 +60,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 grant.setApprovedScopes(reg.getApprovedScope());
 grant.setAudience(reg.getAudience());
 grant.setClientCodeChallenge(reg.getClientCodeChallenge());
-if (useNonce) {
-grant.setNonce(reg.getNonce());
-}
+grant.setNonce(reg.getNonce());
 return grant;
 }
 protected abstract void saveCodeGrant(ServerAuthorizationCodeGrant grant);

http://git-wip-us.apache.org/repos/asf/cxf/blob/45f3d594/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index f43d69e..12edf9b 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -79,7 +79,7 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
 }
 
 public List getCodeGrants(Client c, 
UserSubject sub) {

buildbot failure in on cxf-site-production

2016-01-27 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/5088

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf git commit: Passing the nonce via a TL storage too

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes cbcdc107d -> 64fd0cc1b


Passing the nonce via a TL storage too


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

Branch: refs/heads/3.1.x-fixes
Commit: 64fd0cc1bc2b2260deea1b2127f861f3e47cfb72
Parents: cbcdc10
Author: Sergey Beryozkin 
Authored: Wed Jan 27 16:55:00 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 16:57:47 2016 +

--
 .../oauth2/grants/code/AuthorizationCodeGrantHandler.java| 4 
 .../oauth2/services/AbstractImplicitGrantService.java| 4 
 .../cxf/rs/security/oidc/idp/IdTokenResponseFilter.java  | 8 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/64fd0cc1/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
index 96f8360..32ba9d1 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.cxf.rs.security.oauth2.common.AccessTokenRegistration;
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
@@ -111,6 +112,9 @@ public class AuthorizationCodeGrantHandler extends 
AbstractGrantHandler {
 
grant.getRequestedScopes(), 
 
getAudiences(client, grant.getAudience()));
 if (token != null) {
+if (grant.getNonce() != null) {
+
JAXRSUtils.getCurrentMessage().getExchange().put(OAuthConstants.NONCE, 
grant.getNonce());
+}
 return token;
 } else {
 // the grant was issued based on the authorization time check 
confirming the

http://git-wip-us.apache.org/repos/asf/cxf/blob/64fd0cc1/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
index 6f8a01f..5133374 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.jaxrs.utils.HttpUtils;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.cxf.rs.security.oauth2.common.AccessTokenRegistration;
 import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
@@ -84,6 +85,9 @@ public abstract class AbstractImplicitGrantService extends 
RedirectionBasedGrant
 }
 } else {
 token = preAuthorizedToken;
+if (state.getNonce() != null) {
+
JAXRSUtils.getCurrentMessage().getExchange().put(OAuthConstants.NONCE, 
state.getNonce());
+}
 }
 
 ClientAccessToken clientToken = null;

http://git-wip-us.apache.org/repos/asf/cxf/blob/64fd0cc1/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
index 509648a..6edcc7a

cxf git commit: Updating BouncyCastle + SLF4J

2016-01-27 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 64fd0cc1b -> cc2a8d6e5


Updating BouncyCastle + SLF4J


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

Branch: refs/heads/3.1.x-fixes
Commit: cc2a8d6e58dc2030f21633395fa0476e562393b1
Parents: 64fd0cc
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 17:13:37 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 17:14:41 2016 +

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cc2a8d6e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b3a0a34..b720cf7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -72,7 +72,7 @@
 2.3.5
 [2.0,3.0)
 1.2.14
-1.53
+1.54
 2.2_2
 [2.1.3,3.0.0)
 1.1.0
@@ -138,7 +138,7 @@
 1.0
 
geronimo-servlet_2.5_spec
 1.1.2
-1.7.12
+1.7.14
 1.2
 4.1.7.RELEASE
 
3.2.8.RELEASE

cxf git commit: Updating BouncyCastle + SLF4J

2016-01-27 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master ee76fe358 -> 01c4b68b2


Updating BouncyCastle + SLF4J


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

Branch: refs/heads/master
Commit: 01c4b68b2729c1883ce4ee844475a37ebc876f49
Parents: ee76fe3
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 17:13:37 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 17:13:47 2016 +

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/01c4b68b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b734d2..ec60317 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -72,7 +72,7 @@
 2.3.5
 [2.0,3.0)
 1.2.14
-1.53
+1.54
 2.2_2
 [2.1.3,3.0.0)
 1.1.0
@@ -138,7 +138,7 @@
 1.0
 
geronimo-servlet_2.5_spec
 1.1.2
-1.7.12
+1.7.14
 1.2
 4.1.7.RELEASE
 
3.2.8.RELEASE

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

2016-01-27 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 83dd3b708 -> 10704bee9


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

Branch: refs/heads/3.0.x-fixes
Commit: 4c8c0cd64f4ec226ff8d8ab9e15f3aa8d761cbae
Parents: bbd098b
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 17:14:58 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 17:14:58 2016 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/4c8c0cd6/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b756e06..491f6f4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -833,6 +833,7 @@ M c5dbb84ac4e5bf73555e85ae1e65a5065393c602
 M c66b1a18100ac752e8a2fff712c01e6c682ffcd7
 M c72cac8cbd73d92a9e0264c816176c2a33dcbcf2
 M ca0a435219e82734269f2c8330f0989576f019d2
+M cc2a8d6e58dc2030f21633395fa0476e562393b1
 M cda58270486b4d394b98a1a1a1d5bfcb366af2c1
 M ce6444508e279e9941fdc23f80889f44a27b9d95
 M cf879076498614de7424fc4ec63e62324e0055a6

[3/3] cxf git commit: Fixing merge

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

Branch: refs/heads/3.0.x-fixes
Commit: 10704bee9b1c6dbdfa9e5f3338c36f23fd922e6b
Parents: 4c8c0cd
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 17:15:08 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 17:15:08 2016 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/10704bee/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6ea5612..e581f9f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,11 +151,7 @@
 1.0
 
geronimo-servlet_2.5_spec
 1.1.2
-<<< HEAD
-1.7.9
-===
 1.7.14
->>> cc2a8d6... Updating BouncyCastle + SLF4J
 1.2
 3.2.14.RELEASE
 
3.1.7.RELEASE

[2/3] cxf git commit: Updating BouncyCastle + SLF4J

2016-01-27 Thread coheigea 
Updating BouncyCastle + SLF4J

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

Branch: refs/heads/3.0.x-fixes
Commit: bbd098b6ee0a913f648e40f91403868d107d6844
Parents: 83dd3b7
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 17:13:37 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 17:14:58 2016 +

--
 parent/pom.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bbd098b6/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ee9b504..6ea5612 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -79,7 +79,7 @@
 2.2.7
 [2.0,3.0)
 1.2.14
-1.53
+1.54
 2.2_2
 [2.1.3,3.0.0)
 1.10
@@ -151,7 +151,11 @@
 1.0
 
geronimo-servlet_2.5_spec
 1.1.2
+<<< HEAD
 1.7.9
+===
+1.7.14
+>>> cc2a8d6... Updating BouncyCastle + SLF4J
 1.2
 3.2.14.RELEASE
 
3.1.7.RELEASE

buildbot failure in on cxf-site-production

2016-01-27 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/5084

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf git commit: [CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 60166cfee -> 48aa8e93e


[CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied


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

Branch: refs/heads/3.1.x-fixes
Commit: 48aa8e93e8d5154d8b8ced10b35956b30147590f
Parents: 60166cf
Author: Sergey Beryozkin 
Authored: Wed Jan 27 11:38:21 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 11:40:33 2016 +

--
 .../main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/48aa8e93/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 52e900f..cd440dc 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -282,7 +282,8 @@ public class ClientImpl implements Client {
 // TLS
 TLSClientParameters tlsParams = secConfig.getTlsClientParams();
 if (tlsParams.getSSLSocketFactory() != null 
-|| tlsParams.getTrustManagers() != null) {
+|| tlsParams.getTrustManagers() != null
+|| tlsParams.getHostnameVerifier() != null) {
 clientCfg.getHttpConduit().setTlsClientParameters(tlsParams);
 }

[3/3] cxf git commit: Fixing merge

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

Branch: refs/heads/3.0.x-fixes
Commit: 776a01d3f538dabbac6043b01ad8b475a802ef33
Parents: 4549fe2
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 11:28:54 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 11:28:54 2016 +

--
 .../cxf/sts/operation/AbstractOperation.java| 24 ---
 .../cxf/sts/operation/TokenIssueOperation.java  | 15 
 .../sts/operation/TokenValidateOperation.java   |  5 
 .../cxf/sts/common/CustomAttributeProvider.java | 25 ++--
 4 files changed, 23 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/776a01d3/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index e73e327..1e71e72 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -669,30 +669,6 @@ public abstract class AbstractOperation {
 }
 }
 
-<<< HEAD
-protected void checkClaimsSupport(ClaimCollection requestedClaims) {
-if (requestedClaims != null) {
-List unhandledClaimTypes = new ArrayList();
-for (Claim requestedClaim : requestedClaims) {
-if 
(!claimsManager.getSupportedClaimTypes().contains(requestedClaim.getClaimType())
 
-&& !requestedClaim.isOptional()) {
-unhandledClaimTypes.add(requestedClaim.getClaimType());
-}
-}
-
-if (unhandledClaimTypes.size() > 0) {
-LOG.log(Level.WARNING, "The requested claim " + 
unhandledClaimTypes.toString() 
-+ " cannot be fulfilled by the STS.");
-throw new STSException(
-"The requested claim " + 
unhandledClaimTypes.toString() 
-+ " cannot be fulfilled by the STS."
-);
-}
-}
-}
-
-===
->>> 60166cf... [CXF-6763] - STS requires ClaimHandler even in ClaimMapping 
only scenarios
 protected void processValidToken(TokenProviderParameters 
providerParameters,
 ReceivedToken validatedToken, TokenValidatorResponse 
tokenResponse) {
 // Map the principal (if it exists)

http://git-wip-us.apache.org/repos/asf/cxf/blob/776a01d3/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
index a768171..d15c9fd 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
@@ -33,11 +33,6 @@ import javax.xml.ws.handler.MessageContext;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
-<<< HEAD
-import org.apache.cxf.rt.security.claims.ClaimCollection;
-===
-import org.apache.cxf.helpers.DOMUtils;
->>> 60166cf... [CXF-6763] - STS requires ClaimHandler even in ClaimMapping 
only scenarios
 import org.apache.cxf.sts.QNameConstants;
 import org.apache.cxf.sts.event.STSIssueFailureEvent;
 import org.apache.cxf.sts.event.STSIssueSuccessEvent;
@@ -117,17 +112,7 @@ public class TokenIssueOperation extends AbstractOperation 
implements IssueOpera
 try {
 RequestParser requestParser = parseRequest(request, context);
 
-<<< HEAD
 providerParameters = createTokenProviderParameters(requestParser, 
context);
-
-// Check if the requested claims can be handled by the configured 
claim handlers
-ClaimCollection requestedClaims = 
providerParameters.getRequestedPrimaryClaims();
-checkClaimsSupport(requestedClaims);
-requestedClaims = providerParameters.getRequestedSecondaryClaims();
-checkClaimsSupport(requestedClaims);
-===
-providerParameters = 
createTokenProviderParameters(requestRequirements, context);
->>>

[2/3] cxf git commit: [CXF-6763] - STS requires ClaimHandler even in ClaimMapping only scenarios

2016-01-27 Thread coheigea 
[CXF-6763] - STS requires ClaimHandler even in ClaimMapping only scenarios

# Conflicts:
#   
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
#   
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
#   
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java


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

Branch: refs/heads/3.0.x-fixes
Commit: ac694f993fe349b236e74dde9a71c56e9f9f6b4b
Parents: bf3e0eb
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 11:00:06 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 11:12:58 2016 +

--
 .../apache/cxf/sts/claims/ClaimsManager.java| 176 ++-
 .../cxf/sts/operation/AbstractOperation.java|   5 +-
 .../cxf/sts/operation/TokenIssueOperation.java  |   8 +
 .../sts/operation/TokenValidateOperation.java   |   8 +-
 .../cxf/sts/common/CustomAttributeProvider.java |  25 +--
 .../sts/operation/IssueSamlClaimsUnitTest.java  |  52 ++
 6 files changed, 159 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ac694f99/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
index d448ed2..5568d33 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
@@ -145,92 +145,7 @@ public class ClaimsManager {
 if (relationship == null || 
relationship.getType().equals(Relationship.FED_TYPE_IDENTITY)) {
 // Federate identity. Identity already mapped.
 // Call all configured claims handlers to retrieve the required 
claims
-if (claimHandlers == null || claimHandlers.size() == 0) {
-return null;
-}
-Principal originalPrincipal = parameters.getPrincipal();
-ProcessedClaimCollection returnCollection = new 
ProcessedClaimCollection();
-for (ClaimsHandler handler : claimHandlers) {
-
-ClaimCollection supportedClaims = 
-filterHandlerClaims(claims, 
handler.getSupportedClaimTypes());
-if (supportedClaims.isEmpty()) {
-continue;
-}
-
-if (handler instanceof RealmSupport) {
-RealmSupport handlerRealmSupport = (RealmSupport)handler;
-// Check whether the handler supports the current realm
-if (handlerRealmSupport.getSupportedRealms() != null
-&& handlerRealmSupport.getSupportedRealms().size() 
> 0
-&& 
handlerRealmSupport.getSupportedRealms().indexOf(parameters.getRealm()) == -1) {
-if (LOG.isLoggable(Level.FINER)) {
-LOG.finer("Handler '" + 
handler.getClass().getName() + "' doesn't support"
-+ " realm '" + parameters.getRealm()  + 
"'");
-}
-continue;
-}
-
-// If handler realm is configured and different from 
current realm
-// do an identity mapping
-if (handlerRealmSupport.getHandlerRealm() != null
-&& 
!handlerRealmSupport.getHandlerRealm().equalsIgnoreCase(parameters.getRealm())) 
{
-Principal targetPrincipal = null;
-try {
-if (LOG.isLoggable(Level.FINE)) {
-LOG.fine("Mapping user '" + 
parameters.getPrincipal().getName()
-+ "' [" + parameters.getRealm() + "] 
to realm '"
-+ 
handlerRealmSupport.getHandlerRealm() + "'");
-}
-targetPrincipal = doMapping(parameters.getRealm(), 
parameters.getPrincipal(),
-handlerRealmSupport.getHandlerRealm());
-} catch (Exception ex) {
-LOG.log(Level.WARNING, "Failed to map user '" + 
parameters.getPrincipal().getName()
-

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

2016-01-27 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes bf3e0eb2d -> 776a01d3f


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

Branch: refs/heads/3.0.x-fixes
Commit: 4549fe212c7ab559667d8bca2f381cd309263637
Parents: ac694f9
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 11:12:58 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 11:12:58 2016 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/4549fe21/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index af54fa0..b756e06 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -711,6 +711,7 @@ M 5e4a14b4da1f1b27e4df811be80a7f11fc6dae8d
 M 5e919271e2e92f9845d6454b37ab0b86cfc66591
 M 5e97d1e29e85d80f0679748cc4df0d8e0647ee16
 M 5fbe7b49b88deff15f755c15f5a4c421943acc4f
+M 60166cfeeb268476c697d1ada15af63719362710
 M 6106f469f5ae311edf2f7de12038822bc03dc073
 M 6129ec5f6735a986660a2d05c6b3b0c9230610d9
 M 621e9cc86027ff94330c13b8bcf28c95466cf6c9

cxf git commit: [CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 776a01d3f -> 83dd3b708


[CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied


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

Branch: refs/heads/3.0.x-fixes
Commit: 83dd3b7089c5058719476289b1460593b4c8f6bd
Parents: 776a01d
Author: Sergey Beryozkin 
Authored: Wed Jan 27 11:38:21 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 11:41:23 2016 +

--
 .../main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/83dd3b70/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 52e900f..cd440dc 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -282,7 +282,8 @@ public class ClientImpl implements Client {
 // TLS
 TLSClientParameters tlsParams = secConfig.getTlsClientParams();
 if (tlsParams.getSSLSocketFactory() != null 
-|| tlsParams.getTrustManagers() != null) {
+|| tlsParams.getTrustManagers() != null
+|| tlsParams.getHostnameVerifier() != null) {
 clientCfg.getHttpConduit().setTlsClientParameters(tlsParams);
 }

cxf git commit: [CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 0966883ab -> 1fe6ef5fa


[CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied


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

Branch: refs/heads/master
Commit: 1fe6ef5fa9aafa9e077e30fc5a87ac281df34a93
Parents: 0966883
Author: Sergey Beryozkin 
Authored: Wed Jan 27 11:38:21 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 11:38:21 2016 +

--
 .../main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1fe6ef5f/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 52e900f..cd440dc 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -282,7 +282,8 @@ public class ClientImpl implements Client {
 // TLS
 TLSClientParameters tlsParams = secConfig.getTlsClientParams();
 if (tlsParams.getSSLSocketFactory() != null 
-|| tlsParams.getTrustManagers() != null) {
+|| tlsParams.getTrustManagers() != null
+|| tlsParams.getHostnameVerifier() != null) {
 clientCfg.getHttpConduit().setTlsClientParameters(tlsParams);
 }

buildbot failure in on cxf-site-production

2016-01-27 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/5066

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf git commit: [CXF-6763] - STS requires ClaimHandler even in ClaimMapping only scenarios

2016-01-27 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master 8571a5a79 -> 0966883ab


[CXF-6763] - STS requires ClaimHandler even in ClaimMapping only scenarios


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

Branch: refs/heads/master
Commit: 0966883ab051a53da0b60e285fdf9e494fdb6edc
Parents: 8571a5a
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 11:00:06 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 11:00:06 2016 +

--
 .../apache/cxf/sts/claims/ClaimsManager.java| 176 ++-
 .../cxf/sts/operation/AbstractOperation.java|  23 ---
 .../cxf/sts/operation/TokenIssueOperation.java  |   7 -
 .../sts/operation/TokenValidateOperation.java   |   5 -
 .../cxf/sts/common/CustomAttributeProvider.java |  25 +--
 .../sts/operation/IssueSamlClaimsUnitTest.java  |  52 ++
 6 files changed, 144 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0966883a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
index 505f7e3..6534394 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
@@ -145,92 +145,7 @@ public class ClaimsManager {
 if (relationship == null || 
relationship.getType().equals(Relationship.FED_TYPE_IDENTITY)) {
 // Federate identity. Identity already mapped.
 // Call all configured claims handlers to retrieve the required 
claims
-if (claimHandlers == null || claimHandlers.size() == 0) {
-return null;
-}
-Principal originalPrincipal = parameters.getPrincipal();
-ProcessedClaimCollection returnCollection = new 
ProcessedClaimCollection();
-for (ClaimsHandler handler : claimHandlers) {
-
-ClaimCollection supportedClaims = 
-filterHandlerClaims(claims, 
handler.getSupportedClaimTypes());
-if (supportedClaims.isEmpty()) {
-continue;
-}
-
-if (handler instanceof RealmSupport) {
-RealmSupport handlerRealmSupport = (RealmSupport)handler;
-// Check whether the handler supports the current realm
-if (handlerRealmSupport.getSupportedRealms() != null
-&& handlerRealmSupport.getSupportedRealms().size() 
> 0
-&& 
handlerRealmSupport.getSupportedRealms().indexOf(parameters.getRealm()) == -1) {
-if (LOG.isLoggable(Level.FINER)) {
-LOG.finer("Handler '" + 
handler.getClass().getName() + "' doesn't support"
-+ " realm '" + parameters.getRealm()  + 
"'");
-}
-continue;
-}
-
-// If handler realm is configured and different from 
current realm
-// do an identity mapping
-if (handlerRealmSupport.getHandlerRealm() != null
-&& 
!handlerRealmSupport.getHandlerRealm().equalsIgnoreCase(parameters.getRealm())) 
{
-Principal targetPrincipal = null;
-try {
-if (LOG.isLoggable(Level.FINE)) {
-LOG.fine("Mapping user '" + 
parameters.getPrincipal().getName()
-+ "' [" + parameters.getRealm() + "] 
to realm '"
-+ 
handlerRealmSupport.getHandlerRealm() + "'");
-}
-targetPrincipal = doMapping(parameters.getRealm(), 
parameters.getPrincipal(),
-handlerRealmSupport.getHandlerRealm());
-} catch (Exception ex) {
-LOG.log(Level.WARNING, "Failed to map user '" + 
parameters.getPrincipal().getName()
-+ "' [" + parameters.getRealm() + "] to 
realm '"
-+ handlerRealmSupport.getHandlerRealm() + 
"'", ex);
-throw new STSException("Failed to map user for 
claims

cxf git commit: [CXF-6763] - STS requires ClaimHandler even in ClaimMapping only scenarios

2016-01-27 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 7e9e23cb8 -> 60166cfee


[CXF-6763] - STS requires ClaimHandler even in ClaimMapping only scenarios


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

Branch: refs/heads/3.1.x-fixes
Commit: 60166cfeeb268476c697d1ada15af63719362710
Parents: 7e9e23c
Author: Colm O hEigeartaigh 
Authored: Wed Jan 27 11:00:06 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Jan 27 11:00:36 2016 +

--
 .../apache/cxf/sts/claims/ClaimsManager.java| 176 ++-
 .../cxf/sts/operation/AbstractOperation.java|  23 ---
 .../cxf/sts/operation/TokenIssueOperation.java  |   7 -
 .../sts/operation/TokenValidateOperation.java   |   5 -
 .../cxf/sts/common/CustomAttributeProvider.java |  25 +--
 .../sts/operation/IssueSamlClaimsUnitTest.java  |  52 ++
 6 files changed, 144 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/60166cfe/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
index 505f7e3..6534394 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
@@ -145,92 +145,7 @@ public class ClaimsManager {
 if (relationship == null || 
relationship.getType().equals(Relationship.FED_TYPE_IDENTITY)) {
 // Federate identity. Identity already mapped.
 // Call all configured claims handlers to retrieve the required 
claims
-if (claimHandlers == null || claimHandlers.size() == 0) {
-return null;
-}
-Principal originalPrincipal = parameters.getPrincipal();
-ProcessedClaimCollection returnCollection = new 
ProcessedClaimCollection();
-for (ClaimsHandler handler : claimHandlers) {
-
-ClaimCollection supportedClaims = 
-filterHandlerClaims(claims, 
handler.getSupportedClaimTypes());
-if (supportedClaims.isEmpty()) {
-continue;
-}
-
-if (handler instanceof RealmSupport) {
-RealmSupport handlerRealmSupport = (RealmSupport)handler;
-// Check whether the handler supports the current realm
-if (handlerRealmSupport.getSupportedRealms() != null
-&& handlerRealmSupport.getSupportedRealms().size() 
> 0
-&& 
handlerRealmSupport.getSupportedRealms().indexOf(parameters.getRealm()) == -1) {
-if (LOG.isLoggable(Level.FINER)) {
-LOG.finer("Handler '" + 
handler.getClass().getName() + "' doesn't support"
-+ " realm '" + parameters.getRealm()  + 
"'");
-}
-continue;
-}
-
-// If handler realm is configured and different from 
current realm
-// do an identity mapping
-if (handlerRealmSupport.getHandlerRealm() != null
-&& 
!handlerRealmSupport.getHandlerRealm().equalsIgnoreCase(parameters.getRealm())) 
{
-Principal targetPrincipal = null;
-try {
-if (LOG.isLoggable(Level.FINE)) {
-LOG.fine("Mapping user '" + 
parameters.getPrincipal().getName()
-+ "' [" + parameters.getRealm() + "] 
to realm '"
-+ 
handlerRealmSupport.getHandlerRealm() + "'");
-}
-targetPrincipal = doMapping(parameters.getRealm(), 
parameters.getPrincipal(),
-handlerRealmSupport.getHandlerRealm());
-} catch (Exception ex) {
-LOG.log(Level.WARNING, "Failed to map user '" + 
parameters.getPrincipal().getName()
-+ "' [" + parameters.getRealm() + "] to 
realm '"
-+ handlerRealmSupport.getHandlerRealm() + 
"'", ex);
-throw new STSException("Failed to map user for

cxf git commit: Not persisting nonces if pre-authorized tokens are supported

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e7a75b695 -> 8e9c9571f


Not persisting nonces if pre-authorized tokens are supported


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

Branch: refs/heads/3.1.x-fixes
Commit: 8e9c9571f256ddbe06514ccc0c2f232218f905d6
Parents: e7a75b6
Author: Sergey Beryozkin 
Authored: Wed Jan 27 14:05:10 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 14:06:27 2016 +

--
 .../grants/code/AbstractCodeDataProvider.java   | 10 --
 .../code/DefaultEHCacheCodeDataProvider.java|  2 +-
 .../provider/AbstractOAuthDataProvider.java | 36 
 .../oidc/idp/IdTokenResponseFilter.java | 25 +++---
 4 files changed, 43 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8e9c9571/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
index 12fd14e..b89c247 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
@@ -39,7 +39,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
 }
 
 public void setCodeLifetime(long codeLifetime) {
@@ -50,7 +50,9 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 removeCodeGrant(grant.getCode());
 }
 }
-public static ServerAuthorizationCodeGrant 
initCodeGrant(AuthorizationCodeRegistration reg, long lifetime) {
+public static ServerAuthorizationCodeGrant 
initCodeGrant(AuthorizationCodeRegistration reg, 
+ long lifetime,
+ boolean useNonce) 
{
 ServerAuthorizationCodeGrant grant = new 
ServerAuthorizationCodeGrant(reg.getClient(), lifetime);
 grant.setRedirectUri(reg.getRedirectUri());
 grant.setSubject(reg.getSubject());
@@ -59,7 +61,9 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 grant.setApprovedScopes(reg.getApprovedScope());
 grant.setAudience(reg.getAudience());
 grant.setClientCodeChallenge(reg.getClientCodeChallenge());
-grant.setNonce(reg.getNonce());
+if (useNonce) {
+grant.setNonce(reg.getNonce());
+}
 return grant;
 }
 protected abstract void saveCodeGrant(ServerAuthorizationCodeGrant grant);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8e9c9571/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index 12edf9b..f43d69e 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -79,7 +79,7 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
 }
 
 public List

buildbot failure in on cxf-site-production

2016-01-27 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/5071

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf git commit: Not persisting nonces if pre-authorized tokens are supported

2016-01-27 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master a1710bdd7 -> 72653fd11


Not persisting nonces if pre-authorized tokens are supported


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

Branch: refs/heads/master
Commit: 72653fd113c3bbe0dd543200d982792802be2ae7
Parents: a1710bd
Author: Sergey Beryozkin 
Authored: Wed Jan 27 14:05:10 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Jan 27 14:05:10 2016 +

--
 .../grants/code/AbstractCodeDataProvider.java   | 10 --
 .../code/DefaultEHCacheCodeDataProvider.java|  2 +-
 .../provider/AbstractOAuthDataProvider.java | 36 
 .../oidc/idp/IdTokenResponseFilter.java | 25 +++---
 4 files changed, 43 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/72653fd1/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
index 12fd14e..b89c247 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractCodeDataProvider.java
@@ -39,7 +39,7 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
 }
 
 public void setCodeLifetime(long codeLifetime) {
@@ -50,7 +50,9 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 removeCodeGrant(grant.getCode());
 }
 }
-public static ServerAuthorizationCodeGrant 
initCodeGrant(AuthorizationCodeRegistration reg, long lifetime) {
+public static ServerAuthorizationCodeGrant 
initCodeGrant(AuthorizationCodeRegistration reg, 
+ long lifetime,
+ boolean useNonce) 
{
 ServerAuthorizationCodeGrant grant = new 
ServerAuthorizationCodeGrant(reg.getClient(), lifetime);
 grant.setRedirectUri(reg.getRedirectUri());
 grant.setSubject(reg.getSubject());
@@ -59,7 +61,9 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 grant.setApprovedScopes(reg.getApprovedScope());
 grant.setAudience(reg.getAudience());
 grant.setClientCodeChallenge(reg.getClientCodeChallenge());
-grant.setNonce(reg.getNonce());
+if (useNonce) {
+grant.setNonce(reg.getNonce());
+}
 return grant;
 }
 protected abstract void saveCodeGrant(ServerAuthorizationCodeGrant grant);

http://git-wip-us.apache.org/repos/asf/cxf/blob/72653fd1/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index 12edf9b..f43d69e 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -79,7 +79,7 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 
 protected ServerAuthorizationCodeGrant 
doCreateCodeGrant(AuthorizationCodeRegistration reg)
 throws OAuthServiceException {
-return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime);
+return AbstractCodeDataProvider.initCodeGrant(reg, codeLifetime, 
!isSupportPreauthorizedTokens());
 }
 
 public List

buildbot success in on cxf-site-production

2016-01-27 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/5070

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

[2/2] cxf git commit: [CXF-6738] Replace synchronized blocks with DCL to reduce contention

2016-01-27 Thread asoldano 
[CXF-6738] Replace synchronized blocks with DCL to reduce contention


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

Branch: refs/heads/master
Commit: 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
Parents: 1fe6ef5
Author: Alessio Soldano 
Authored: Thu Jan 7 22:51:53 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:48:12 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 158 +++
 1 file changed, 91 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8e650cfe/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 511a26c..e3af4c9 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -194,19 +194,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
 public EffectivePolicy getEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
Conduit c, Message 
m) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(c);
-if (m != null) {
-boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(c);
+epi.initialise(ei, boi, this, assertor, true, true, m);
+if (m != null) {
+boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, true, true, m);
-effectivePolicy = epi;
 }
-return effectivePolicy;
 }
+return effectivePolicy;
 }
 
 public void setEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
@@ -220,19 +223,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
List incoming, 
 Message m) {
 if (incoming == null) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(d);
-if (m != null) {
-boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(d);
+epi.initialise(ei, boi, this, assertor, false, false, 
null);
+if (m != null) {
+boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, false, false, 
null);
-effectivePolicy = epi;
 }
-return effectivePolicy;
-} 
+}
+return effectivePolicy;
 }

[1/2] cxf git commit: [CXF-6738] Minor refactoring

2016-01-27 Thread asoldano 
Repository: cxf
Updated Branches:
  refs/heads/master 1fe6ef5fa -> a1710bdd7


[CXF-6738] Minor refactoring


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

Branch: refs/heads/master
Commit: a1710bdd783afcd667d9e72ccb031480d3806850
Parents: 8e650cf
Author: Alessio Soldano 
Authored: Tue Jan 26 23:52:22 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:48:12 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 38 ++--
 1 file changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a1710bdd/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index e3af4c9..6155a38 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -313,18 +313,7 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-synchronized (ei) {
-ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-ep = createEndpointPolicyInfo(ei, isRequestor, assertor, 
m);
-}
-}
-}
-return ep;
+return createEndpointPolicyInfo(ei, isRequestor, assertor, m);
 }
 
 public void setClientEndpointPolicy(EndpointInfo ei, EndpointPolicy ep) {
@@ -600,16 +589,27 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 return vocabulary;
 } 
 
-EndpointPolicyImpl createEndpointPolicyInfo(EndpointInfo ei, 
-boolean isRequestor, 
+EndpointPolicy createEndpointPolicyInfo(EndpointInfo ei,
+boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, isRequestor, 
assertor);
-epi.initialize(m);
-if (m != null) {
-ei.setProperty(isRequestor ? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER, epi);
+EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
+   ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+synchronized (ei) {
+ep = (EndpointPolicy)ei.getProperty(isRequestor
+? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, 
isRequestor, assertor);
+epi.initialize(m);
+if (m != null) {
+ei.setProperty(isRequestor ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER, epi);
+}
+ep = epi;
+}
+}
 }
-return epi;
+return ep;
 }

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

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

Branch: refs/heads/3.1.x-fixes
Commit: e7a75b695afd3c64e42a2dcdf26b1febfa1250a6
Parents: a0ab1ae
Author: Alessio Soldano 
Authored: Wed Jan 27 14:00:17 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 14:00:17 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/e7a75b69/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7c7ed88..f781818 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -22,5 +22,7 @@ B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
 M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
+M a1710bdd783afcd667d9e72ccb031480d3806850
 M fe89bf0fb8379428667f66312e6942e906142d6f

[1/3] cxf git commit: [CXF-6738] Replace synchronized blocks with DCL to reduce contention

2016-01-27 Thread asoldano 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 48aa8e93e -> e7a75b695


[CXF-6738] Replace synchronized blocks with DCL to reduce contention


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

Branch: refs/heads/3.1.x-fixes
Commit: 0384a69b7bc0b4846e89469f974ace534e7734d7
Parents: 48aa8e9
Author: Alessio Soldano 
Authored: Thu Jan 7 22:51:53 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:58:56 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 158 +++
 1 file changed, 91 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0384a69b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 511a26c..e3af4c9 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -194,19 +194,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
 public EffectivePolicy getEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
Conduit c, Message 
m) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(c);
-if (m != null) {
-boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(c);
+epi.initialise(ei, boi, this, assertor, true, true, m);
+if (m != null) {
+boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, true, true, m);
-effectivePolicy = epi;
 }
-return effectivePolicy;
 }
+return effectivePolicy;
 }
 
 public void setEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
@@ -220,19 +223,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
List incoming, 
 Message m) {
 if (incoming == null) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(d);
-if (m != null) {
-boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(d);
+epi.initialise(ei, boi, this, assertor, false, false, 
null);
+if (m != null) {
+boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, false, false, 
null);
-effectivePolicy = epi;
 }
-return effectivePolicy;
-

[2/3] cxf git commit: [CXF-6738] Minor refactoring

2016-01-27 Thread asoldano 
[CXF-6738] Minor refactoring


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

Branch: refs/heads/3.1.x-fixes
Commit: a0ab1ae5797eace72c563d0e2ae15d15e20d4d1f
Parents: 0384a69
Author: Alessio Soldano 
Authored: Tue Jan 26 23:52:22 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:59:07 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 38 ++--
 1 file changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a0ab1ae5/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index e3af4c9..6155a38 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -313,18 +313,7 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-synchronized (ei) {
-ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-ep = createEndpointPolicyInfo(ei, isRequestor, assertor, 
m);
-}
-}
-}
-return ep;
+return createEndpointPolicyInfo(ei, isRequestor, assertor, m);
 }
 
 public void setClientEndpointPolicy(EndpointInfo ei, EndpointPolicy ep) {
@@ -600,16 +589,27 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 return vocabulary;
 } 
 
-EndpointPolicyImpl createEndpointPolicyInfo(EndpointInfo ei, 
-boolean isRequestor, 
+EndpointPolicy createEndpointPolicyInfo(EndpointInfo ei,
+boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, isRequestor, 
assertor);
-epi.initialize(m);
-if (m != null) {
-ei.setProperty(isRequestor ? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER, epi);
+EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
+   ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+synchronized (ei) {
+ep = (EndpointPolicy)ei.getProperty(isRequestor
+? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, 
isRequestor, assertor);
+epi.initialize(m);
+if (m != null) {
+ei.setProperty(isRequestor ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER, epi);
+}
+ep = epi;
+}
+}
 }
-return epi;
+return ep;
 }