You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/05/26 21:45:54 UTC
[26/50] [abbrv] cxf git commit: [CXF-6725] Removing deprecated JWS
JSON properties, likely never used as they were not documented
[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/5e11c6d9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5e11c6d9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5e11c6d9
Branch: refs/heads/master-jaxrs-2.1
Commit: 5e11c6d98783a2a46e54f67eebe5a1b414414073
Parents: 94b8372
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon May 23 13:34:41 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon May 23 13:34:41 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/5e11c6d9/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/5e11c6d9/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";