[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/metadata-providers.xml idp-profile-spring...

[noreply at shibboleth.net]

Author: rdw
Date: Mon May  5 08:57:23 2014
New Revision: 5838

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5838&view=rev
Log:
IDP-390 Strip out more ----BEGIN CERTIFICATE--- statements.

Modified:
    trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml

Modified: trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/metadata-providers.xml?rev=5838&r1=5837&r2=5838&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/metadata-providers.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/metadata-providers.xml Mon May  5 08:57:23 2014
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This file is an EXAMPLE metadata configuration file. -->
-<MetadataProvider id="ShibbolethMetadata"
-	xsi:type="ChainingMetadataProvider" xmlns:rp="urn:mace:shibboleth:2.0:relying-party"
-	xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns="urn:mace:shibboleth:2.0:metadata"
-	xmlns:resource="urn:mace:shibboleth:2.0:resource" xmlns:security="urn:mace:shibboleth:2.0:security"
-	xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml" xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider"
+	xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
+	xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource"
+	xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml"
+	xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party classpath:/schema/shibboleth-2.0-relying-party.xsd
                                           urn:mace:shibboleth:2.0:relying-party:saml classpath:/schema/shibboleth-2.0-relying-party-saml.xsd
                                           urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd
@@ -23,20 +22,19 @@
 	<!-- Reads metadata from a URL and store a backup copy on the file system. -->
 	<!-- Validates the signature of the metadata and filters out all by SP entities 
 		in order to save memory -->
-	<MetadataProvider id="URLMD"
-		xsi:type="FilesystemMetadataProvider" metadataFile="${idp.home}/metadata/example-metadata.xml">
+	<MetadataProvider id="URLMD" xsi:type="FilesystemMetadataProvider"
+		metadataFile="${idp.home}/metadata/example-metadata.xml">
 		<MetadataFilter xsi:type="ChainingFilter">
 			<MetadataFilter xsi:type="SignatureValidation"
 				requireSignedMetadata="false"> <!-- TODO -->
-				<PublicKey>-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
-uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
-LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
-NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
-nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
-E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
-4wIDAQAB
------END PUBLIC KEY-----
+				<PublicKey>
+					MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
+					uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
+					LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
+					NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh
+					nR5tFFLjBbtFktDpHL3AdGBH3OYidNGKBO3tJ3Ms7LeKXsM0+0Y4P+9fHZINL2X3
+					E2N6GVnKs5PZTg9sP0FtIpAbYm/+zCx7Yj1ET/Er8mDd6tNVGSQsn9s5xUBwGqn1
+					4wIDAQAB
 				</PublicKey>
 			</MetadataFilter>
 			<MetadataFilter xsi:type="EntityRoleWhiteList">

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml?rev=5838&r1=5837&r2=5838&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml Mon May  5 08:57:23 2014
@@ -1,200 +1,225 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    This file is an EXAMPLE configuration file.
-
-    This file specifies relying party dependent configurations for the IdP, for example, whether SAML assertions to a 
-    particular relying party should be signed.  It also includes metadata provider and credential definitions used 

[... 412 lines stripped ...]