cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6725] Removing deprecated JWS JSON properties, likely never used as they were not documented
Date Mon, 23 May 2016 12:35:57 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e989d4fa2 -> 94d778a74


[CXF-6725] Removing deprecated JWS JSON properties, likely never used as they were not documented


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

Branch: refs/heads/3.1.x-fixes
Commit: 94d778a744f236ac7afc1720f9c6882f5bc46a60
Parents: e989d4f
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon May 23 13:34:41 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon May 23 13:35:44 2016 +0100

----------------------------------------------------------------------
 .../jaxrs/AbstractJwsJsonWriterProvider.java    |  6 -----
 .../rs/security/jose/common/JoseConstants.java  | 23 --------------------
 2 files changed, 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/94d778a7/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonWriterProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonWriterProvider.java
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonWriterProvider.java
index bae484b..0bbe04c 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonWriterProvider.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonWriterProvider.java
@@ -52,7 +52,6 @@ public class AbstractJwsJsonWriterProvider {
         this.sigProviders = signatureProviders;
     }
     
-    @SuppressWarnings("deprecation")
     protected List<JwsSignatureProvider> getInitializedSigProviders() {
         if (sigProviders != null) {
             return sigProviders;    
@@ -62,11 +61,6 @@ public class AbstractJwsJsonWriterProvider {
             MessageUtils.getContextualProperty(m, JoseConstants.RSSEC_SIGNATURE_OUT_PROPS,

                                                JoseConstants.RSSEC_SIGNATURE_PROPS);
         if (propLocsProp == null) {
-            propLocsProp = 
-                MessageUtils.getContextualProperty(m, JoseConstants.DEP_RSSEC_SIGNATURE_OUT_LIST_PROPS,

-                                               JoseConstants.DEP_RSSEC_SIGNATURE_LIST_PROPS);
-        }
-        if (propLocsProp == null) {
             LOG.warning("JWS JSON init properties resource is not identified");
             throw new JwsException(JwsException.Error.NO_INIT_PROPERTIES);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/94d778a7/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
index 7287184..0c198f7 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
@@ -161,29 +161,6 @@ public final class JoseConstants {
     public static final String RSSEC_SIGNATURE_PROPS = "rs.security.signature.properties";
     
     /**
-     * The OLD signature properties file for JSON Serialization signature creation. 
-     * If not specified then it falls back to RSSEC_SIGNATURE_LIST_PROPS.
-     * Use RSSEC_SIGNATURE_OUT_PROPS instead
-     */
-    @Deprecated
-    public static final String DEP_RSSEC_SIGNATURE_OUT_LIST_PROPS = "rs.security.signature.out.list.properties";
-    
-    /**
-     * The OLD signature properties file for JSON Serialization signature verification. 
-     * If not specified then it falls back to RSSEC_SIGNATURE_LIST_PROPS.
-     * Use RSSEC_SIGNATURE_IN_PROPS instead
-     */
-    @Deprecated
-    public static final String DEP_RSSEC_SIGNATURE_IN_LIST_PROPS = "rs.security.signature.in.list.properties";
-    
-    /**
-     * The OLD signature properties file for JSON Serialization signature creation/verification.
-     * Use RSSEC_SIGNATURE_PROPS instead
-     */
-    @Deprecated
-    public static final String DEP_RSSEC_SIGNATURE_LIST_PROPS = "rs.security.signature.list.properties";
-    
-    /**
      * Include the JWK public key for signature in the "jwk" header. 
      */
     public static final String RSSEC_SIGNATURE_INCLUDE_PUBLIC_KEY = "rs.security.signature.include.public.key";


Mime
View raw message