Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove trailing white space from XML files
See ukf/ukf-meta#134.
iay committed Jun 19, 2017
1 parent 1a6656a commit c099e63
Showing 129 changed files with 1,786 additions and 1,786 deletions.
6 changes: 3 additions & 3 deletions attic/extract_entityids.xsl
@@ -2,10 +2,10 @@
<!--
extract_entityids.xsl
XSL stylesheet that takes a SAML 2.0 metadata file and extracts
a list of entity IDs.
Author: Ian A. Young <ian@iay.org.uk>
-->
@@ -23,7 +23,7 @@
<xsl:value-of select="@entityID"/>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<xsl:template match="text()">
<!-- do nothing -->
</xsl:template>
8 changes: 4 additions & 4 deletions attic/extract_member_dates.xsl
@@ -2,10 +2,10 @@
<!--
extract_member_dates.xsl
XSL stylesheet that takes the UK federation members.xml file ane extracts
member names and joining dates in a format suitable for updating.
Author: Ian A. Young <ian@iay.org.uk>
-->
@@ -16,7 +16,7 @@

<!-- Output is plain text -->
<xsl:output method="text"/>

<xsl:template match="ukfm:Member">
<xsl:value-of select="ukfm:JoinDate"/>
<xsl:text>,"</xsl:text>
@@ -30,5 +30,5 @@
<xsl:template match="text()">
<!-- do nothing -->
</xsl:template>

</xsl:stylesheet>
10 changes: 5 additions & 5 deletions attic/extract_saml2sp.xsl
@@ -2,10 +2,10 @@
<!--
extract_saml2sp.xsl
XSL stylesheet that takes a SAML 2.0 metadata aggregate and extracts
SAML 2.0 support information for each SP entity.
Author: Ian A. Young <ian@iay.org.uk>
-->
@@ -18,7 +18,7 @@

<!-- Output is plain text -->
<xsl:output method="text"/>

<xsl:template match="//md:EntityDescriptor[md:SPSSODescriptor]">
<xsl:value-of select="@ID"/>
<xsl:text> </xsl:text>
@@ -29,9 +29,9 @@
</xsl:choose>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<xsl:template match="text()">
<!-- do nothing -->
</xsl:template>

</xsl:stylesheet>
10 changes: 5 additions & 5 deletions attic/identity.xsl
@@ -2,9 +2,9 @@
<!--
identity.xsl
Identity transform.
Author: Ian A. Young <ian@iay.org.uk>
-->
@@ -14,17 +14,17 @@
Force UTF-8 encoding for the output.
-->
<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"/>

<!--By default, copy text blocks, comments and attributes unchanged.-->
<xsl:template match="text()|comment()|@*">
<xsl:copy/>
</xsl:template>

<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
<xsl:template match="*">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
</xsl:copy>
</xsl:template>

</xsl:stylesheet>
20 changes: 10 additions & 10 deletions attic/members_domains.xsl
@@ -2,29 +2,29 @@
<!--
members_domains.xsl
Update members.xml to use Domain and PrimaryScope instead of
Scopes and isPrimary.
Author: Ian A. Young <ian@iay.org.uk>
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:members="http://ukfederation.org.uk/2007/01/members"
xmlns:xalan="http://xml.apache.org/xalan"

exclude-result-prefixes="members xalan"
xmlns="http://ukfederation.org.uk/2007/01/members"
>

<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"
indent="yes" xalan:indent-amount="4"
/>

<!--
If a Scopes element has an isPrimary Scope, extract that
as the domain and primary scope for the member.
The result may not be schema-valid if the Scopes element is not
the first one belonging to the member: duplicate Domains elements
need to be removed, and misplaced Domains elements may need
@@ -43,7 +43,7 @@
Delete the Scopes element entirely if:
* it contains only one Scope, and
* it contains no Entity elements
In other words, retain it if:
* it contains more than one Scope, or
* it contains any Entity elements
@@ -55,24 +55,24 @@
</xsl:copy>
</xsl:if>
</xsl:template>

<!--
Remove any remaining isPrimary attributes.
-->
<xsl:template match="@isPrimary">
<!-- do nothing -->
</xsl:template>

<!--By default, copy text blocks, comments and attributes unchanged.-->
<xsl:template match="text()|comment()|@*">
<xsl:copy/>
</xsl:template>

<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
<xsl:template match="*">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
</xsl:copy>
</xsl:template>

</xsl:stylesheet>
10 changes: 5 additions & 5 deletions build.xml
@@ -522,7 +522,7 @@
fs.tar.mdqcache">
<echo>Stage 4 Success: MDQ cache created; all files comitted to data repository.</echo>
</target>

