Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6369afcf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6369afcf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6369afcf Branch: refs/heads/3.0.x-fixes Commit: 6369afcf6a288bb014f7492af56fbb831189204a Parents: a7277ba Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Nov 6 18:06:05 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Nov 6 18:06:05 2015 +0000 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/servicestore.jks | Bin 3475 -> 0 bytes .../src/main/webapp/WEB-INF/servicestore.jks | Bin 3475 -> 0 bytes .../cxf/rs/security/jose/common/JoseConstants.java | 8 -------- 3 files changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6369afcf/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks deleted file mode 100644 index 999ee82..0000000 Binary files a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/6369afcf/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks deleted file mode 100644 index 999ee82..0000000 Binary files a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/6369afcf/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 a46c28c..cc990b5 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 @@ -95,14 +95,6 @@ public final class JoseConstants { public static final String RSSEC_KEY_STORE_FILE = "rs.security.keystore.file"; /** -<<<<<<< HEAD -======= - * The KeyStore Object. - */ - public static final String RSSEC_KEY_STORE = "rs.security.keystore"; - - /** ->>>>>>> 9245fcb... Updating STS keys to be 2048 bits * A reference to a PrivateKeyPasswordProvider instance used to retrieve passwords to access keys. */ public static final String RSSEC_KEY_PSWD_PROVIDER = "rs.security.key.password.provider";
