cxf git commit: Updating Jws/Jwe provider initialization code

2014-11-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 9dfb278c7 - efaf05170


Updating Jws/Jwe provider initialization code


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

Branch: refs/heads/master
Commit: efaf05170b4f76ad61ff423e30ece58bdd226ae5
Parents: 9dfb278
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Nov 28 12:18:28 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Nov 28 12:18:28 2014 +

--
 parent/pom.xml  |  2 +-
 .../jose/jaxrs/AbstractJweDecryptingFilter.java | 13 +--
 .../jose/jaxrs/AbstractJwsReaderProvider.java   | 15 +---
 .../jose/jaxrs/AbstractJwsWriterProvider.java   | 12 +-
 .../jose/jaxrs/JweWriterInterceptor.java| 12 +-
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 35 +
 .../cxf/rs/security/jose/jws/JwsUtils.java  | 38 ++-
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 15 ++--
 .../grants/code/JwtRequestCodeFilter.java   | 33 +---
 .../oauth2/grants/jwt/AbstractJwtHandler.java   | 17 ++---
 .../oidc/rp/AbstractTokenValidator.java | 40 ++--
 11 files changed, 148 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/efaf0517/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a9de550..d396e4c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,7 +107,7 @@
 cxf.jaxb.xjc.version2.2.10-b140310.1920/cxf.jaxb.xjc.version
 cxf.joda.time.version2.2/cxf.joda.time.version
 cxf.jdom.version1.0/cxf.jdom.version
-cxf.jettison.version1.3.6/cxf.jettison.version
+cxf.jettison.version1.3.8-SNAPSHOT/cxf.jettison.version
 cxf.jetty8.version8.1.15.v20140411/cxf.jetty8.version
 cxf.jetty9.version9.2.3.v20140905/cxf.jetty9.version
 cxf.jetty.version${cxf.jetty9.version}/cxf.jetty.version

http://git-wip-us.apache.org/repos/asf/cxf/blob/efaf0517/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
index 83e00e1..03c024e 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
@@ -22,17 +22,12 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.rs.security.jose.jwe.JweDecryptionOutput;
 import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider;
 import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwe.JweUtils;
 
 public class AbstractJweDecryptingFilter {
-private static final String RSSEC_ENCRYPTION_IN_PROPS = 
rs.security.encryption.in.properties;
-private static final String RSSEC_ENCRYPTION_PROPS = 
rs.security.encryption.properties;
 private JweDecryptionProvider decryption;
 private String defaultMediaType;
 protected JweDecryptionOutput decrypt(InputStream is) throws IOException {
@@ -52,13 +47,7 @@ public class AbstractJweDecryptingFilter {
 if (decryption != null) {
 return decryption;
 } 
-Message m = JAXRSUtils.getCurrentMessage();
-String propLoc = 
-(String)MessageUtils.getContextualProperty(m, 
RSSEC_ENCRYPTION_IN_PROPS, RSSEC_ENCRYPTION_PROPS);
-if (propLoc == null) {
-throw new SecurityException();
-}
-return JweUtils.loadDecryptionProvider(propLoc, m);
+return JweUtils.loadDecryptionProvider(true);
 }
 public String getDefaultMediaType() {
 return defaultMediaType;

http://git-wip-us.apache.org/repos/asf/cxf/blob/efaf0517/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java

cxf git commit: Updating Jws/Jwe provider initialization code

2014-11-28 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e80db09d3 - 2a6afbcbb


Updating Jws/Jwe provider initialization code


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

Branch: refs/heads/3.0.x-fixes
Commit: 2a6afbcbbd56f2b3fc79bcb68928164322eb6c1a
Parents: e80db09
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Nov 28 12:18:28 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Nov 28 12:24:08 2014 +

--
 .../jose/jaxrs/AbstractJweDecryptingFilter.java | 13 +--
 .../jose/jaxrs/AbstractJwsReaderProvider.java   | 15 +---
 .../jose/jaxrs/AbstractJwsWriterProvider.java   | 12 +-
 .../jose/jaxrs/JweWriterInterceptor.java| 12 +-
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 35 +
 .../cxf/rs/security/jose/jws/JwsUtils.java  | 38 ++-
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 15 ++--
 .../grants/code/JwtRequestCodeFilter.java   | 33 +---
 .../oauth2/grants/jwt/AbstractJwtHandler.java   | 17 ++---
 .../oidc/rp/AbstractTokenValidator.java | 40 ++--
 10 files changed, 147 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6afbcb/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
index 83e00e1..03c024e 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
@@ -22,17 +22,12 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.rs.security.jose.jwe.JweDecryptionOutput;
 import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider;
 import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwe.JweUtils;
 
 public class AbstractJweDecryptingFilter {
-private static final String RSSEC_ENCRYPTION_IN_PROPS = 
rs.security.encryption.in.properties;
-private static final String RSSEC_ENCRYPTION_PROPS = 
rs.security.encryption.properties;
 private JweDecryptionProvider decryption;
 private String defaultMediaType;
 protected JweDecryptionOutput decrypt(InputStream is) throws IOException {
@@ -52,13 +47,7 @@ public class AbstractJweDecryptingFilter {
 if (decryption != null) {
 return decryption;
 } 
-Message m = JAXRSUtils.getCurrentMessage();
-String propLoc = 
-(String)MessageUtils.getContextualProperty(m, 
RSSEC_ENCRYPTION_IN_PROPS, RSSEC_ENCRYPTION_PROPS);
-if (propLoc == null) {
-throw new SecurityException();
-}
-return JweUtils.loadDecryptionProvider(propLoc, m);
+return JweUtils.loadDecryptionProvider(true);
 }
 public String getDefaultMediaType() {
 return defaultMediaType;

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6afbcb/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java
index 6027e60..441f4bb 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java
@@ -18,16 +18,10 @@
  */
 package org.apache.cxf.rs.security.jose.jaxrs;
 
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
 import org.apache.cxf.rs.security.jose.jws.JwsUtils;
 
 public class AbstractJwsReaderProvider {
-private static final String RSSEC_SIGNATURE_IN_PROPS = 
rs.security.signature.in.properties;
-private static final String RSSEC_SIGNATURE_PROPS =