Repository: cxf-fediz
Updated Branches:
refs/heads/1.0.x-fixes 61d8d2d62 -> 9b6f9d8f8
Upgrading expired certs
Conflicts:
examples/samplekeys/tomcat-rp.jks
services/idp/src/main/resources/idp-ssl-trust.jks
systests/jetty8/src/test/resources/client.jks
systests/jetty8/src/test/resources/server.jks
systests/spring/src/test/resources/client.jks
systests/spring/src/test/resources/server.jks
systests/tomcat7/src/test/resources/client.jks
systests/tomcat7/src/test/resources/server.jks
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9b6f9d8f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9b6f9d8f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9b6f9d8f
Branch: refs/heads/1.0.x-fixes
Commit: 9b6f9d8f8d3e780898f91484c944ea6b007dc580
Parents: 61d8d2d
Author: Colm O hEigeartaigh <[email protected]>
Authored: Thu Jul 31 16:42:51 2014 +0100
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Fri Aug 1 09:34:13 2014 +0100
----------------------------------------------------------------------
examples/samplekeys/tomcat-idp.jks | Bin 1123 -> 1123 bytes
examples/samplekeys/tomcat-rp.jks | Bin 2158 -> 1124 bytes
examples/samplekeys/tomcat-wsp.jks | Bin 1124 -> 1123 bytes
.../webapp/src/main/resources/webappKeystore.jks | Bin 1401 -> 1400 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9b6f9d8f/examples/samplekeys/tomcat-idp.jks
----------------------------------------------------------------------
diff --git a/examples/samplekeys/tomcat-idp.jks
b/examples/samplekeys/tomcat-idp.jks
index 82872f9..ae16a55 100644
Binary files a/examples/samplekeys/tomcat-idp.jks and
b/examples/samplekeys/tomcat-idp.jks differ
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9b6f9d8f/examples/samplekeys/tomcat-rp.jks
----------------------------------------------------------------------
diff --git a/examples/samplekeys/tomcat-rp.jks
b/examples/samplekeys/tomcat-rp.jks
index 28a0152..c37cbbf 100644
Binary files a/examples/samplekeys/tomcat-rp.jks and
b/examples/samplekeys/tomcat-rp.jks differ
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9b6f9d8f/examples/samplekeys/tomcat-wsp.jks
----------------------------------------------------------------------
diff --git a/examples/samplekeys/tomcat-wsp.jks
b/examples/samplekeys/tomcat-wsp.jks
index 3756db4..b55527a 100644
Binary files a/examples/samplekeys/tomcat-wsp.jks and
b/examples/samplekeys/tomcat-wsp.jks differ
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9b6f9d8f/examples/wsclientWebapp/webapp/src/main/resources/webappKeystore.jks
----------------------------------------------------------------------
diff --git
a/examples/wsclientWebapp/webapp/src/main/resources/webappKeystore.jks
b/examples/wsclientWebapp/webapp/src/main/resources/webappKeystore.jks
index 0caac59..7fd4daf 100644
Binary files
a/examples/wsclientWebapp/webapp/src/main/resources/webappKeystore.jks and
b/examples/wsclientWebapp/webapp/src/main/resources/webappKeystore.jks differ
