cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/6] cxf git commit: Minor doc update
Date Mon, 26 Oct 2015 17:09:10 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d435640fd -> ecb9139d1


Minor doc update


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

Branch: refs/heads/3.0.x-fixes
Commit: 65c9136f5c8eeb87853f1cf38483b2b920ce3f64
Parents: d435640
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Oct 26 14:31:59 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Oct 26 17:08:43 2015 +0000

----------------------------------------------------------------------
 .../cxf/rs/security/jose/common/JoseConstants.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/65c9136f/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 b05fdd6..66c86d9 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
@@ -187,22 +187,26 @@ public final class JoseConstants {
     public static final String RSSEC_SIGNATURE_LIST_PROPS = "rs.security.signature.list.properties";
     
     /**
-     * Include the JWK public key for signature in the "jwk" header.
+     * Include the JWK public key for signature in the "jwk" header. If not configured then
it
+     * falls back to RSSEC_INCLUDE_PUBLIC_KEY.
      */
     public static final String RSSEC_SIGNATURE_INCLUDE_PUBLIC_KEY = "rs.security.signature.include.public.key";
     
     /**
-     * Include the X.509 certificate for signature in the "x5c" header.
+     * Include the X.509 certificate for signature in the "x5c" header. If not configured
then it
+     * falls back to RSSEC_INCLUDE_CERT.
      */
     public static final String RSSEC_SIGNATURE_INCLUDE_CERT = "rs.security.signature.include.cert";
     
     /**
-     * Include the JWK key id for signature in the "kid" header.
+     * Include the JWK key id for signature in the "kid" header. If not configured then it
+     * falls back to RSSEC_INCLUDE_KEY_ID.
      */
     public static final String RSSEC_SIGNATURE_INCLUDE_KEY_ID = "rs.security.signature.include.key.id";
     
     /**
-     * Include the X.509 certificate SHA-1 digest for signature in the "x5t" header.
+     * Include the X.509 certificate SHA-1 digest for signature in the "x5t" header. If not
configured then it
+     * falls back to RSSEC_INCLUDE_CERT_SHA1.
      */
     public static final String RSSEC_SIGNATURE_INCLUDE_CERT_SHA1 = "rs.security.signature.include.cert.sha1";
     


Mime
View raw message