[java-identity-provider] 02/03: Stop using deprecated syntextr in test

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1c29dff7f05ca0e12941455d90d1f82a3bf12523

commit 1c29dff7f05ca0e12941455d90d1f82a3bf12523
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 1 14:27:35 2019 +0000

    Stop using deprecated syntextr in test
---
 idp-conf/src/test/resources/conf/global.xml           |  8 ++++++++
 .../src/test/resources/conf/metadata-providers.xml    | 19 ++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/idp-conf/src/test/resources/conf/global.xml b/idp-conf/src/test/resources/conf/global.xml
index 4454031..93548df 100644
--- a/idp-conf/src/test/resources/conf/global.xml
+++ b/idp-conf/src/test/resources/conf/global.xml
@@ -58,5 +58,13 @@
 	<jdbc:embedded-database id="testbed.PairwiseIdDataSource" generate-name="true">
 	    <jdbc:script location="classpath:/META-INF/net/shibboleth/idp/StoredIdStore.sql"/>
 	</jdbc:embedded-database>
+    
+    <bean id="exampleMetadata" class="org.springframework.core.io.ClassPathResource">
+        <constructor-arg value="/metadata/example-metadata.xml"/>
+    </bean>
+          
+    <bean id="exampleMetadata-sp123" class="org.springframework.core.io.ClassPathResource">
+        <constructor-arg value="/metadata/example-sp123-metadata.xml"/>
+    </bean>
       
 </beans>
diff --git a/idp-conf/src/test/resources/conf/metadata-providers.xml b/idp-conf/src/test/resources/conf/metadata-providers.xml
index aeca791..8ccc67c 100644
--- a/idp-conf/src/test/resources/conf/metadata-providers.xml
+++ b/idp-conf/src/test/resources/conf/metadata-providers.xml
@@ -1,14 +1,10 @@
 <?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:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    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 
+    xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:security="urn:mace:shibboleth:2.0:security"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
                         urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd
                         urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
@@ -20,7 +16,7 @@
 
 	<!-- Example metadata provider. -->
 
-    <MetadataProvider id="URLMD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M" indexesRef="testbed.MetadataIndexes">
+    <MetadataProvider id="URLMD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M" indexesRef="testbed.MetadataIndexes" resourceRef="exampleMetadata">
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="false"> <!-- TODO -->
             <PublicKey>
                 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
@@ -49,11 +45,8 @@
             </saml:Attribute>
             <Entity>https://sp.example.org</Entity>
         </MetadataFilter>
-        <MetadataResource xsi:type="resource:ClasspathResource" file="/metadata/example-metadata.xml" />
     </MetadataProvider>
 
-    <MetadataProvider id="SP123MD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M" indexesRef="testbed.MetadataIndexes">
-        <MetadataResource xsi:type="resource:ClasspathResource" file="/metadata/example-sp123-metadata.xml" />
-    </MetadataProvider>
+    <MetadataProvider id="SP123MD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M" indexesRef="testbed.MetadataIndexes" resourceRef="exampleMetadata"/>
 
 </MetadataProvider>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.