Fixing last commit
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5e113699 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5e113699 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5e113699 Branch: refs/heads/3.0.x-fixes Commit: 5e113699c052f7b9fd60be005b88b36c455c0734 Parents: 3487878 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Oct 21 15:45:41 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Oct 21 16:13:08 2015 +0100 ---------------------------------------------------------------------- .../rs/security/jose/jaxrs/AbstractJwsJsonReaderProvider.java | 2 +- .../rs/security/jose/jaxrs/AbstractJwsJsonWriterProvider.java | 2 +- .../org/apache/cxf/rs/security/jose/common/JoseConstants.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5e113699/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonReaderProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonReaderProvider.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonReaderProvider.java index 755ac2a..6243bef 100644 --- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonReaderProvider.java +++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsJsonReaderProvider.java @@ -54,7 +54,7 @@ public class AbstractJwsJsonReaderProvider { } Message m = JAXRSUtils.getCurrentMessage(); Object propLocsProp = - MessageUtils.getContextualProperty(m, JoseConstants.RSSEC_SIGNATURE_LIST_IN_PROPS, + MessageUtils.getContextualProperty(m, JoseConstants.RSSEC_SIGNATURE_IN_LIST_PROPS, JoseConstants.RSSEC_SIGNATURE_LIST_PROPS); if (propLocsProp == null) { LOG.warning("JWS JSON init properties resource is not identified"); http://git-wip-us.apache.org/repos/asf/cxf/blob/5e113699/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 f86cdc9..1d2e645 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 @@ -58,7 +58,7 @@ public class AbstractJwsJsonWriterProvider { } Message m = JAXRSUtils.getCurrentMessage(); Object propLocsProp = - MessageUtils.getContextualProperty(m, JoseConstants.RSSEC_SIGNATURE_LIST_OUT_PROPS, + MessageUtils.getContextualProperty(m, JoseConstants.RSSEC_SIGNATURE_OUT_LIST_PROPS, JoseConstants.RSSEC_SIGNATURE_LIST_PROPS); if (propLocsProp == null) { LOG.warning("JWS JSON init properties resource is not identified"); http://git-wip-us.apache.org/repos/asf/cxf/blob/5e113699/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 c29a08c..24ebc96 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 @@ -142,13 +142,13 @@ public final class JoseConstants { * The signature properties file for JSON Serialization signature creation. If not specified then it * falls back to RSSEC_SIGNATURE_LIST_PROPS. */ - public static final String RSSEC_SIGNATURE_LIST_OUT_PROPS = "rs.security.signature.list.out.properties"; + public static final String RSSEC_SIGNATURE_OUT_LIST_PROPS = "rs.security.signature.out.list.properties"; /** * The signature properties file for JSON Serialization signature verification. If not specified then it * falls back to RSSEC_SIGNATURE_LIST_PROPS. */ - public static final String RSSEC_SIGNATURE_LIST_IN_PROPS = "rs.security.signature.list.in.properties"; + public static final String RSSEC_SIGNATURE_IN_LIST_PROPS = "rs.security.signature.in.list.properties"; /** * The signature properties file for JSON Serialization signature creation/verification.
