From 2d1c7d0d517b1640ae43ba00a37176cb030e6160 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 20 Jan 2017 10:22:13 -0600
Subject: [PATCH] fix metadata providers

---
 conf/metadata-providers.xml | 38 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/conf/metadata-providers.xml b/conf/metadata-providers.xml
index 53f72aa..778989c 100644
--- a/conf/metadata-providers.xml
+++ b/conf/metadata-providers.xml
@@ -62,39 +62,27 @@
     <!--
     <MetadataProvider id="LocalMetadata"  xsi:type="FilesystemMetadataProvider" metadataFile="PATH_TO_YOUR_METADATA"/>
     -->
-          
 
-
-	<MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider"
-		xmlns="urn:mace:shibboleth:2.0:metadata"
-		xmlns:resource="urn:mace:shibboleth:2.0:resource"
-		xmlns:security="urn:mace:shibboleth:2.0:security"
-		xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
-                        urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
-                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
-
-		<MetadataProvider id="InCommonMetadata"
-                      xsi:type="FileBackedHTTPMetadataProvider"
-                      backingFile="%{idp.home}/metadata/localCopyFromInCommon.xml"
-                      metadataURL="http://md.incommon.org/InCommon/InCommon-metadata.xml"
-                      maxRefreshDelay="PT8H">
+	<MetadataProvider id="InCommonMetadata"
+                xsi:type="FileBackedHTTPMetadataProvider"
+                backingFile="%{idp.home}/metadata/localCopyFromInCommon.xml"
+                metadataURL="http://md.incommon.org/InCommon/InCommon-metadata.xml"
+                maxRefreshDelay="PT8H">
 					  
-			<MetadataFilter xsi:type="RequiredValidUntil" maxValidityInterval="P14D" />
+		<MetadataFilter xsi:type="RequiredValidUntil" maxValidityInterval="P14D" />
 			
-			<MetadataFilter xsi:type="SignatureValidation"
-				certificateFile="${idp.home}/credentials/inc-md-cert.pem" />
+		<MetadataFilter xsi:type="SignatureValidation"
+			certificateFile="${idp.home}/credentials/inc-md-cert.pem" />
 				
-			<MetadataFilter xsi:type="EntityRoleWhiteList">
-				<RetainedRole>md:SPSSODescriptor</RetainedRole>
-			</MetadataFilter>
+		<MetadataFilter xsi:type="EntityRoleWhiteList">
+			<RetainedRole>md:SPSSODescriptor</RetainedRole>
+		</MetadataFilter>
 			
     </MetadataProvider>
 
     <MetadataProvider id="testbed.tier" xsi:type="FilesystemMetadataProvider" metadataFile="/opt/shibboleth-idp/metadata/testbed-tier-metadata.xml"/>
-
+	<MetadataProvider id="sp.testbed.tier" xsi:type="FilesystemMetadataProvider" metadataFile="/opt/shibboleth-idp/metadata/sp-testbed-tier-metadata.xml"/>
+	
 </MetadataProvider>
 
 </MetadataProvider>