From b75fc3eff8d9ee0c61daf0fe03b4fabbb9d270d2 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Tue, 29 Nov 2016 11:36:33 +0000 Subject: [PATCH] Adjust fragment normalisation for new repository structure --- utilities/normalise_all_fragments | 2 +- utilities/normalise_fragment | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/utilities/normalise_all_fragments b/utilities/normalise_all_fragments index 371cb0be..f19c6496 100755 --- a/utilities/normalise_all_fragments +++ b/utilities/normalise_all_fragments @@ -1,4 +1,4 @@ #!/bin/bash -find ../entities -name uk\*.xml \ +find ../../ukf-data/entities -name uk\*.xml \ -exec python normalise_fragment \{\} \; diff --git a/utilities/normalise_fragment b/utilities/normalise_fragment index 06f58582..d2a23c31 100755 --- a/utilities/normalise_fragment +++ b/utilities/normalise_fragment @@ -56,20 +56,20 @@ ED_TEMPLATE = Template(''' xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata ../xml/saml-schema-metadata-2.0.xsd - urn:oasis:names:tc:SAML:metadata:algsupport ../xml/sstc-saml-metadata-algsupport-v1.0.xsd - urn:oasis:names:tc:SAML:metadata:attribute ../xml/sstc-metadata-attr.xsd - urn:oasis:names:tc:SAML:metadata:rpi ../xml/saml-metadata-rpi-v1.0.xsd - urn:oasis:names:tc:SAML:metadata:ui ../xml/sstc-saml-metadata-ui-v1.0.xsd - urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol ../xml/sstc-saml-idp-discovery.xsd - urn:oasis:names:tc:SAML:profiles:SSO:request-init ../xml/sstc-request-initiation.xsd - urn:oasis:names:tc:SAML:2.0:assertion ../xml/saml-schema-assertion-2.0.xsd - urn:mace:shibboleth:metadata:1.0 ../xml/shibboleth-metadata-1.0.xsd - http://ukfederation.org.uk/2006/11/label ../xml/uk-fed-label.xsd - http://sdss.ac.uk/2006/06/WAYF ../xml/uk-wayf.xsd - http://www.w3.org/2001/04/xmlenc# ../xml/xenc-schema.xsd - http://www.w3.org/2009/xmlenc11# ../xml/xenc-schema-11.xsd - http://www.w3.org/2000/09/xmldsig# ../xml/xmldsig-core-schema.xsd" + xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd + urn:oasis:names:tc:SAML:metadata:algsupport sstc-saml-metadata-algsupport-v1.0.xsd + urn:oasis:names:tc:SAML:metadata:attribute sstc-metadata-attr.xsd + urn:oasis:names:tc:SAML:metadata:rpi saml-metadata-rpi-v1.0.xsd + urn:oasis:names:tc:SAML:metadata:ui sstc-saml-metadata-ui-v1.0.xsd + urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol sstc-saml-idp-discovery.xsd + urn:oasis:names:tc:SAML:profiles:SSO:request-init sstc-request-initiation.xsd + urn:oasis:names:tc:SAML:2.0:assertion saml-schema-assertion-2.0.xsd + urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd + http://ukfederation.org.uk/2006/11/label uk-fed-label.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" ID="${ID}" entityID="${entityID}"> ''')