[java-identity-provider COMMIT] in /branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spr...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May 18 10:41:01 2016
New Revision: 8247

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8247&view=rev
Log:
Fix tests by merging r8133 back

Modified:
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-file.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-memory.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-none.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-noTrustEngine.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-explicitKey.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-invalidKey.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-invalidPKIX.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-validPKIX-explicitTrustedName.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-validPKIX.xml
    branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicTemplate.xml

Modified: branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-file.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-file.xml?rev=8247&r1=8246&r2=8247&view=diff
==============================================================================
--- branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-file.xml	(original)
+++ branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-file.xml	Wed May 18 10:41:01 2016
@@ -13,8 +13,8 @@
     
     <!-- Note: use of the transformRef here is mostly just to facilitate testing. -->
     <metadata:Template transformRef="digester.SHA1HexLower">
-        http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?view=co
+        http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?view=co
     </metadata:Template>
 
 </metadata:MetadataProvider>
-                                   
+                                   

Modified: branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-memory.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-memory.xml?rev=8247&r1=8246&r2=8247&view=diff
==============================================================================
--- branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-memory.xml	(original)
+++ branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-memory.xml	Wed May 18 10:41:01 2016
@@ -12,8 +12,8 @@
     
     <!-- Note: use of the transformRef here is mostly just to facilitate testing. -->
     <metadata:Template transformRef="digester.SHA1HexLower">
-        http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?view=co
+        http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/org/opensaml/saml/metadata/resolver/impl/${entityID}.xml?view=co
     </metadata:Template>
 
 </metadata:MetadataProvider>
-                                   
+                                   

Modified: branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-none.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-none.xml?rev=8247&r1=8246&r2=8247&view=diff
==============================================================================
--- branches/3.2/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-none.xml	(original)

[... 132 lines stripped ...]