diff --git a/build.xml b/build.xml index 14f6f77b..017b8722 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. --> - + - - + @@ -40,8 +39,7 @@ - + @@ -53,23 +51,16 @@ - - - - - - - + - + - + @@ -79,8 +70,7 @@ Any registrationAuthority already present on an entity in this channel must match the known registration authority value. --> - + @@ -94,8 +84,7 @@ Provide a default registrationAuthority appropriate to this channel. --> - + @@ -106,8 +95,7 @@ - + @@ -129,8 +117,7 @@ - + diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml index 0a7547ff..cc7897d1 100644 --- a/mdx/at_aconet/verbs.xml +++ b/mdx/at_aconet/verbs.xml @@ -22,8 +22,7 @@ --> - + @@ -31,8 +30,7 @@ - + @@ -43,8 +41,7 @@ - + @@ -53,8 +50,7 @@ - + @@ -65,8 +61,7 @@ - + @@ -75,15 +70,13 @@ - + - + @@ -97,9 +90,8 @@ Remove a specific entity we know has a problem that it will take a while to resolve. --> - diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml index 75a591b5..fb9a6905 100644 --- a/mdx/common-beans.xml +++ b/mdx/common-beans.xml @@ -34,25 +34,18 @@ - - + + + 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,48 +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"/> - + - + + + - - - - + @@ -577,9 +580,8 @@ but takes no action on them. --> - + class="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage"> + #{T(net.shibboleth.metadata.ErrorStatus)} @@ -594,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)} @@ -610,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)} @@ -626,8 +626,7 @@ Announce any errors or warnings encountered, then remove any items that had errors. Items with warnings are retained. --> - + @@ -642,8 +641,7 @@ A pipeline stage that checks for any errors, and then announces and filters any encountered. --> - + @@ -681,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"/> @@ -711,52 +705,42 @@ --> @@ -774,8 +758,7 @@ Populate RegistrationAuthority values from entities. --> + class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage"/> - - - - - - - + @@ -813,7 +791,6 @@