Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 59903179B2 for ; Thu, 11 Jun 2015 12:49:54 +0000 (UTC) Received: (qmail 50348 invoked by uid 500); 11 Jun 2015 12:49:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 50280 invoked by uid 500); 11 Jun 2015 12:49:54 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 50271 invoked by uid 99); 11 Jun 2015 12:49:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2015 12:49:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D9AB7DFFD5; Thu, 11 Jun 2015 12:49:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf-fediz git commit: [FEDIZ-123] - Final merge for certificates Date: Thu, 11 Jun 2015 12:49:53 +0000 (UTC) Repository: cxf-fediz Updated Branches: refs/heads/master 336e27a97 -> 78d541da9 [FEDIZ-123] - Final merge for certificates Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/78d541da Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/78d541da Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/78d541da Branch: refs/heads/master Commit: 78d541da9579b4b97b730acd74044f680bae00ee Parents: 336e27a Author: Colm O hEigeartaigh Authored: Thu Jun 11 13:49:34 2015 +0100 Committer: Colm O hEigeartaigh Committed: Thu Jun 11 13:49:34 2015 +0100 ---------------------------------------------------------------------- examples/samplekeys/ststrust.jks | Bin 3241 -> 3908 bytes .../src/main/resources/ststrust.jks | Bin 2561 -> 3908 bytes .../springWebapp/src/main/resources/ststrust.jks | Bin 2561 -> 3908 bytes .../service/src/main/resources/ststrust.jks | Bin 2561 -> 3908 bytes plugins/core/src/test/resources/stsrealm_a.jks | Bin 2060 -> 2061 bytes plugins/core/src/test/resources/stsrealm_b.jks | Bin 2061 -> 2062 bytes plugins/core/src/test/resources/ststrust.jks | Bin 2561 -> 4943 bytes services/sts/src/main/resources/ststrust.jks | Bin 3161 -> 3908 bytes .../kerberos/src/test/resources/ststrust.jks | Bin 3161 -> 3908 bytes 9 files changed, 0 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/examples/samplekeys/ststrust.jks ---------------------------------------------------------------------- diff --git a/examples/samplekeys/ststrust.jks b/examples/samplekeys/ststrust.jks index bad73f4..ef5a844 100644 Binary files a/examples/samplekeys/ststrust.jks and b/examples/samplekeys/ststrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/examples/spring2Webapp/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/examples/spring2Webapp/src/main/resources/ststrust.jks b/examples/spring2Webapp/src/main/resources/ststrust.jks index 911945c..ef5a844 100644 Binary files a/examples/spring2Webapp/src/main/resources/ststrust.jks and b/examples/spring2Webapp/src/main/resources/ststrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/examples/springWebapp/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/examples/springWebapp/src/main/resources/ststrust.jks b/examples/springWebapp/src/main/resources/ststrust.jks index 911945c..ef5a844 100644 Binary files a/examples/springWebapp/src/main/resources/ststrust.jks and b/examples/springWebapp/src/main/resources/ststrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/examples/wsclientWebapp/webservice/service/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/examples/wsclientWebapp/webservice/service/src/main/resources/ststrust.jks b/examples/wsclientWebapp/webservice/service/src/main/resources/ststrust.jks index 911945c..ef5a844 100644 Binary files a/examples/wsclientWebapp/webservice/service/src/main/resources/ststrust.jks and b/examples/wsclientWebapp/webservice/service/src/main/resources/ststrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/plugins/core/src/test/resources/stsrealm_a.jks ---------------------------------------------------------------------- diff --git a/plugins/core/src/test/resources/stsrealm_a.jks b/plugins/core/src/test/resources/stsrealm_a.jks index 5c3989a..fde2928 100644 Binary files a/plugins/core/src/test/resources/stsrealm_a.jks and b/plugins/core/src/test/resources/stsrealm_a.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/plugins/core/src/test/resources/stsrealm_b.jks ---------------------------------------------------------------------- diff --git a/plugins/core/src/test/resources/stsrealm_b.jks b/plugins/core/src/test/resources/stsrealm_b.jks index 02075e6..83fd045 100644 Binary files a/plugins/core/src/test/resources/stsrealm_b.jks and b/plugins/core/src/test/resources/stsrealm_b.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/plugins/core/src/test/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/plugins/core/src/test/resources/ststrust.jks b/plugins/core/src/test/resources/ststrust.jks index 911945c..8a13e92 100644 Binary files a/plugins/core/src/test/resources/ststrust.jks and b/plugins/core/src/test/resources/ststrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/services/sts/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/services/sts/src/main/resources/ststrust.jks b/services/sts/src/main/resources/ststrust.jks index e051509..ef5a844 100644 Binary files a/services/sts/src/main/resources/ststrust.jks and b/services/sts/src/main/resources/ststrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/78d541da/systests/kerberos/src/test/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/ststrust.jks b/systests/kerberos/src/test/resources/ststrust.jks index e051509..ef5a844 100644 Binary files a/systests/kerberos/src/test/resources/ststrust.jks and b/systests/kerberos/src/test/resources/ststrust.jks differ