Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.7.0_80; Linux 4.2.0-34-generic)""userId" = "coheigea""ip" = "80.169.137.53"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/cxf/fediz/apache-fediz/1.3.0/apache-fediz-1.3.0.pom(SHA1: 245a37b7aeef1e7906e6e8ad1cd0cd854f4fe6c6)/org/apache/cxf/fediz/apache-fediz/1.3.0/apache-fediz-1.3.0.pom.asc(SHA1: 1bbb93727f4d273d2c2c7fc393d76245b405b3df)/org/apache/cxf/fediz/apache-fediz/1.3.0/apache-fediz-1.3.0.zip.asc(SHA1: 6767e8a6294e1cf42538f796cc3e125db305b9f4)/org/apache/cxf/fediz/apache-fediz/1.3.0/apache-fediz-1.3.0.zip(SHA1: a98fdb9eb3edaf3595dcbea2465592aec2f075b5)/org/apache/cxf/fediz/fediz-systests/1.3.0/fediz-systests-1.3.0.pom(SHA1: 9bfbc6c90f91a80608931d0647837842371c54d2)/org/apache/cxf/fediz/fediz-systests/1.3.0/fediz-systests-1.3.0.pom.asc(SHA1: 6d825750340064e67abbddcc4072939bf912d26f)/org/apache/cxf/fediz/plugin/1.3.0/plugin-1.3.0.pom.asc(SHA1: 6db29b61df27244d83d85132f04fac5bc9691a2c)/org/apache/cxf/fediz/plugin/1.3.0/plugin-1.3.0.pom(SHA1: 32a4d2bd1305eed072be0e3e8449e25995b34d58)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0-javadoc.jar.asc(SHA1: 9f3f3cd97aa8ae932b969002c1ca153394aa5dc9)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0.war.asc(SHA1: 4a97aeb206bae6a9cf3d457b7ca96f4f932fbc42)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0-sources.jar.asc(SHA1: b9af5c2a797da24db67e1dac5e32a3f2b01a229e)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0-javadoc.jar(SHA1: f5db55a5e5fd50e4f1a475f1517e445f8e2665a3)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0-sources.jar(SHA1: c263e63ec5563b3cdfbf4c67e859e035c3fd9a88)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0.pom(SHA1: c0801338985725a475676953ab5356d50eb38daa)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0.pom.asc(SHA1: eb19ab004322fa56be43c3c5be9923ad03167c66)/org/apache/cxf/fediz/fediz-oidc/1.3.0/fediz-oidc-1.3.0.war(SHA1: 710e48287fd667e2759d487573bace2436c2c2a8)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0.pom.asc(SHA1: 925ccd870ebeafff2f2647ec4f245dfcdce26b19)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0-javadoc.jar(SHA1: b5495e540478670fd59e14ac9ae98425d2016854)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0-sources.jar(SHA1: 77ca9cccf88db21b79c4bd6e9c482c2fb2e27a93)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0.pom(SHA1: c716c34398972dab2cf3aedbe546d3fdb5a5fb70)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0.war(SHA1: 5455666b393d4009e609d757e23c72bef0f93f17)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0-javadoc.jar.asc(SHA1: f5879a97b77002454b08b331285f70589f472259)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0.war.asc(SHA1: e4070a2c3d86697588556dc12a4101329ea8ae51)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/fedizservice/1.3.0/fedizservice-1.3.0-sources.jar.asc(SHA1: 90f30269a6fa1c3ba9d0b6d10b8740633984f7ad)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/1.3.0/webservice-1.3.0.pom(SHA1: ebd1731afc12fd2586cd3524dd454175f2129175)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/1.3.0/webservice-1.3.0.pom.asc(SHA1: 1ce97524663fd70e6e603f075e4d4a78d3383743)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0.pom.asc(SHA1: 687c560e5f9cd057008a71d810ffcc0d59bfb1b7)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0-javadoc.jar.asc(SHA1: 2961f3d9ace212d839fb75ea92554417dadba723)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0-sources.jar(SHA1: befdc7cc5c680280e7549997a5e1ce650813390f)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0.jar(SHA1: e48430c76da485040283661952736f6e005a79a7)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0-javadoc.jar(SHA1: 2fc4db4b66a3e68cb8277a33d11d4f6c19622243)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0.pom(SHA1: 373506eee6b43dac9c51113e0b5d615adce2fcbe)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0-sources.jar.asc(SHA1: 0d61fb5d784a3ca20f11b1f494a94da90d9ca550)/org/apache/cxf/fediz/examples/wsclientWebapp/webservice/common/1.3.0/common-1.3.0.jar.asc(SHA1: eea01022a72bac003125fbffc16ca4037ee03b44)/org/apache/cxf/fediz/examples/wsclientWebapp/1.3.0/wsclientWebapp-1.3.0.pom(SHA1: e50a1a3479073b31e7dae1cb385ab63e60894ae7)/org/apache/cxf/fediz/examples/wsclientWebapp/1.3.0/wsclientWebapp-1.3.0.pom.asc(SHA1: 

