Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Abolish WAYF namespace 
See ukf/ukf-meta#71.
@iay
iay committed May 2, 2017
1 parent 3eea6b4 commit a6155f9
Showing 28 changed files with 12 additions and 182 deletions.
3 changes: 1 addition & 2 deletions attic/extract_entityids.xsl
View file
@@ -14,8 +14,7 @@
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
exclude-result-prefixes="md ds wayf">
exclude-result-prefixes="md ds">

<!-- Output is plain text -->
<xsl:output method="text"/>
3 changes: 1 addition & 2 deletions build/extract_addresses.xsl
View file
@@ -15,8 +15,7 @@
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
exclude-result-prefixes="md ds wayf">
exclude-result-prefixes="md ds">

<!--Force UTF-8 encoding for the output.-->
<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
3 changes: 1 addition & 2 deletions build/extract_locs.xsl
View file
@@ -14,8 +14,7 @@
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
exclude-result-prefixes="md ds wayf">
exclude-result-prefixes="md ds">

<!-- Output is plain text -->
<xsl:output method="text"/>
3 changes: 1 addition & 2 deletions build/extract_nk_nocert_locs.xsl
View file
@@ -15,8 +15,7 @@
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
exclude-result-prefixes="md ds wayf">
exclude-result-prefixes="md ds">

<!-- Output is plain text -->
<xsl:output method="text"/>
3 changes: 1 addition & 2 deletions build/extract_nocert_locs.xsl
View file
@@ -15,8 +15,7 @@
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
exclude-result-prefixes="md ds wayf">
exclude-result-prefixes="md ds">

<!-- Output is plain text -->
<xsl:output method="text"/>
1 change: 0 additions & 1 deletion mdx/_rules/check_future_0.xsl
View file
@@ -17,7 +17,6 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:set="http://exslt.org/sets"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"

1 change: 0 additions & 1 deletion mdx/_rules/check_future_1.xsl
View file
@@ -17,7 +17,6 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:set="http://exslt.org/sets"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"

1 change: 0 additions & 1 deletion mdx/_rules/check_future_2.xsl
View file
@@ -17,7 +17,6 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:set="http://exslt.org/sets"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"

1 change: 0 additions & 1 deletion mdx/_rules/check_future_3.xsl
View file
@@ -17,7 +17,6 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:set="http://exslt.org/sets"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"

1 change: 0 additions & 1 deletion mdx/_rules/check_future_4.xsl
View file
@@ -17,7 +17,6 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:set="http://exslt.org/sets"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"

5 changes: 0 additions & 5 deletions mdx/_rules/check_namespaces.xsl
View file
@@ -22,7 +22,6 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -86,10 +85,6 @@
<xsl:apply-templates/>
</xsl:template>

<xsl:template match="wayf:*">
<xsl:apply-templates/>
</xsl:template>

<xsl:template match="xenc:*">
<xsl:apply-templates/>
</xsl:template>
46 changes: 0 additions & 46 deletions mdx/_rules/check_uk_wayf.xsl
View file

This file was deleted.

14 changes: 0 additions & 14 deletions mdx/common-beans.xml
View file
@@ -170,7 +170,6 @@
<bean id="samlp_namespace" parent="String" c:_="urn:oasis:names:tc:SAML:2.0:protocol"/>
<bean id="shibmd_namespace" parent="String" c:_="urn:mace:shibboleth:metadata:1.0"/>
<bean id="ukfedlabel_namespace" parent="String" c:_="http://ukfederation.org.uk/2006/11/label"/>
<bean id="wayf_namespace" parent="String" c:_="http://sdss.ac.uk/2006/06/WAYF"/>
<bean id="xenc_namespace" parent="String" c:_="http://www.w3.org/2001/04/xmlenc#"/>
<bean id="xenc11_namespace" parent="String" c:_="http://www.w3.org/2009/xmlenc11#"/>
<bean id="xml_namespace" parent="String" c:_="http://www.w3.org/XML/1998/namespace"/>
@@ -203,7 +202,6 @@
<entry key="samlp" value-ref="samlp_namespace"/>
<entry key="shibmd" value-ref="shibmd_namespace"/>
<entry key="ukfedlabel" value-ref="ukfedlabel_namespace"/>
<entry key="wayf" value-ref="wayf_namespace"/>
<entry key="xenc" value-ref="xenc_namespace"/>
<entry key="xenc11" value-ref="xenc11_namespace"/>
<entry key="xs" value-ref="xs_namespace"/>
@@ -261,14 +259,6 @@
<bean id="stripUkfedlabelNamespace" parent="mda.NamespaceStrippingStage"
p:namespace-ref="ukfedlabel_namespace"/>

<!--
stripWayfNamespace
Remove the UK federation WAYF namespace.
-->
<bean id="stripWayfNamespace" parent="mda.NamespaceStrippingStage"
p:namespace-ref="wayf_namespace"/>

<!--
normaliseNamespaces
@@ -857,10 +847,6 @@
<!-- no imports -->
<constructor-arg value="schema/uk-fed-label.xsd"/>
</bean>
<bean parent="ClassPathResource">
<!-- no imports -->
<constructor-arg value="schema/uk-wayf.xsd"/>
</bean>
<bean parent="ClassPathResource">
<!-- imports xenc-schema.xsd -->
<constructor-arg value="schema/ws-authorization.xsd"/>
7 changes: 0 additions & 7 deletions mdx/ns_norm.xsl
View file
@@ -45,7 +45,6 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"

exclude-result-prefixes="md"
@@ -179,12 +178,6 @@
<xsl:apply-templates select="node()|@*"/>
</xsl:element>
</xsl:template>

