[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/rel...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 18 15:04:30 2014
New Revision: 6934

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6934&view=rev
Log:
Fix tests, a %{} placeholder override was added?

Modified:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata.xml

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml?rev=6934&r1=6933&r2=6934&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml Tue Nov 18 15:04:30 2014
@@ -5,8 +5,8 @@
                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
 
     requireValidMetadata="false" failFastInitialization="false"
-    id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="${DIR}/filter/metadata.switchaai_signed.xml">
+    id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
     
-    <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" certificateFile="${DIR}/filter/switch.pem"/>
+    <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" certificateFile="%{DIR}/filter/switch.pem"/>
     
 </metadata:MetadataProvider>

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml?rev=6934&r1=6933&r2=6934&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml Tue Nov 18 15:04:30 2014
@@ -5,7 +5,7 @@
                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
 
     requireValidMetadata="false" failFastInitialization="false"
-    id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="${DIR}/filter/metadata.switchaai_signed.xml">
+    id="signed" xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
     
     <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" >
     <metadata:PublicKey>

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml?rev=6934&r1=6933&r2=6934&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml Tue Nov 18 15:04:30 2014
@@ -7,14 +7,14 @@
                         urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
 
 	requireValidMetadata="false" failFastInitialization="false" id="signed"
-	xsi:type="metadata:FilesystemMetadataProvider" metadataFile="${DIR}/filter/metadata.switchaai_signed.xml">
+	xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
 
 	<metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
 		trustEngineRef="MyTrustEngine" />
 
 	<security:TrustEngine id="MyTrustEngine" xsi:type="security:StaticExplicitKeySignature">

[... 22 lines stripped ...]