[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/metadata/resolver/impl/AbstractM...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar 24 12:02:51 2014
New Revision: 3726

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3726&view=rev
Log:
IDP-277 Default requireMetadata valid to the system default.  This in turn requires a fix to some input metadata to let the test complete.  Turn up logging for this module and also fix one checkstyle warning.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml
    trunk/opensaml-saml-impl/src/test/resources/logback-test.xml

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java?rev=3726&r1=3725&r2=3726&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java Mon Mar 24 12:02:51 2014
@@ -88,6 +88,7 @@
     /** Constructor. */
     public AbstractMetadataResolver() {
         failFastInitialization = true;
+        requireValidMetadata = true;
         unmarshallerFactory = XMLObjectProviderRegistrySupport.getUnmarshallerFactory();
         setId(UUID.randomUUID().toString());
     }
@@ -254,8 +255,8 @@
         } finally {
             try {
                 metadataInput.close();
-            } catch (IOException e) {
-                // ignore
+            } catch (IOException e2) {
+                log.debug("Failed to close input: {}", e2);
             }
         }
     }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java?rev=3726&r1=3725&r2=3726&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java Mon Mar 24 12:02:51 2014
@@ -30,8 +30,6 @@
 import org.opensaml.saml.common.xml.SAMLSchemaBuilder.SAML1Version;
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.impl.SchemaValidationFilter;
-import org.opensaml.saml.metadata.resolver.impl.ChainingMetadataResolver;
-import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;

Modified: trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml?rev=3726&r1=3725&r2=3726&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml (original)
+++ trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml Mon Mar 24 12:02:51 2014
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:switch.ch:SWITCHaai" validUntil="2010-01-01T00:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:switch.ch:SWITCHaai" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<!--  NOTE the signature on this file is now invalid -->
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>


[... 17 lines stripped ...]