<xsl:template match="wayf:*">
<xsl:element name="wayf:{local-name()}">
<xsl:apply-templates select="node()|@*"/>
</xsl:element>
</xsl:template>

<xsl:template match="xenc:*">
<xsl:element name="xenc:{local-name()}">
39 changes: 0 additions & 39 deletions mdx/schema/uk-wayf.xsd
View file

This file was deleted.

25 changes: 0 additions & 25 deletions mdx/uk/beans.xml
View file
@@ -284,31 +284,6 @@
<ref bean="uk_default_regauth"/>
<ref bean="populateRegistrationAuthorities"/>

<!--
Add REFEDS Hide from Discovery category as a standardised
equivalent to our HideFromWAYF element.
-->
<bean id="uk_addHideFromDiscovery" parent="mda.SplitMergeStage">
<!-- select entities with HideFromWayf label -->
<property name="selectionStrategy">
<bean parent="mda.XPathItemSelectionStrategy">
<constructor-arg value="/md:EntityDescriptor[md:Extensions/wayf:HideFromWAYF]"/>
<constructor-arg ref="commonNamespaces"/>
</bean>
</property>

<property name="selectedItemPipeline">
<bean id="selectedItemPipeline" parent="mda.SimplePipeline">
<property name="stages">
<bean id="addHideFromDiscovery" parent="ukf.EntityAttributeAddingStage"
p:attributeValue="http://refeds.org/category/hide-from-discovery"
p:addingFirstChild="true"/>
</property>
</bean>
</property>

</bean>

<ref bean="checkSchemas"/>
<ref bean="CHECK_std"/>
<bean id="check_ukfedlabel" parent="mda.XSLValidationStage"
6 changes: 0 additions & 6 deletions mdx/uk/generate.xml
View file
@@ -269,7 +269,6 @@
<ref bean="errorTerminatingFilter"/>

<ref bean="uk_assemble"/>
<ref bean="stripWayfNamespace"/>
<ref bean="uk_finaliseProduction"/>
<ref bean="uk_normaliseNamespaces"/>

@@ -376,7 +375,6 @@
<ref bean="stripMdattrNamespace"/>
<ref bean="stripMdrpiNamespace"/>
<ref bean="stripUkfedlabelNamespace"/>
<ref bean="stripWayfNamespace"/>

<ref bean="stripArtifactResolutionService"/>
<ref bean="stripAttributeAuthorityDescriptor"/>
@@ -508,7 +506,6 @@
<ref bean="errorTerminatingFilter"/>

<ref bean="uk_assemble"/>
<ref bean="stripWayfNamespace"/>
<ref bean="stripEmptyExtensions"/>
<ref bean="uk_finaliseFallback"/>
<ref bean="uk_normaliseFallback"/>
@@ -561,7 +558,6 @@
<ref bean="errorTerminatingFilter"/>

<ref bean="uk_assemble"/>
<ref bean="stripWayfNamespace"/>
<ref bean="uk_finaliseTest"/>
<ref bean="uk_normaliseTest"/>

@@ -683,7 +679,6 @@
<ref bean="errorTerminatingFilter"/>

<ref bean="stripUkfedlabelNamespace"/>
<ref bean="stripWayfNamespace"/>
<ref bean="uk_assemble"/>
<ref bean="stripEntityScopes"/>
<ref bean="stripEmptyExtensions"/>
@@ -799,7 +794,6 @@
<ref bean="errorTerminatingFilter"/>

<ref bean="stripUkfedlabelNamespace"/>
<ref bean="stripWayfNamespace"/>
<ref bean="uk_assemble"/>
<ref bean="stripEntityScopes"/>
<ref bean="stripEmptyExtensions"/>
1 change: 0 additions & 1 deletion mdx/uk/import.xsl
View file
@@ -75,7 +75,6 @@
urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd
http://ukfederation.org.uk/2006/11/label uk-fed-label.xsd
http://refeds.org/metadata refeds-metadata.xsd
http://sdss.ac.uk/2006/06/WAYF uk-wayf.xsd
http://www.w3.org/2001/04/xmlenc# xenc-schema.xsd
http://www.w3.org/2009/xmlenc11# xenc-schema-11.xsd
http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
3 changes: 1 addition & 2 deletions mdx/uk/ns_norm_back.xsl
View file
@@ -37,11 +37,10 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"

exclude-result-prefixes="alg md wayf xenc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
exclude-result-prefixes="alg md xenc"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="urn:oasis:names:tc:SAML:2.0:metadata">

3 changes: 1 addition & 2 deletions mdx/uk/ns_norm_cds.xsl
View file
@@ -20,9 +20,8 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"

exclude-result-prefixes="alg ds init md mdattr saml shibmd ukfedlabel wayf xsi"
exclude-result-prefixes="alg ds init md mdattr saml shibmd ukfedlabel xsi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
3 changes: 1 addition & 2 deletions mdx/uk/ns_norm_export.xsl
View file
@@ -31,10 +31,9 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"

exclude-result-prefixes="alg md ukfedlabel wayf xenc"
exclude-result-prefixes="alg md ukfedlabel xenc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
3 changes: 1 addition & 2 deletions mdx/uk/ns_norm_export_preview.xsl
View file
@@ -31,10 +31,9 @@
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"

exclude-result-prefixes="alg md ukfedlabel wayf xenc"
exclude-result-prefixes="alg md ukfedlabel xenc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="urn:oasis:names:tc:SAML:2.0:metadata">

0 comments on commit a6155f9

Please sign in to comment.