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 D1D2D10186 for ; Mon, 24 Feb 2014 19:39:19 +0000 (UTC) Received: (qmail 10461 invoked by uid 500); 24 Feb 2014 19:39:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 10387 invoked by uid 500); 24 Feb 2014 19:39:17 -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 10380 invoked by uid 99); 24 Feb 2014 19:39:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Feb 2014 19:39:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Feb 2014 19:39:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B608C23889BF; Mon, 24 Feb 2014 19:38:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1571407 - in /cxf/fediz/trunk/services/idp/src: main/filters/realm-a/ main/filters/realm-b/ main/resources/ main/webapp/WEB-INF/ test/java/org/apache/cxf/fediz/service/idp/service/jpa/ test/resources/ Date: Mon, 24 Feb 2014 19:38:50 -0000 To: commits@cxf.apache.org From: owulff@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140224193850.B608C23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: owulff Date: Mon Feb 24 19:38:49 2014 New Revision: 1571407 URL: http://svn.apache.org/r1571407 Log: [FEDIZ-78] Provide a configurable mechanism to load the DB initially Added: cxf/fediz/trunk/services/idp/src/main/resources/entities-realmb.xml - copied, changed from r1571105, cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml Modified: cxf/fediz/trunk/services/idp/src/main/filters/realm-a/env.properties cxf/fediz/trunk/services/idp/src/main/filters/realm-b/env.properties cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml cxf/fediz/trunk/services/idp/src/main/resources/persistenceContext.xml cxf/fediz/trunk/services/idp/src/main/resources/realm.properties cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java cxf/fediz/trunk/services/idp/src/test/resources/realm.properties cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml Modified: cxf/fediz/trunk/services/idp/src/main/filters/realm-a/env.properties URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/filters/realm-a/env.properties?rev=1571407&r1=1571406&r2=1571407&view=diff ============================================================================== --- cxf/fediz/trunk/services/idp/src/main/filters/realm-a/env.properties (original) +++ cxf/fediz/trunk/services/idp/src/main/filters/realm-a/env.properties Mon Feb 24 19:38:49 2014 @@ -2,4 +2,5 @@ realm.STS_URI=REALMA realmA.port=9443 realmB.port=12443 idp-config=idp-config-realma.xml +db-load-config=entities-realma.xml realm-uri=urn:org:apache:cxf:fediz:idp:realm-A \ No newline at end of file Modified: cxf/fediz/trunk/services/idp/src/main/filters/realm-b/env.properties URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/filters/realm-b/env.properties?rev=1571407&r1=1571406&r2=1571407&view=diff ============================================================================== --- cxf/fediz/trunk/services/idp/src/main/filters/realm-b/env.properties (original) +++ cxf/fediz/trunk/services/idp/src/main/filters/realm-b/env.properties Mon Feb 24 19:38:49 2014 @@ -2,4 +2,5 @@ realm.STS_URI=REALMB realmA.port=9443 realmB.port=12443 idp-config=idp-config-realmb.xml +db-load-config=entities-realmb.xml realm-uri=urn:org:apache:cxf:fediz:idp:realm-B \ No newline at end of file Modified: cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml?rev=1571407&r1=1571406&r2=1571407&view=diff ============================================================================== --- cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml (original) +++ cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml Mon Feb 24 19:38:49 2014 @@ -81,7 +81,7 @@ - + Copied: cxf/fediz/trunk/services/idp/src/main/resources/entities-realmb.xml (from r1571105, cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml) URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/entities-realmb.xml?p2=cxf/fediz/trunk/services/idp/src/main/resources/entities-realmb.xml&p1=cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml&r1=1571105&r2=1571407&rev=1571407&view=diff ============================================================================== --- cxf/fediz/trunk/services/idp/src/main/resources/entities-realma.xml (original) +++ cxf/fediz/trunk/services/idp/src/main/resources/entities-realmb.xml Mon Feb 24 19:38:49 2014 @@ -26,15 +26,15 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd"> - - - + + + - - - - + + + + http://docs.oasis-open.org/wsfed/federation/200706 @@ -54,16 +54,11 @@ - - + + - - - - - - + @@ -76,50 +71,16 @@ - - - - - - - - - - - - - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + @@ -91,7 +91,7 @@ - + - - Modified: cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java?rev=1571407&r1=1571406&r2=1571407&view=diff ============================================================================== --- cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java (original) +++ cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java Mon Feb 24 19:38:49 2014 @@ -58,7 +58,7 @@ public class TrustedIdpDAOJPATest { @Test public void testReadExistingTrustedIdp() { TrustedIdp trustedIdp = trustedIdpDAO.getTrustedIDP("urn:org:apache:cxf:fediz:idp:realm-B"); - Assert.isTrue("trusted cert".equals(trustedIdp.getCertificate()), + Assert.isTrue("realmb.cert".equals(trustedIdp.getCertificate()), "Certificate name doesn't match"); Assert.isTrue("Realm B description".equals(trustedIdp.getDescription()), "Description name doesn't match"); @@ -92,7 +92,7 @@ public class TrustedIdpDAOJPATest { trustedIdp = trustedIdpDAO.getTrustedIDP(realm); - Assert.isTrue("trusted cert".equals(trustedIdp.getCertificate()), + Assert.isTrue("realmb.cert".equals(trustedIdp.getCertificate()), "Certificate name doesn't match"); Assert.isTrue("Realm B description".equals(trustedIdp.getDescription()), "Description name doesn't match"); @@ -188,7 +188,7 @@ public class TrustedIdpDAOJPATest { TrustedIdp trustedIdp = new TrustedIdp(); trustedIdp.setRealm(realm); trustedIdp.setCacheTokens(false); - trustedIdp.setCertificate("trusted cert"); + trustedIdp.setCertificate("realmb.cert"); trustedIdp.setDescription("Realm B description"); trustedIdp.setFederationType("FederateIdentity"); trustedIdp.setName("Realm B"); Modified: cxf/fediz/trunk/services/idp/src/test/resources/realm.properties URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/resources/realm.properties?rev=1571407&r1=1571406&r2=1571407&view=diff ============================================================================== --- cxf/fediz/trunk/services/idp/src/test/resources/realm.properties (original) +++ cxf/fediz/trunk/services/idp/src/test/resources/realm.properties Mon Feb 24 19:38:49 2014 @@ -1,3 +1,4 @@ realm.STS_URI=REALMA realmA.port=8443 realmB.port=12443 +db-load-config=entities-realma.xml Modified: cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml?rev=1571407&r1=1571406&r2=1571407&view=diff ============================================================================== --- cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml (original) +++ cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml Mon Feb 24 19:38:49 2014 @@ -39,6 +39,7 @@ classpath:persistence.properties + classpath:realm.properties