diff --git a/build.xml b/build.xml index 8940b354..2dcd0db2 100644 --- a/build.xml +++ b/build.xml @@ -83,7 +83,8 @@ --> - + + @@ -461,9 +462,8 @@ The individual properties listed here can be augmented or overridden by properties defined in the external properties files, e.g., build.properties. --> - + - - - + + + class="net.shibboleth.ext.spring.resource.HTTPResource"/> + class="net.shibboleth.metadata.dom.saml.mdrpi.EntityRegistrationAuthorityFilterStage"/> - + class="net.shibboleth.ext.spring.factory.DOMDocumentFactoryBean"/> @@ -253,9 +245,15 @@ + + + + @@ -268,51 +266,52 @@ - - - + - - - - - + class="net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage"/> + - + class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategoryMatcher"/> + - + class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategorySupportMatcher"/> + - - - + class="net.shibboleth.metadata.dom.saml.mdattr.MultiPredicateMatcher"/> + + class="net.shibboleth.metadata.dom.saml.mdattr.RegistrationAuthorityMatcher"/> - + + + - - + class="net.shibboleth.metadata.validate.x509.X509RSAExponentValidator"/> + class="net.shibboleth.metadata.validate.x509.X509RSAKeyLengthValidator"/> + class="net.shibboleth.metadata.validate.x509.X509RSAOpenSSLBlacklistValidator"/> + + + + + + + + + + + + p:namespace-ref="alg_namespace"/> + p:namespace-ref="idpdisc_namespace"/> + p:namespace-ref="init_namespace"/> + p:namespace-ref="mdattr_namespace"/> + p:namespace-ref="mdrpi_namespace"/> + p:namespace-ref="ukfedlabel_namespace"/> + p:namespace-ref="wayf_namespace"/> - - - - - - + p:XSLResource="classpath:ns_norm.xsl"/> - + - + - + class="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage"> + #{T(net.shibboleth.metadata.ErrorStatus)} @@ -604,9 +596,8 @@ This pipeline stage removes any items marked with an error status. --> - + class="net.shibboleth.metadata.pipeline.ItemMetadataFilterStage"> + #{T(net.shibboleth.metadata.ErrorStatus)} @@ -620,9 +611,8 @@ This pipeline stage causes CLI termination if any item is marked with an error status. --> - + class="net.shibboleth.metadata.pipeline.ItemMetadataTerminationStage"> + #{T(net.shibboleth.metadata.ErrorStatus)} @@ -636,8 +626,7 @@ Announce any errors or warnings encountered, then remove any items that had errors. Items with warnings are retained. --> - + @@ -652,8 +641,7 @@ A pipeline stage that checks for any errors, and then announces and filters any encountered. --> - + @@ -691,28 +679,24 @@ Basic EntitiesDescriptor disassembler pipeline stage. --> + class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage"/> + class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"/> + class="net.shibboleth.metadata.dom.saml.EntityDescriptorItemIdPopulationStage"/> @@ -721,52 +705,42 @@ --> @@ -784,8 +758,7 @@ Populate RegistrationAuthority values from entities. --> + class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage"/> - - - - - - - + @@ -823,7 +791,6 @@