From 10ff0bd13f76211ed2962617097c43a690ced8da Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Mon, 25 Nov 2019 15:44:46 -0500
Subject: [PATCH 1/3] SHIBUI-1640

---
 .../resolvers/DynamicMetadataResolverAttributes.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicMetadataResolverAttributes.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicMetadataResolverAttributes.java
index d817284ba..9a87d1ffa 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicMetadataResolverAttributes.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicMetadataResolverAttributes.java
@@ -20,17 +20,17 @@ public class DynamicMetadataResolverAttributes {
 
     private String taskTimerRef;
 
-    private Float refreshDelayFactor = 0.75F;
+    private Float refreshDelayFactor;
 
-    private String minCacheDuration = "PT10M";
+    private String minCacheDuration;
 
-    private String maxCacheDuration = "PT8H";
+    private String maxCacheDuration;
 
-    private String maxIdleEntityData = "PT8H";
+    private String maxIdleEntityData;
 
     private Boolean removeIdleEntityData;
 
-    private String cleanupTaskInterval = "PT30M";
+    private String cleanupTaskInterval;
 
     private String persistentCacheManagerRef;
 
@@ -40,7 +40,7 @@ public class DynamicMetadataResolverAttributes {
 
     private Boolean initializeFromPersistentCacheInBackground = true;
 
-    private String backgroundInitializationFromCacheDelay = "PT2S";
+    private String backgroundInitializationFromCacheDelay;
 
     private String initializationFromCachePredicateRef;
 

From bd0ef4ee4c47901856e5ef730adc3dde97c8ed56 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Mon, 25 Nov 2019 16:18:20 -0500
Subject: [PATCH 2/3] SHIBUI-1640

---
 .../envers/MetadataResolverEnversVersioningTests.groovy         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
index 2ba81bcdf..b468a2ffa 100644
--- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
+++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
@@ -54,7 +54,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
 
         when:
         LocalDynamicMetadataResolver resolver = new LocalDynamicMetadataResolver(name: 'ldmr').with {
-            it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes()
+            it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes(refreshDelayFactor: 0.75)
             it
         }
         def resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver,

From ea745d46b869b1972fa1ee353fecef1e6368d9ce Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Mon, 25 Nov 2019 20:42:36 -0500
Subject: [PATCH 3/3] Fix tests

---
 backend/src/test/resources/conf/278.2.xml | 75 +++++------------------
 backend/src/test/resources/conf/278.xml   | 65 ++++----------------
 backend/src/test/resources/conf/704.1.xml |  4 +-
 backend/src/test/resources/conf/704.2.xml |  4 +-
 backend/src/test/resources/conf/704.3.xml |  4 +-
 backend/src/test/resources/conf/984-2.xml | 16 ++---
 backend/src/test/resources/conf/984.xml   | 16 ++---
 7 files changed, 40 insertions(+), 144 deletions(-)

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
index 82a25f618..7f950d8ac 100644
--- a/backend/src/test/resources/conf/278.2.xml
+++ b/backend/src/test/resources/conf/278.2.xml
@@ -1,66 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE metadata configuration file. -->
-<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"
-                  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-                  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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd">
-    <MetadataProvider backgroundInitializationFromCacheDelay="PT2S"
-                      cleanupTaskInterval="PT30M"
-                      connectionRequestTimeout="PT5S"
-                      connectionTimeout="PT5S"
-                      id="DynamicHTTP"
-                      maxCacheDuration="PT8H"
-                      maxConnectionsPerRoute="100"
-                      maxConnectionsTotal="100"
-                      maxIdleEntityData="PT8H"
-                      minCacheDuration="PT10M"
-                      refreshDelayFactor="0.75"
-                      removeIdleEntityData="true"
-                      socketTimeout="PT5S"
-                      supportedContentTypes="[]"
-                      xsi:type="DynamicHttpMetadataProvider">
-        <MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
-        <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
-        <MetadataFilter xsi:type="EntityAttributes">
-            <saml:Attribute
-                    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="here" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-                <saml:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:type="xsd:string">there</saml:AttributeValue>
-            </saml:Attribute>
+<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
+    <MetadataProvider id='DynamicHTTP' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' supportedContentTypes='[]' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
+        <MetadataQueryProtocol transformRef='transformRef'>content</MetadataQueryProtocol>
+        <MetadataFilter xsi:type='SignatureValidation' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata' certificateFile='%{idp.home}/credentials/inc-md-cert.pem' />
+        <MetadataFilter xsi:type='RequiredValidUntil' maxValidityInterval='P14D' />
+        <MetadataFilter xsi:type='EntityAttributes'><saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="here" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+            <saml:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">there</saml:AttributeValue>
+        </saml:Attribute>
+
             <Entity>https://sp1.example.org</Entity>
         </MetadataFilter>
-        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+        <MetadataFilter xsi:type='EntityRoleWhiteList' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
             <RetainedRole>md:SPSSODescriptor</RetainedRole>
         </MetadataFilter>
     </MetadataProvider>
-    <MetadataProvider id="HTTPMetadata"
-                      xsi:type="FileBackedHTTPMetadataProvider"
-                      backingFile="%{idp.home}/metadata/metadata.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay='PT0M'
-                      maxRefreshDelay='P1D'>
-    </MetadataProvider>
-    <MetadataProvider id="LocalDynamic"
-                      backgroundInitializationFromCacheDelay="PT2S"
-                      cleanupTaskInterval="PT30M"
-                      maxCacheDuration="PT8H"
-                      maxIdleEntityData="PT8H"
-                      minCacheDuration="PT10M"
-                      refreshDelayFactor="0.75"
-                      removeIdleEntityData="true"
-                      sourceDirectory="/tmp"
-                      xsi:type="DynamicHttpMetadataProvider">
+    <MetadataProvider id='HTTPMetadata' xsi:type='FileBackedHTTPMetadataProvider' backingFile='%{idp.home}/metadata/metadata.xml' metadataURL='https://idp.unicon.net/idp/shibboleth' minRefreshDelay='PT0M' maxRefreshDelay='P1D' />
+    <MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' />
+    <MetadataProvider id='ClasspathResourceMetadata' xsi:type='ResourceBackedMetadataProvider' refreshDelayFactor='0.3'>
+        <MetadataResource xmlns:resource='urn:mace:shibboleth:2.0:resource' xsi:type='resource:ClasspathResource' file='metadata/metadata.xml' />
     </MetadataProvider>
-    <MetadataProvider id="ClasspathResourceMetadata"
-                      refreshDelayFactor="0.3"
-                      xsi:type="ResourceBackedMetadataProvider">
-        <MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
-                          xsi:type="resource:ClasspathResource"
-                          file="metadata/metadata.xml" />
-    </MetadataProvider>
-
-</MetadataProvider>
\ No newline at end of file
+</MetadataProvider>
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
index 6db6e5cfa..1e4c34b31 100644
--- a/backend/src/test/resources/conf/278.xml
+++ b/backend/src/test/resources/conf/278.xml
@@ -1,58 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE metadata configuration file. -->
-<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"
-                  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-                  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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd">
-    <MetadataProvider backgroundInitializationFromCacheDelay="PT2S"
-                      cleanupTaskInterval="PT30M"
-                      connectionRequestTimeout="PT5S"
-                      connectionTimeout="PT5S"
-                      id="DynamicHTTP"
-                      maxCacheDuration="PT8H"
-                      maxConnectionsPerRoute="100"
-                      maxConnectionsTotal="100"
-                      maxIdleEntityData="PT8H"
-                      minCacheDuration="PT10M"
-                      refreshDelayFactor="0.75"
-                      removeIdleEntityData="true"
-                      socketTimeout="PT5S"
-                      supportedContentTypes="[]"
-                      xsi:type="DynamicHttpMetadataProvider">
-        <MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
-        <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
-        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
+    <MetadataProvider id='DynamicHTTP' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' supportedContentTypes='[]' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
+        <MetadataQueryProtocol transformRef='transformRef'>content</MetadataQueryProtocol>
+        <MetadataFilter xsi:type='SignatureValidation' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata' certificateFile='%{idp.home}/credentials/inc-md-cert.pem' />
+        <MetadataFilter xsi:type='RequiredValidUntil' maxValidityInterval='P14D' />
+        <MetadataFilter xsi:type='EntityRoleWhiteList' xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
             <RetainedRole>md:SPSSODescriptor</RetainedRole>
         </MetadataFilter>
     </MetadataProvider>
-    <MetadataProvider id="HTTPMetadata"
-                      xsi:type="FileBackedHTTPMetadataProvider"
-                      backingFile="%{idp.home}/metadata/metadata.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay='PT0M'
-                      maxRefreshDelay='P1D'>
+    <MetadataProvider id='HTTPMetadata' xsi:type='FileBackedHTTPMetadataProvider' backingFile='%{idp.home}/metadata/metadata.xml' metadataURL='https://idp.unicon.net/idp/shibboleth' minRefreshDelay='PT0M' maxRefreshDelay='P1D' />
+    <MetadataProvider sourceDirectory='/tmp' id='LocalDynamic' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' />
+    <MetadataProvider id='ClasspathResourceMetadata' xsi:type='ResourceBackedMetadataProvider' refreshDelayFactor='0.3'>
+        <MetadataResource xmlns:resource='urn:mace:shibboleth:2.0:resource' xsi:type='resource:ClasspathResource' file='metadata/metadata.xml' />
     </MetadataProvider>
-    <MetadataProvider id="LocalDynamic"
-                      backgroundInitializationFromCacheDelay="PT2S"
-                      cleanupTaskInterval="PT30M"
-                      maxCacheDuration="PT8H"
-                      maxIdleEntityData="PT8H"
-                      minCacheDuration="PT10M"
-                      refreshDelayFactor="0.75"
-                      removeIdleEntityData="true"
-                      sourceDirectory="/tmp"
-                      xsi:type="DynamicHttpMetadataProvider">
-    </MetadataProvider>
-    <MetadataProvider id="ClasspathResourceMetadata"
-                      refreshDelayFactor="0.3"
-                      xsi:type="ResourceBackedMetadataProvider">
-        <MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
-                          xsi:type="resource:ClasspathResource"
-                          file="metadata/metadata.xml" />
-    </MetadataProvider>
-</MetadataProvider>
\ No newline at end of file
+</MetadataProvider>
diff --git a/backend/src/test/resources/conf/704.1.xml b/backend/src/test/resources/conf/704.1.xml
index a7e5d63a0..20d53416f 100644
--- a/backend/src/test/resources/conf/704.1.xml
+++ b/backend/src/test/resources/conf/704.1.xml
@@ -1,5 +1,5 @@
 <MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
-    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' refreshDelayFactor='0.75' minCacheDuration='PT10M' maxCacheDuration='PT8H' maxIdleEntityData='PT8H' removeIdleEntityData='true' cleanupTaskInterval='PT30M' backgroundInitializationFromCacheDelay='PT2S' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
+    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
         <MetadataQueryProtocol transformRef='This is a transformRef'>some content</MetadataQueryProtocol>
     </MetadataProvider>
-</MetadataProvider>
\ No newline at end of file
+</MetadataProvider>
diff --git a/backend/src/test/resources/conf/704.2.xml b/backend/src/test/resources/conf/704.2.xml
index 823b89de4..5178d0097 100644
--- a/backend/src/test/resources/conf/704.2.xml
+++ b/backend/src/test/resources/conf/704.2.xml
@@ -1,5 +1,5 @@
 <MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
-    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' refreshDelayFactor='0.75' minCacheDuration='PT10M' maxCacheDuration='PT8H' maxIdleEntityData='PT8H' removeIdleEntityData='true' cleanupTaskInterval='PT30M' backgroundInitializationFromCacheDelay='PT2S' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
+    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
         <Template encodingStyle='FORM' transformRef='This is a transformRef' velocityEngine='This is a velocityEngine'>some content</Template>
     </MetadataProvider>
-</MetadataProvider>
\ No newline at end of file
+</MetadataProvider>
diff --git a/backend/src/test/resources/conf/704.3.xml b/backend/src/test/resources/conf/704.3.xml
index d7ce637d3..37ab29fee 100644
--- a/backend/src/test/resources/conf/704.3.xml
+++ b/backend/src/test/resources/conf/704.3.xml
@@ -1,5 +1,5 @@
 <MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
-    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' refreshDelayFactor='0.75' minCacheDuration='PT10M' maxCacheDuration='PT8H' maxIdleEntityData='PT8H' removeIdleEntityData='true' cleanupTaskInterval='PT30M' backgroundInitializationFromCacheDelay='PT2S' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
+    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
         <Regex match='This is the match field'>some content</Regex>
     </MetadataProvider>
-</MetadataProvider>
\ No newline at end of file
+</MetadataProvider>
diff --git a/backend/src/test/resources/conf/984-2.xml b/backend/src/test/resources/conf/984-2.xml
index 0c5749f10..639411c63 100644
--- a/backend/src/test/resources/conf/984-2.xml
+++ b/backend/src/test/resources/conf/984-2.xml
@@ -1,19 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<MetadataProvider xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  id="ShibbolethMetadata"
-                  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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
-                  xsi:type="ChainingMetadataProvider">
-    <MetadataProvider backgroundInitializationFromCacheDelay="PT2S" cleanupTaskInterval="PT30M"
-                      connectionRequestTimeout="PT5S" connectionTimeout="PT5S" id="DynamicHttpMetadataResolver"
-                      maxCacheDuration="PT8H" maxConnectionsPerRoute="100" maxConnectionsTotal="100"
-                      maxIdleEntityData="PT8H" minCacheDuration="PT10M" refreshDelayFactor="0.75"
-                      removeIdleEntityData="true" socketTimeout="PT5S" xsi:type="DynamicHttpMetadataProvider">
+<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
+    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
         <MetadataQueryProtocol>http://mdq-beta.incommon.org/global</MetadataQueryProtocol>
-        <MetadataFilter xsi:type="EntityAttributes">
+        <MetadataFilter xsi:type='EntityAttributes'>
             <AttributeFilterScript>
                 <Script>
                     <![CDATA[
-            (function (attribute) {
+(function (attribute) {
                 "use strict";
                 var namespaces = ["http://shibboleth.net/ns/profiles", "http://scaldingspoon.com/iam"];
                 // check the parameter
diff --git a/backend/src/test/resources/conf/984.xml b/backend/src/test/resources/conf/984.xml
index 5974aa861..764f944a9 100644
--- a/backend/src/test/resources/conf/984.xml
+++ b/backend/src/test/resources/conf/984.xml
@@ -1,19 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<MetadataProvider xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  id="ShibbolethMetadata"
-                  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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
-                  xsi:type="ChainingMetadataProvider">
-    <MetadataProvider backgroundInitializationFromCacheDelay="PT2S" cleanupTaskInterval="PT30M"
-                      connectionRequestTimeout="PT5S" connectionTimeout="PT5S" id="DynamicHttpMetadataResolver"
-                      maxCacheDuration="PT8H" maxConnectionsPerRoute="100" maxConnectionsTotal="100"
-                      maxIdleEntityData="PT8H" minCacheDuration="PT10M" refreshDelayFactor="0.75"
-                      removeIdleEntityData="true" socketTimeout="PT5S" xsi:type="DynamicHttpMetadataProvider">
+<MetadataProvider id='ShibbolethMetadata' xmlns='urn:mace:shibboleth:2.0:metadata' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='ChainingMetadataProvider' 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 urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'>
+    <MetadataProvider id='DynamicHttpMetadataResolver' xsi:type='DynamicHttpMetadataProvider' removeIdleEntityData='true' maxConnectionsTotal='100' maxConnectionsPerRoute='100' connectionRequestTimeout='PT5S' connectionTimeout='PT5S' socketTimeout='PT5S'>
         <MetadataQueryProtocol>http://mdq-beta.incommon.org/global</MetadataQueryProtocol>
-        <MetadataFilter xsi:type="EntityAttributes">
+        <MetadataFilter xsi:type='EntityAttributes'>
             <AttributeFilterScript>
                 <Script>
                     <![CDATA[
-            (function (attribute) {
+(function (attribute) {
                 "use strict";
                 var namespaces = ["http://shibboleth.net/ns/profiles"];
                 // check the parameter