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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 23 17:48:29 2014
New Revision: 6561

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6561&view=rev
Log:
IDP-302 - support multiple MetadataFilter elements without explicit chain

Modified:
    trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
    trunk/idp-conf/src/test/resources/conf/metadata-providers.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

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=6561&r1=6560&r2=6561&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/metadata-providers.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/metadata-providers.xml Tue Sep 23 17:48:29 2014
@@ -19,26 +19,23 @@
 	<MetadataProvider id="URLMD" xsi:type="FilesystemMetadataProvider"
 		metadataFile="%{idp.home}/metadata/example-metadata.xml">
         
-		<MetadataFilter xsi:type="ChainingFilter">
-            <!-- Validates the signature of the metadata and filters out all but SP roles to save memory -->
-			<MetadataFilter xsi:type="SignatureValidation"
-				requireSignedMetadata="false"> <!-- TODO -->
-				<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">
-				<RetainedRole>samlmd:SPSSODescriptor</RetainedRole>
-			</MetadataFilter>
+        <!-- Validates the signature of the metadata and filters out all but SP roles to save memory -->
+		<MetadataFilter xsi:type="SignatureValidation"
+			requireSignedMetadata="false"> <!-- TODO -->
+			<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">
+			<RetainedRole>samlmd:SPSSODescriptor</RetainedRole>
 		</MetadataFilter>
         
 	</MetadataProvider>
 
 </MetadataProvider>
-

Modified: trunk/idp-conf/src/test/resources/conf/metadata-providers.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/conf/metadata-providers.xml?rev=6561&r1=6560&r2=6561&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/conf/metadata-providers.xml (original)
+++ trunk/idp-conf/src/test/resources/conf/metadata-providers.xml Tue Sep 23 17:48:29 2014
@@ -17,21 +17,19 @@
 	<!-- Example metadata provider. -->
 
     <MetadataProvider id="URLMD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M">
-        <MetadataFilter xsi:type="ChainingFilter">
-            <MetadataFilter xsi:type="SignatureValidation" requireSignedMetadata="false"> <!-- TODO -->
-                <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">
-                <RetainedRole>samlmd:SPSSODescriptor</RetainedRole>
-            </MetadataFilter>
+        <MetadataFilter xsi:type="SignatureValidation" requireSignedMetadata="false"> <!-- TODO -->
+            <PublicKey>
+                MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
+                uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
+                LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88
+                NenXKxY+HMxMs0sT0UKYh1cAEqadrHRBO65aDBcm5a0sBVYt9K6pgaOHrp/zSIbh

[... 60 lines stripped ...]