<!--
Stage 4.2 of md process: Copy files from keymaster, push.
@@ -549,7 +549,7 @@
Runs on: orchestrator
* Git: Create New Tag
* Git: Push to origin
* SCP: Copy mdq cache to repo
* SCP: Copy mdq cache to repo
* Jenkins: Trigger publish task
-->
<target name="process.bagandtag" depends="
@@ -1187,7 +1187,7 @@
<delete file="${temp.xml}" quiet="true" verbose="false"/>
</sequential>
</macrodef>

<!--
Verify a metadata file held on the master distribution site, using the ukfederation-mdq.pem key
-->
@@ -1706,7 +1706,7 @@
</XMLSECTOOL>
</sequential>
</macrodef>

<macrodef name="XMLSECTOOL.VFY.MDQ.uk">
<attribute name="i"/><!-- input file -->
<sequential>
@@ -2322,7 +2322,7 @@
<CHANNEL.do channel="uk" verb="statistics"/>
<fixcrlf file="${output.dir}/${mdaggr.stats}" eol="lf" encoding="UTF-8"/>
</target>

<!--
This variant generates a much simpler file, intended for use when building the
monthly chart pack.
12 changes: 6 additions & 6 deletions build/extract_addresses.xsl
@@ -2,11 +2,11 @@
<!--
extract_addresses.xsl
XSL stylesheet that takes a SAML 2.0 metadata file and extracts
a list of contact e-mail addresses. Only administrative and
technical addresses are used; all others are dropped.
Author: Ian A. Young <ian@iay.org.uk>
-->
@@ -25,21 +25,21 @@
<xsl:apply-templates select="md:EntityDescriptor/md:ContactPerson"/>
</Addresses>
</xsl:template>

<xsl:template match="md:ContactPerson[@contactType='support']">
<!-- do nothing -->
</xsl:template>

<xsl:template match="md:ContactPerson">
<xsl:apply-templates select="md:EmailAddress"/>
</xsl:template>

<xsl:template match="md:EmailAddress">
<EmailAddress><xsl:value-of select="."/></EmailAddress>
</xsl:template>
<!--By default, copy text blocks, comments and attributes unchanged.-->
<xsl:template match="text()|@*">
<xsl:copy/>
</xsl:template>

</xsl:stylesheet>
8 changes: 4 additions & 4 deletions build/extract_cert_locs.xsl
@@ -2,11 +2,11 @@
<!--
extract_cert_locs.xsl
XSL stylesheet that takes a SAML 2.0 metadata file and extracts
a list of service locations that require certificates to be
presented to them.
Author: Ian A. Young <ian@iay.org.uk>
-->
@@ -23,7 +23,7 @@
<xsl:value-of select="@Location"/>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<!--
ArtifactResolutionService endpoints on IdPs are assumed to be
authenticated by TLS; those on SPs are assumed to be authenticated
@@ -33,7 +33,7 @@
<xsl:value-of select="@Location"/>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<xsl:template match="text()">
<!-- do nothing -->
</xsl:template>
6 changes: 3 additions & 3 deletions build/extract_embedded.xsl
@@ -2,14 +2,14 @@
<!--
extract_embedded.xsl
XSL stylesheet that takes a SAML 2.0 metadata file and extracts
all embedded certificates on entities in the form of a series of
PEM certificate blocks.
A descriptive comment is added to indicate the entity in question and
the KeyName used (if any) so that later processing can distinguish.
Author: Ian A. Young <ian@iay.org.uk>
-->
12 changes: 6 additions & 6 deletions build/extract_locs.xsl
@@ -2,10 +2,10 @@
<!--
extract_locs.xsl
XSL stylesheet that takes a SAML 2.0 metadata file and extracts
a list of service locations that will have TLS certificates.
Author: Ian A. Young <ian@iay.org.uk>
-->
@@ -23,22 +23,22 @@
<xsl:value-of select="@Location"/>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<xsl:template match="//md:ArtifactResolutionService">
<xsl:value-of select="@Location"/>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<xsl:template match="//md:SingleSignOnService">
<xsl:value-of select="@Location"/>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<xsl:template match="//md:AssertionConsumerService">
<xsl:value-of select="@Location"/>
<xsl:text>&#x0a;</xsl:text>
</xsl:template>

<xsl:template match="text()">
<!-- do nothing -->
</xsl:template>

0 comments on commit c099e63

Please sign in to comment.