[1/2] cxf-fediz git commit: Create a SAML Response on an error

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master a1fba8d71 -> 9da48791d


Create a SAML Response on an error


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

Branch: refs/heads/master
Commit: 9da48791d6d31366052518c9c6ccd25bdf82a4ca
Parents: c564a8b
Author: Colm O hEigeartaigh 
Authored: Wed Mar 30 17:14:51 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 30 17:43:11 2016 +0100

--
 .../beans/samlsso/AuthnRequestValidator.java|   2 +-
 .../idp/beans/samlsso/SamlResponseCreator.java  |   1 -
 .../beans/samlsso/SamlResponseErrorCreator.java |  97 ++
 .../WEB-INF/flows/saml-signin-request.xml   |  13 +-
 .../WEB-INF/flows/saml-validate-request.xml |  19 +-
 .../apache/cxf/fediz/systests/idp/IdpTest.java  | 183 +--
 6 files changed, 202 insertions(+), 113 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9da48791/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
index cb90ed0..80f4d0c 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
@@ -152,7 +152,7 @@ public class AuthnRequestValidator {
 LOG.debug("Validating destination: {}", destination);
 
 String localAddr = 
WebUtils.getHttpServletRequest(context).getRequestURL().toString();
-if (!localAddr.startsWith(destination)) {
+if (destination == null || !localAddr.startsWith(destination)) {
 LOG.debug("The destination {} does not match the local address 
{}", destination, localAddr);
 throw new ProcessingException(TYPE.BAD_REQUEST);
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9da48791/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
index c0c0d22..a9aadf5 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
@@ -89,7 +89,6 @@ public class SamlResponseCreator {
 Element response = createResponse(idp, requestId, saml2Assertion);
 return encodeResponse(response);
 } catch (Exception ex) {
-ex.printStackTrace();
 LOG.warn("Error marshalling SAML Token: {}", ex.getMessage());
 throw new ProcessingException(TYPE.BAD_REQUEST);
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9da48791/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseErrorCreator.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseErrorCreator.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseErrorCreator.java
new file mode 100644
index 000..24b21f4
--- /dev/null
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseErrorCreator.java
@@ -0,0 +1,97 @@
+/**
+ * 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 

[2/2] cxf-fediz git commit: Check SAML Subject of AuthnRequest

[coheigea]

Check SAML Subject of AuthnRequest


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

Branch: refs/heads/master
Commit: c564a8b8f16134a83ae4eb02e7f1fc1b3714d1c1
Parents: a1fba8d
Author: Colm O hEigeartaigh 
Authored: Wed Mar 30 14:00:59 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 30 17:43:11 2016 +0100

--
 .../beans/samlsso/AuthnRequestValidator.java| 39 ++--
 .../idp/beans/samlsso/SamlResponseCreator.java  | 22 ++-
 2 files changed, 47 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c564a8b8/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
index 6a892a9..cb90ed0 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestValidator.java
@@ -72,6 +72,33 @@ public class AuthnRequestValidator {
 throws Exception {
 AuthnRequest authnRequest = 
 (AuthnRequest)WebUtils.getAttributeFromFlowScope(context, 
IdpConstants.SAML_AUTHN_REQUEST);
+
+validateSignature(context, authnRequest, idp, signature, relayState, 
samlRequest, realm);
+
+if (authnRequest.getIssuer() == null) {
+LOG.debug("No Issuer is present in the AuthnRequest");
+throw new ProcessingException(TYPE.BAD_REQUEST);
+}
+
+String format = authnRequest.getIssuer().getFormat();
+if (format != null
+&& 
!"urn:oasis:names:tc:SAML:2.0:nameid-format:entity".equals(format)) {
+LOG.debug("An invalid Format attribute was received: {}", format);
+throw new ProcessingException(TYPE.BAD_REQUEST);
+}
+
+// No SubjectConfirmation Elements are allowed
+if (authnRequest.getSubject() != null 
+&& authnRequest.getSubject().getSubjectConfirmations() != null
+&& !authnRequest.getSubject().getSubjectConfirmations().isEmpty()) 
{
+LOG.debug("An invalid SubjectConfirmation Element was received");
+throw new ProcessingException(TYPE.BAD_REQUEST);
+}
+}
+
+private void validateSignature(RequestContext context, AuthnRequest 
authnRequest, Idp idp, 
+   String signature, String relayState, String 
samlRequest, 
+   String realm) throws Exception {
 if (authnRequest.isSigned()) {
 // Check destination
 checkDestination(context, authnRequest);
@@ -106,18 +133,6 @@ public class AuthnRequestValidator {
 LOG.debug("No signature is present, therefore the request is 
rejected");
 throw new ProcessingException(TYPE.BAD_REQUEST);
 }
-
-if (authnRequest.getIssuer() == null) {
-LOG.debug("No Issuer is present in the AuthnRequest");
-throw new ProcessingException(TYPE.BAD_REQUEST);
-}
-
-String format = authnRequest.getIssuer().getFormat();
-if (format != null
-&& 
!"urn:oasis:names:tc:SAML:2.0:nameid-format:entity".equals(format)) {
-LOG.debug("An invalid Format attribute was received: {}", format);
-throw new ProcessingException(TYPE.BAD_REQUEST);
-}
 }
 
 private X509Certificate getValidatingCertificate(Idp idp, String realm) 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c564a8b8/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
index 9ba1167..c0c0d22 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/SamlResponseCreator.java
@@ -29,6 +29,7 @@ import org.apache.cxf.common.util.Base64Utility;
 import 

cxf-fediz git commit: Setting CXF version to 3.1.7-SNAPSHOT for Fediz 1.3.1-SNAPSHOT

[sergeyb]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 62bb88811 -> a1fba8d71


Setting CXF version to 3.1.7-SNAPSHOT for Fediz 1.3.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: a1fba8d7149b7afcd9c8f5937048bccf481614cc
Parents: 62bb888
Author: Sergey Beryozkin 
Authored: Wed Mar 30 17:19:36 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 17:19:36 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a1fba8d7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1c79233..ddb5da8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 1.2
 2.4
 1.5.0
-3.1.6
+3.1.7-SNAPSHOT
 3.2.0
 3.4
 4.4.2

cxf git commit: Pushing some of the code to AbstractOAuthProvider

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3a02b272b -> db8fca38f


Pushing some of the code to AbstractOAuthProvider


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

Branch: refs/heads/3.1.x-fixes
Commit: db8fca38f64cae8cdfc846774db6625cec5d387c
Parents: 3a02b27
Author: Sergey Beryozkin 
Authored: Wed Mar 30 17:14:19 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 17:15:45 2016 +0100

--
 .../grants/code/AbstractCodeDataProvider.java   |  9 
 .../code/DefaultEHCacheCodeDataProvider.java| 11 ++---
 .../provider/AbstractOAuthDataProvider.java | 45 +--
 .../DefaultEHCacheOAuthDataProvider.java| 47 +++-
 .../DefaultEncryptingOAuthDataProvider.java | 37 +++
 5 files changed, 68 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/db8fca38/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 f41e172..9b5c3df 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
@@ -19,6 +19,7 @@
 package org.apache.cxf.rs.security.oauth2.grants.code;
 
 import org.apache.cxf.rs.security.oauth2.common.Client;
+import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 import org.apache.cxf.rs.security.oauth2.provider.AbstractOAuthDataProvider;
 import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
 
@@ -65,4 +66,12 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 return grant;
 }
 protected abstract void saveCodeGrant(ServerAuthorizationCodeGrant grant);
+
+public static boolean isCodeMatched(ServerAuthorizationCodeGrant grant, 
Client c, UserSubject sub) {
+if (c == null || 
grant.getClient().getClientId().equals(c.getClientId())) {
+UserSubject grantSub = grant.getSubject();
+return sub == null || grantSub != null && 
grantSub.getLogin().equals(sub.getLogin());
+}
+return false;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/db8fca38/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..4d0155d 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
@@ -58,9 +58,9 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 }
 
 @Override
-protected Client doRemoveClient(Client c) {
+protected void doRemoveClient(Client c) {
 removeClientCodeGrants(c);
-return super.doRemoveClient(c);
+super.doRemoveClient(c);
 }
 
 protected void removeClientCodeGrants(Client c) {
@@ -88,11 +88,8 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 new ArrayList(keys.size());
 for (String key : keys) {
 ServerAuthorizationCodeGrant grant = getCodeGrant(key);
-if (c == null || 
grant.getClient().getClientId().equals(c.getClientId())) {
-UserSubject grantSub = grant.getSubject();
-if (sub == null || grantSub != null && 
grantSub.getLogin().equals(sub.getLogin())) {
-grants.add(grant);
-}
+if (AbstractCodeDataProvider.isCodeMatched(grant, c, sub)) {
+grants.add(grant);
 }
 }
 return grants;

cxf git commit: Pushing some of the code to AbstractOAuthProvider

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master ebce4a65b -> 76d474cd0


Pushing some of the code to AbstractOAuthProvider


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

Branch: refs/heads/master
Commit: 76d474cd081a72a8647c0bcddcaa27b11890f619
Parents: ebce4a6
Author: Sergey Beryozkin 
Authored: Wed Mar 30 17:14:19 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 17:14:19 2016 +0100

--
 .../grants/code/AbstractCodeDataProvider.java   |  9 
 .../code/DefaultEHCacheCodeDataProvider.java| 11 ++---
 .../provider/AbstractOAuthDataProvider.java | 45 +--
 .../DefaultEHCacheOAuthDataProvider.java| 47 +++-
 .../DefaultEncryptingOAuthDataProvider.java | 37 +++
 5 files changed, 68 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/76d474cd/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 f41e172..9b5c3df 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
@@ -19,6 +19,7 @@
 package org.apache.cxf.rs.security.oauth2.grants.code;
 
 import org.apache.cxf.rs.security.oauth2.common.Client;
+import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 import org.apache.cxf.rs.security.oauth2.provider.AbstractOAuthDataProvider;
 import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
 
@@ -65,4 +66,12 @@ public abstract class AbstractCodeDataProvider extends 
AbstractOAuthDataProvider
 return grant;
 }
 protected abstract void saveCodeGrant(ServerAuthorizationCodeGrant grant);
+
+public static boolean isCodeMatched(ServerAuthorizationCodeGrant grant, 
Client c, UserSubject sub) {
+if (c == null || 
grant.getClient().getClientId().equals(c.getClientId())) {
+UserSubject grantSub = grant.getSubject();
+return sub == null || grantSub != null && 
grantSub.getLogin().equals(sub.getLogin());
+}
+return false;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/76d474cd/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..4d0155d 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
@@ -58,9 +58,9 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 }
 
 @Override
-protected Client doRemoveClient(Client c) {
+protected void doRemoveClient(Client c) {
 removeClientCodeGrants(c);
-return super.doRemoveClient(c);
+super.doRemoveClient(c);
 }
 
 protected void removeClientCodeGrants(Client c) {
@@ -88,11 +88,8 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 new ArrayList(keys.size());
 for (String key : keys) {
 ServerAuthorizationCodeGrant grant = getCodeGrant(key);
-if (c == null || 
grant.getClient().getClientId().equals(c.getClientId())) {
-UserSubject grantSub = grant.getSubject();
-if (sub == null || grantSub != null && 
grantSub.getLogin().equals(sub.getLogin())) {
-grants.add(grant);
-}
+if (AbstractCodeDataProvider.isCodeMatched(grant, c, sub)) {
+grants.add(grant);
 }
 }
 return grants;

cxf git commit: use jetty9 in samples/jax_rs/websocket by default

[ay]

Repository: cxf
Updated Branches:
  refs/heads/master d226c07d4 -> ebce4a65b


use jetty9 in samples/jax_rs/websocket by default


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

Branch: refs/heads/master
Commit: ebce4a65b15a1a99f18c1ea0111affafc447ce7e
Parents: d226c07
Author: Akitoshi Yoshida 
Authored: Wed Mar 30 17:11:34 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Mar 30 17:11:43 2016 +0200

--
 .../src/main/release/samples/jax_rs/websocket/pom.xml| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ebce4a65/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index 12701f2..b894cff 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -41,11 +41,6 @@
 
 
 jetty8
-
-
-!jetty9
-
-
 
 ${cxf.jetty8.version}
 
@@ -60,6 +55,12 @@
 
 
 jetty9
+
+
+
+!jetty8
+
+
 
 ${cxf.jetty9.version}
 

cxf git commit: forgot to sync atmosphere's version in samples

[ay]

Repository: cxf
Updated Branches:
  refs/heads/master e4de8e215 -> d226c07d4


forgot to sync atmosphere's version in samples


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

Branch: refs/heads/master
Commit: d226c07d4db15fa9244a2f011df801839a880f68
Parents: e4de8e2
Author: Akitoshi Yoshida 
Authored: Wed Mar 30 16:38:10 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Mar 30 16:39:39 2016 +0200

--
 distribution/src/main/release/samples/jax_rs/websocket/pom.xml | 2 +-
 distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml | 2 +-
 distribution/src/main/release/samples/pom.xml  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d226c07d/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index 9b79c2c..12701f2 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -32,7 +32,7 @@
 ${project.version}
 
 1.8.5
-2.3.7
+2.4.3
 8.1.15.v20140411
 9.2.2.v20140723
 ${cxf.jetty8.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/d226c07d/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 9fed27a..49c4540 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -32,7 +32,7 @@
 
 ${project.version}
 
-2.3.7
+2.4.3
 9.2.15.v20160210
 9.3.5.v20151012
 ${cxf.jetty93.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/d226c07d/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 393fae2..d7c5587 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -51,6 +51,7 @@
 jax_rs/basic_https
 jax_rs/basic
 jax_rs/websocket
+jax_rs/websocket_web
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2

cxf git commit: [CXF-6842] Minor update to make sure the response Content-Type is set on the exchange

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes af1c18b5a -> c95694abb


[CXF-6842] Minor update to make sure the response Content-Type is set on the 
exchange


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

Branch: refs/heads/3.0.x-fixes
Commit: c95694abb7f2bf23fcac639b4f45688c191db34b
Parents: af1c18b
Author: Sergey Beryozkin 
Authored: Sat Mar 26 13:14:23 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 15:23:59 2016 +0100

--
 .../src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c95694ab/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
index ea24b37..dc97213 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
@@ -99,7 +99,7 @@ public final class ExceptionUtils {
 Throwable unwrappedException = ex.getCause();
 if (unwrappedException instanceof WebApplicationException) {
 WebApplicationException webEx = 
(WebApplicationException)unwrappedException;
-return webEx.getResponse();
+response = webEx.getResponse();
 }
 }
 JAXRSUtils.setMessageContentType(currentMessage, response);

cxf git commit: [CXF-6853] Reverting HttpUtils change, adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes fd33546e4 -> af1c18b5a


[CXF-6853] Reverting HttpUtils change, adding a test


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

Branch: refs/heads/3.0.x-fixes
Commit: af1c18b5af0dec0743a3f98292bcf0edbc753a88
Parents: fd33546
Author: Sergey Beryozkin 
Authored: Wed Mar 30 15:16:09 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 15:23:02 2016 +0100

--
 .../main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java   | 10 --
 .../org/apache/cxf/systest/jaxrs/BookApplication2.java|  2 +-
 .../org/apache/cxf/systest/jaxrs/BookStorePerRequest.java |  6 ++
 .../systest/jaxrs/JAXRSClientServerNonSpringBookTest.java |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/af1c18b5/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 0fedc24..61664b4 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -22,7 +22,6 @@ package org.apache.cxf.jaxrs.utils;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -499,15 +498,6 @@ public final class HttpUtils {
 public static String getPathToMatch(String path, String address, boolean 
addSlash) {
 
 int ind = path.indexOf(address);
-try {
-String decodeAddr = URLDecoder.decode(address, "UTF-8");
-if (ind == -1 && !address.equals(decodeAddr)) {
-address = decodeAddr;
-ind = path.indexOf(address);
-}
-} catch (UnsupportedEncodingException e) {
-//
-}
 if (ind == -1 && address.equals(path + "/")) {
 path += "/";
 ind = 0;

http://git-wip-us.apache.org/repos/asf/cxf/blob/af1c18b5/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
index c89bed2..b424f7d 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletContext;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Context;
 
-@ApplicationPath("/thebooks2")
+@ApplicationPath("/the%20books2")
 public class BookApplication2 extends BookApplication {
 public BookApplication2(@Context ServletContext sc) {
 super(sc);

http://git-wip-us.apache.org/repos/asf/cxf/blob/af1c18b5/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
index c524b81..1b42dd5 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
@@ -82,6 +82,12 @@ public class BookStorePerRequest {
 }
 
 @GET
+@Path("/book%20headers/")
+public Book getBookByHeader2() throws Exception {
+return getBookByHeader();
+}
+
+@GET
 @Path("/bookheaders/")
 public Book getBookByHeader() throws Exception {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/af1c18b5/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
index b8b3ec9..75e966e 100644
--- 

cxf git commit: [CXF-6842] Minor update to make sure the response Content-Type is set on the exchange

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 789e12c7f -> 3a02b272b


[CXF-6842] Minor update to make sure the response Content-Type is set on the 
exchange


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

Branch: refs/heads/3.1.x-fixes
Commit: 3a02b272b9398c8ab34d41e1863815c4213fd9e2
Parents: 789e12c
Author: Sergey Beryozkin 
Authored: Sat Mar 26 13:14:23 2016 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 15:20:02 2016 +0100

--
 .../src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3a02b272/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
index 71cad74..c70af20 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
@@ -95,7 +95,7 @@ public final class ExceptionUtils {
 Throwable unwrappedException = ex.getCause();
 if (unwrappedException instanceof WebApplicationException) {
 WebApplicationException webEx = 
(WebApplicationException)unwrappedException;
-return webEx.getResponse();
+response = webEx.getResponse();
 }
 }
 JAXRSUtils.setMessageContentType(currentMessage, response);

cxf git commit: [CXF-6853] Reverting HttpUtils change, adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 49ba8067e -> 789e12c7f


[CXF-6853] Reverting HttpUtils change, adding a test


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

Branch: refs/heads/3.1.x-fixes
Commit: 789e12c7fbdcb97dc7ff6be8426f08ecc4948a68
Parents: 49ba806
Author: Sergey Beryozkin 
Authored: Wed Mar 30 15:16:09 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 15:18:13 2016 +0100

--
 .../main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java   | 10 --
 .../org/apache/cxf/systest/jaxrs/BookApplication2.java|  2 +-
 .../org/apache/cxf/systest/jaxrs/BookStorePerRequest.java |  6 ++
 .../systest/jaxrs/JAXRSClientServerNonSpringBookTest.java |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/789e12c7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 05b3538..e945943 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -22,7 +22,6 @@ package org.apache.cxf.jaxrs.utils;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -500,15 +499,6 @@ public final class HttpUtils {
 public static String getPathToMatch(String path, String address, boolean 
addSlash) {
 
 int ind = path.indexOf(address);
-try {
-String decodeAddr = URLDecoder.decode(address, "UTF-8");
-if (ind == -1 && !address.equals(decodeAddr)) {
-address = decodeAddr;
-ind = path.indexOf(address);
-}
-} catch (UnsupportedEncodingException e) {
-//
-}
 if (ind == -1 && address.equals(path + "/")) {
 path += "/";
 ind = 0;

http://git-wip-us.apache.org/repos/asf/cxf/blob/789e12c7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
index c89bed2..b424f7d 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletContext;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Context;
 
-@ApplicationPath("/thebooks2")
+@ApplicationPath("/the%20books2")
 public class BookApplication2 extends BookApplication {
 public BookApplication2(@Context ServletContext sc) {
 super(sc);

http://git-wip-us.apache.org/repos/asf/cxf/blob/789e12c7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
index c524b81..1b42dd5 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
@@ -82,6 +82,12 @@ public class BookStorePerRequest {
 }
 
 @GET
+@Path("/book%20headers/")
+public Book getBookByHeader2() throws Exception {
+return getBookByHeader();
+}
+
+@GET
 @Path("/bookheaders/")
 public Book getBookByHeader() throws Exception {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/789e12c7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
index b8b3ec9..75e966e 100644
--- 

cxf git commit: [CXF-6853] Reverting HttpUtils change, adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 30158d39a -> e4de8e215


[CXF-6853] Reverting HttpUtils change, adding a test


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

Branch: refs/heads/master
Commit: e4de8e215d4be63cb54a591eed0e457674fd31d3
Parents: 30158d3
Author: Sergey Beryozkin 
Authored: Wed Mar 30 15:16:09 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Mar 30 15:16:09 2016 +0100

--
 .../main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java   | 10 --
 .../org/apache/cxf/systest/jaxrs/BookApplication2.java|  2 +-
 .../org/apache/cxf/systest/jaxrs/BookStorePerRequest.java |  6 ++
 .../systest/jaxrs/JAXRSClientServerNonSpringBookTest.java |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e4de8e21/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 05b3538..e945943 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -22,7 +22,6 @@ package org.apache.cxf.jaxrs.utils;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -500,15 +499,6 @@ public final class HttpUtils {
 public static String getPathToMatch(String path, String address, boolean 
addSlash) {
 
 int ind = path.indexOf(address);
-try {
-String decodeAddr = URLDecoder.decode(address, "UTF-8");
-if (ind == -1 && !address.equals(decodeAddr)) {
-address = decodeAddr;
-ind = path.indexOf(address);
-}
-} catch (UnsupportedEncodingException e) {
-//
-}
 if (ind == -1 && address.equals(path + "/")) {
 path += "/";
 ind = 0;

http://git-wip-us.apache.org/repos/asf/cxf/blob/e4de8e21/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
index c89bed2..b424f7d 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletContext;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Context;
 
-@ApplicationPath("/thebooks2")
+@ApplicationPath("/the%20books2")
 public class BookApplication2 extends BookApplication {
 public BookApplication2(@Context ServletContext sc) {
 super(sc);

http://git-wip-us.apache.org/repos/asf/cxf/blob/e4de8e21/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
index c524b81..1b42dd5 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java
@@ -82,6 +82,12 @@ public class BookStorePerRequest {
 }
 
 @GET
+@Path("/book%20headers/")
+public Book getBookByHeader2() throws Exception {
+return getBookByHeader();
+}
+
+@GET
 @Path("/bookheaders/")
 public Book getBookByHeader() throws Exception {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e4de8e21/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
index b8b3ec9..75e966e 100644
--- 

cxf git commit: [CXF-6853]:Support encoded value in @ApplicationPath

[ema]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes af303b6ee -> fd33546e4


[CXF-6853]:Support encoded value in @ApplicationPath


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

Branch: refs/heads/3.0.x-fixes
Commit: fd33546e44aa148f77b88094d8dfafdbe3640f9c
Parents: af303b6
Author: Jim Ma 
Authored: Wed Mar 30 20:57:24 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 21:07:56 2016 +0800

--
 .../main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java   | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fd33546e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 61664b4..0fedc24 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -22,6 +22,7 @@ package org.apache.cxf.jaxrs.utils;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -498,6 +499,15 @@ public final class HttpUtils {
 public static String getPathToMatch(String path, String address, boolean 
addSlash) {
 
 int ind = path.indexOf(address);
+try {
+String decodeAddr = URLDecoder.decode(address, "UTF-8");
+if (ind == -1 && !address.equals(decodeAddr)) {
+address = decodeAddr;
+ind = path.indexOf(address);
+}
+} catch (UnsupportedEncodingException e) {
+//
+}
 if (ind == -1 && address.equals(path + "/")) {
 path += "/";
 ind = 0;

cxf git commit: [CXF-6853]:Support encoded value in @ApplicationPath

[ema]

Repository: cxf
Updated Branches:
  refs/heads/master 444b61678 -> 30158d39a


[CXF-6853]:Support encoded value in @ApplicationPath


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

Branch: refs/heads/master
Commit: 30158d39a699d01f9d7344dd9cd15dd98e683bc5
Parents: 444b616
Author: Jim Ma 
Authored: Wed Mar 30 20:57:24 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 20:57:24 2016 +0800

--
 .../main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java   | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/30158d39/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index e945943..05b3538 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -22,6 +22,7 @@ package org.apache.cxf.jaxrs.utils;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -499,6 +500,15 @@ public final class HttpUtils {
 public static String getPathToMatch(String path, String address, boolean 
addSlash) {
 
 int ind = path.indexOf(address);
+try {
+String decodeAddr = URLDecoder.decode(address, "UTF-8");
+if (ind == -1 && !address.equals(decodeAddr)) {
+address = decodeAddr;
+ind = path.indexOf(address);
+}
+} catch (UnsupportedEncodingException e) {
+//
+}
 if (ind == -1 && address.equals(path + "/")) {
 path += "/";
 ind = 0;

cxf git commit: [CXF-6853]:Support encoded value in @ApplicationPath

[ema]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 659084236 -> 49ba8067e


[CXF-6853]:Support encoded value in @ApplicationPath


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

Branch: refs/heads/3.1.x-fixes
Commit: 49ba8067e9d735c48603e74cccfbcc6cdf3676f7
Parents: 6590842
Author: Jim Ma 
Authored: Wed Mar 30 20:57:24 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 20:58:16 2016 +0800

--
 .../main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java   | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/49ba8067/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index e945943..05b3538 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -22,6 +22,7 @@ package org.apache.cxf.jaxrs.utils;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -499,6 +500,15 @@ public final class HttpUtils {
 public static String getPathToMatch(String path, String address, boolean 
addSlash) {
 
 int ind = path.indexOf(address);
+try {
+String decodeAddr = URLDecoder.decode(address, "UTF-8");
+if (ind == -1 && !address.equals(decodeAddr)) {
+address = decodeAddr;
+ind = path.indexOf(address);
+}
+} catch (UnsupportedEncodingException e) {
+//
+}
 if (ind == -1 && address.equals(path + "/")) {
 path += "/";
 ind = 0;

[3/3] cxf git commit: Minor update to fix checkstyle

[ema]

Minor update to fix checkstyle


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

Branch: refs/heads/3.0.x-fixes
Commit: af303b6eee2ad649cebe573dacd3d272e06f08db
Parents: f31216d
Author: Jim Ma 
Authored: Wed Mar 30 15:48:32 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 20:16:55 2016 +0800

--
 .../jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/af303b6e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index e5ee091..0914854 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -90,7 +90,7 @@ public class RequestImpl implements Request {
 }
 
 boolean encMatched = acceptEncs.isEmpty() || enc == null 
-|| isEncMatached(acceptEncs, enc);;
+|| isEncMatached(acceptEncs, enc);
 if (encMatched) {
 handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
 }

[2/3] cxf git commit: [CXF-6850]:javax.ws.rs.core.Request implementation doesn't match Accept-Encoding: * for any encoding value

[ema]

[CXF-6850]:javax.ws.rs.core.Request implementation doesn't match 
Accept-Encoding: * for any encoding value


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

Branch: refs/heads/3.0.x-fixes
Commit: f31216db250e42bd1d37f0d3f7c6560388a90afa
Parents: 4f027a0
Author: Jim Ma 
Authored: Wed Mar 30 15:42:13 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 20:16:43 2016 +0800

--
 .../java/org/apache/cxf/jaxrs/impl/RequestImpl.java   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f31216db/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index a728caf..e5ee091 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -90,7 +90,7 @@ public class RequestImpl implements Request {
 }
 
 boolean encMatched = acceptEncs.isEmpty() || enc == null 
-|| acceptEncs.contains(enc);
+|| isEncMatached(acceptEncs, enc);;
 if (encMatched) {
 handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
 }
@@ -148,6 +148,18 @@ public class RequestImpl implements Request {
 return false;
 }
 
+private static boolean isEncMatached(List accepts, String enc) {
+if (accepts.contains(enc)) {
+return true;
+}
+for (String accept : accepts) {
+if ("*".equals(accept)) {
+return true;
+}
+}
+return false;
+}
+
 private static List parseAcceptEnc(String acceptEnc) {
 if (StringUtils.isEmpty(acceptEnc)) {
 return Collections.emptyList();

[1/3] cxf git commit: [CXF-6842]:Unwrap exception nested with WebApplicationException

[ema]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ca618c41b -> af303b6ee


[CXF-6842]:Unwrap exception nested with WebApplicationException


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

Branch: refs/heads/3.0.x-fixes
Commit: 4f027a0a9521674ef22e3f06dc91b1d49c50e8ee
Parents: ca618c4
Author: Jim Ma 
Authored: Fri Mar 25 13:02:35 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 20:16:30 2016 +0800

--
 .../main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4f027a0a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
index 20977ee..ea24b37 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
@@ -95,6 +95,13 @@ public final class ExceptionUtils {
 }
 }
 }
+if (response == null) {
+Throwable unwrappedException = ex.getCause();
+if (unwrappedException instanceof WebApplicationException) {
+WebApplicationException webEx = 
(WebApplicationException)unwrappedException;
+return webEx.getResponse();
+}
+}
 JAXRSUtils.setMessageContentType(currentMessage, response);
 return response;
 }

[3/3] cxf git commit: Minor update to fix checkstyle

[ema]

Minor update to fix checkstyle


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

Branch: refs/heads/3.1.x-fixes
Commit: 65908423617bc39d7b4b4212a83e16e2f8f50253
Parents: f9a36aa
Author: Jim Ma 
Authored: Wed Mar 30 15:48:32 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 20:01:06 2016 +0800

--
 .../jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/65908423/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index e5ee091..0914854 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -90,7 +90,7 @@ public class RequestImpl implements Request {
 }
 
 boolean encMatched = acceptEncs.isEmpty() || enc == null 
-|| isEncMatached(acceptEncs, enc);;
+|| isEncMatached(acceptEncs, enc);
 if (encMatched) {
 handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
 }

[2/3] cxf git commit: [CXF-6850]:javax.ws.rs.core.Request implementation doesn't match Accept-Encoding: * for any encoding value

[ema]

[CXF-6850]:javax.ws.rs.core.Request implementation doesn't match 
Accept-Encoding: * for any encoding value


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

Branch: refs/heads/3.1.x-fixes
Commit: f9a36aa808d0908aee41890c2a21c26106cc9ac5
Parents: b133237
Author: Jim Ma 
Authored: Wed Mar 30 15:42:13 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 20:00:53 2016 +0800

--
 .../java/org/apache/cxf/jaxrs/impl/RequestImpl.java   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f9a36aa8/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index a728caf..e5ee091 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -90,7 +90,7 @@ public class RequestImpl implements Request {
 }
 
 boolean encMatched = acceptEncs.isEmpty() || enc == null 
-|| acceptEncs.contains(enc);
+|| isEncMatached(acceptEncs, enc);;
 if (encMatched) {
 handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
 }
@@ -148,6 +148,18 @@ public class RequestImpl implements Request {
 return false;
 }
 
+private static boolean isEncMatached(List accepts, String enc) {
+if (accepts.contains(enc)) {
+return true;
+}
+for (String accept : accepts) {
+if ("*".equals(accept)) {
+return true;
+}
+}
+return false;
+}
+
 private static List parseAcceptEnc(String acceptEnc) {
 if (StringUtils.isEmpty(acceptEnc)) {
 return Collections.emptyList();

[1/3] cxf git commit: [CXF-6842]:Unwrap exception nested with WebApplicationException

[ema]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e7e710685 -> 659084236


[CXF-6842]:Unwrap exception nested with WebApplicationException


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

Branch: refs/heads/3.1.x-fixes
Commit: b133237f0f092351b9fcdba4019ab64d77d0111b
Parents: e7e7106
Author: Jim Ma 
Authored: Fri Mar 25 13:02:35 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 19:57:14 2016 +0800

--
 .../main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b133237f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
index 5e9c257..71cad74 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ExceptionUtils.java
@@ -91,6 +91,13 @@ public final class ExceptionUtils {
 }
 }
 }
+if (response == null) {
+Throwable unwrappedException = ex.getCause();
+if (unwrappedException instanceof WebApplicationException) {
+WebApplicationException webEx = 
(WebApplicationException)unwrappedException;
+return webEx.getResponse();
+}
+}
 JAXRSUtils.setMessageContentType(currentMessage, response);
 return response;
 }

cxf git commit: Minor update to fix checkstyle

[ema]

Repository: cxf
Updated Branches:
  refs/heads/master 84e775b19 -> 444b61678


Minor update to fix checkstyle


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

Branch: refs/heads/master
Commit: 444b61678c4b7006febca511a81415965c8fc53c
Parents: 84e775b
Author: Jim Ma 
Authored: Wed Mar 30 15:48:32 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 15:48:32 2016 +0800

--
 .../jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/444b6167/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index e5ee091..0914854 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -90,7 +90,7 @@ public class RequestImpl implements Request {
 }
 
 boolean encMatched = acceptEncs.isEmpty() || enc == null 
-|| isEncMatached(acceptEncs, enc);;
+|| isEncMatached(acceptEncs, enc);
 if (encMatched) {
 handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
 }

cxf git commit: [CXF-6850]:javax.ws.rs.core.Request implementation doesn't match Accept-Encoding: * for any encoding value

[ema]

Repository: cxf
Updated Branches:
  refs/heads/master 1afeea8bd -> 84e775b19


[CXF-6850]:javax.ws.rs.core.Request implementation doesn't match 
Accept-Encoding: * for any encoding value


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

Branch: refs/heads/master
Commit: 84e775b1961577f6e2470dda19a03a49eabb4ac0
Parents: 1afeea8
Author: Jim Ma 
Authored: Wed Mar 30 15:42:13 2016 +0800
Committer: Jim Ma 
Committed: Wed Mar 30 15:42:21 2016 +0800

--
 .../java/org/apache/cxf/jaxrs/impl/RequestImpl.java   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/84e775b1/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index a728caf..e5ee091 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -90,7 +90,7 @@ public class RequestImpl implements Request {
 }
 
 boolean encMatched = acceptEncs.isEmpty() || enc == null 
-|| acceptEncs.contains(enc);
+|| isEncMatached(acceptEncs, enc);;
 if (encMatched) {
 handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
 }
@@ -148,6 +148,18 @@ public class RequestImpl implements Request {
 return false;
 }
 
+private static boolean isEncMatached(List accepts, String enc) {
+if (accepts.contains(enc)) {
+return true;
+}
+for (String accept : accepts) {
+if ("*".equals(accept)) {
+return true;
+}
+}
+return false;
+}
+
 private static List parseAcceptEnc(String acceptEnc) {
 if (StringUtils.isEmpty(acceptEnc)) {
 return Collections.emptyList();