You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/11/06 19:06:20 UTC
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 30195905c -> 6369afcf6
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a7277ba4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a7277ba4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a7277ba4
Branch: refs/heads/3.0.x-fixes
Commit: a7277ba4ba0e410b6bbc423b819fca11f2befd9d
Parents: feb7612
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Nov 6 18:05:35 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Nov 6 18:05:35 2015 +0000
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7277ba4/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8182b84..ae52c75 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -402,6 +402,7 @@ B bfbc0a25c377e43395fb1f7beee045e4412c4d8d
B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
B c04c27200226b564108b4fe58b8ac70ca5ec7638
B c0526a6e55a1eef931bc9257cdd419b64818ea41
+B c129ebc7306e29c6010cc544ce4b8e723dbbd504
B c1c9562bb13eeacdd9dae5a46c513e9e03625698
B c2b70fd462955b714f0211ff52e1f99399666d44
B c4c969042edcbcd439faa0fc95c1f5130cf06c71
@@ -682,6 +683,7 @@ M 8d2b0180518fcec6274ac2f288e74ed1ff5ce76a
M 8f2218ef37a8d5b6da84b3d2d3ec8ea83122e9b8
M 8fc7bfa3d054e9aebcb43f51e083ff7cf3b47010
M 9043011518147bbc2dac036681fd64d7ce578bc2
+M 9245fcb3947411433c3c03ca7aff967365ec3fdd
M 94585ae070e62d08f0e064df8176fbdbdf1bb37b
M 94d6eba32c31e686def306f20b48ccc60d383fad
M 953d23f38ddfe044a4dff4783498ebe5d68d76c1
[3/3] cxf git commit: Fixing merge
Posted by co...@apache.org.
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 <co...@apache.org>
Authored: Fri Nov 6 18:06:05 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
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";
[2/3] cxf git commit: Updating STS keys to be 2048 bits
Posted by co...@apache.org.
Updating STS keys to be 2048 bits
Conflicts:
distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks
distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks
rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/feb7612e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/feb7612e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/feb7612e
Branch: refs/heads/3.0.x-fixes
Commit: feb7612e40a9d7d1d5c8d727b2d5b5d054cbec6a
Parents: 3019590
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Nov 6 18:02:04 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Nov 6 18:05:35 2015 +0000
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/servicestore.jks | Bin 0 -> 3475 bytes
.../src/main/webapp/WEB-INF/servicestore.jks | Bin 0 -> 3475 bytes
.../release/samples/sts/keys/clientstore.jks | Bin 4436 -> 4559 bytes
.../release/samples/sts/keys/servicestore.jks | Bin 3350 -> 3475 bytes
.../main/release/samples/sts/keys/stsstore.jks | Bin 3978 -> 4557 bytes
.../rs/security/jose/common/JoseConstants.java | 8 ++++++++
.../sts-core/src/test/resources/clientstore.jks | Bin 0 -> 4559 bytes
.../sts-core/src/test/resources/servicestore.jks | Bin 3350 -> 3475 bytes
.../sts/sts-core/src/test/resources/stsstore.jks | Bin 3978 -> 4557 bytes
.../sts/sts-war/src/main/resources/stsstore.jks | Bin 3978 -> 4557 bytes
.../advanced/src/test/resources/clientstore.jks | Bin 4436 -> 4559 bytes
.../cxf/systest/sts/realms/stsstore_realms.jks | Bin 5394 -> 4557 bytes
.../advanced/src/test/resources/servicestore.jks | Bin 3350 -> 3475 bytes
.../advanced/src/test/resources/stsstore.jks | Bin 3978 -> 4557 bytes
.../basic/src/test/resources/clientstore.jks | Bin 4436 -> 4559 bytes
.../basic/src/test/resources/servicestore.jks | Bin 3350 -> 3475 bytes
.../basic/src/test/resources/stsstore.jks | Bin 3978 -> 4557 bytes
.../src/test/resources/clientstore.jks | Bin 4436 -> 4559 bytes
.../sts-osgi/src/main/resources/stsstore.jks | Bin 3978 -> 4557 bytes
.../kerberos/src/test/resources/clientstore.jks | Bin 4436 -> 4559 bytes
.../kerberos/src/test/resources/servicestore.jks | Bin 3350 -> 3475 bytes
.../kerberos/src/test/resources/stsstore.jks | Bin 3978 -> 4557 bytes
22 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/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
new file mode 100644
index 0000000..999ee82
Binary files /dev/null and b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/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
new file mode 100644
index 0000000..999ee82
Binary files /dev/null and b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/sts/keys/clientstore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/keys/clientstore.jks b/distribution/src/main/release/samples/sts/keys/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/distribution/src/main/release/samples/sts/keys/clientstore.jks and b/distribution/src/main/release/samples/sts/keys/clientstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/sts/keys/servicestore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/keys/servicestore.jks b/distribution/src/main/release/samples/sts/keys/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/distribution/src/main/release/samples/sts/keys/servicestore.jks and b/distribution/src/main/release/samples/sts/keys/servicestore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/sts/keys/stsstore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/keys/stsstore.jks b/distribution/src/main/release/samples/sts/keys/stsstore.jks
index e805906..51f131f 100644
Binary files a/distribution/src/main/release/samples/sts/keys/stsstore.jks and b/distribution/src/main/release/samples/sts/keys/stsstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/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 cc990b5..a46c28c 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,6 +95,14 @@ 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";
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-core/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/resources/clientstore.jks b/services/sts/sts-core/src/test/resources/clientstore.jks
new file mode 100644
index 0000000..f734f87
Binary files /dev/null and b/services/sts/sts-core/src/test/resources/clientstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-core/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/resources/servicestore.jks b/services/sts/sts-core/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/services/sts/sts-core/src/test/resources/servicestore.jks and b/services/sts/sts-core/src/test/resources/servicestore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-core/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/resources/stsstore.jks b/services/sts/sts-core/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/sts-core/src/test/resources/stsstore.jks and b/services/sts/sts-core/src/test/resources/stsstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-war/src/main/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/resources/stsstore.jks b/services/sts/sts-war/src/main/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/sts-war/src/main/resources/stsstore.jks and b/services/sts/sts-war/src/main/resources/stsstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/clientstore.jks b/services/sts/systests/advanced/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/services/sts/systests/advanced/src/test/resources/clientstore.jks and b/services/sts/systests/advanced/src/test/resources/clientstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks
index 73c35d3..51f131f 100644
Binary files a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks and b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/servicestore.jks b/services/sts/systests/advanced/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/services/sts/systests/advanced/src/test/resources/servicestore.jks and b/services/sts/systests/advanced/src/test/resources/servicestore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/stsstore.jks b/services/sts/systests/advanced/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/systests/advanced/src/test/resources/stsstore.jks and b/services/sts/systests/advanced/src/test/resources/stsstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/basic/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/clientstore.jks b/services/sts/systests/basic/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/services/sts/systests/basic/src/test/resources/clientstore.jks and b/services/sts/systests/basic/src/test/resources/clientstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/basic/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/servicestore.jks b/services/sts/systests/basic/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/services/sts/systests/basic/src/test/resources/servicestore.jks and b/services/sts/systests/basic/src/test/resources/servicestore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/basic/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/stsstore.jks b/services/sts/systests/basic/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/systests/basic/src/test/resources/stsstore.jks and b/services/sts/systests/basic/src/test/resources/stsstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/sts-itests/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-itests/src/test/resources/clientstore.jks b/services/sts/systests/sts-itests/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/services/sts/systests/sts-itests/src/test/resources/clientstore.jks and b/services/sts/systests/sts-itests/src/test/resources/clientstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks b/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks and b/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/systests/kerberos/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/clientstore.jks b/systests/kerberos/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/systests/kerberos/src/test/resources/clientstore.jks and b/systests/kerberos/src/test/resources/clientstore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/systests/kerberos/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/servicestore.jks b/systests/kerberos/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/systests/kerberos/src/test/resources/servicestore.jks and b/systests/kerberos/src/test/resources/servicestore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/systests/kerberos/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/stsstore.jks b/systests/kerberos/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/systests/kerberos/src/test/resources/stsstore.jks and b/systests/kerberos/src/test/resources/stsstore.jks differ