Skip to content

Commit

Permalink
Change conventions for naming of Xalan extensions for generic process…
Browse files Browse the repository at this point in the history
…ing of SAML metadata. Extract those (and their tests) out into a separate project and replace them in this project by the corresponding built .jar file.
  • Loading branch information
iay committed Aug 20, 2009
1 parent b2b38a7 commit 480c28b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 16 deletions.
3 changes: 0 additions & 3 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="test-bin" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="lib" path="tools/xalan/lib/joda-time-1.6.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
4 changes: 2 additions & 2 deletions build/check.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
xmlns:set="http://exslt.org/sets"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
xmlns:ukfxMail="xalan://uk.org.ukfederation.xalan.Mail"
xmlns:mdxMail="xalan://uk.ac.sdss.xalan.md.Mail"
xmlns:ukfxm="xalan://uk.org.ukfederation.xalan.Members"
xmlns="urn:oasis:names:tc:SAML:2.0:metadata">

Expand Down Expand Up @@ -235,7 +235,7 @@
<!--
Check for badly formatted e-mail addresses.
-->
<xsl:template match="md:EmailAddress[ukfxMail:dodgyAddress(.)]">
<xsl:template match="md:EmailAddress[mdxMail:dodgyAddress(.)]">
<xsl:call-template name="fatal">
<xsl:with-param name="m">badly formatted e-mail address: '<xsl:value-of select='.'/>'</xsl:with-param>
</xsl:call-template>
Expand Down
10 changes: 5 additions & 5 deletions build/import.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"

xmlns:ukfxd="xalan://uk.org.ukfederation.xalan.Dates"
xmlns:ukftu="xalan://uk.org.ukfederation.xalan.TextUtils"
extension-element-prefixes="ukfxd ukftu"
xmlns:mdxDates="xalan://uk.ac.sdss.xalan.md.Dates"
xmlns:mdxTextUtils="xalan://uk.ac.sdss.xalan.md.TextUtils"
extension-element-prefixes="mdxDates mdxTextUtils"

xmlns:xalan="http://xml.apache.org/xalan"

Expand Down Expand Up @@ -116,7 +116,7 @@
-->
<ukfedlabel:Software name="Shibboleth"
version="2" fullVersion="*** FILL IN OR REMOVE ***">
<xsl:attribute name="date"><xsl:value-of select="ukfxd:date()"/></xsl:attribute>
<xsl:attribute name="date"><xsl:value-of select="mdxDates:date()"/></xsl:attribute>
</ukfedlabel:Software>

<!--
Expand Down Expand Up @@ -329,7 +329,7 @@
<xsl:template match="ds:X509Certificate">
<xsl:element name="ds:X509Certificate">
<xsl:text>&#10;</xsl:text>
<xsl:value-of select="ukftu:wrapBase64(.)"/>
<xsl:value-of select="mdxTextUtils:wrapBase64(.)"/>
<xsl:text>&#10;</xsl:text>
</xsl:element>
</xsl:template>
Expand Down
6 changes: 3 additions & 3 deletions build/uk_master_test.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"

xmlns:date="http://exslt.org/dates-and-times"
xmlns:ukfxd="xalan://uk.org.ukfederation.xalan.Dates"
extension-element-prefixes="date ukfxd"
xmlns:mdxDates="xalan://uk.ac.sdss.xalan.md.Dates"
extension-element-prefixes="date mdxDates"

xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
exclude-result-prefixes="wayf">
Expand All @@ -40,7 +40,7 @@
<xsl:variable name="validityDays" select="14"/>

<xsl:variable name="now" select="date:date-time()"/>
<xsl:variable name="validUntil" select="ukfxd:dateAdd($now, $validityDays)"/>
<xsl:variable name="validUntil" select="mdxDates:dateAdd($now, $validityDays)"/>

<!--
Document root.
Expand Down
6 changes: 3 additions & 3 deletions build/uk_master_unsigned.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"

xmlns:date="http://exslt.org/dates-and-times"
xmlns:ukfxd="xalan://uk.org.ukfederation.xalan.Dates"
extension-element-prefixes="date ukfxd"
xmlns:mdxDates="xalan://uk.ac.sdss.xalan.md.Dates"
extension-element-prefixes="date mdxDates"

xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
exclude-result-prefixes="wayf">
Expand All @@ -37,7 +37,7 @@
<xsl:variable name="validityDays" select="21"/>

<xsl:variable name="now" select="date:date-time()"/>
<xsl:variable name="validUntil" select="ukfxd:dateAdd($now, $validityDays)"/>
<xsl:variable name="validUntil" select="mdxDates:dateAdd($now, $validityDays)"/>

<!--
Document root.
Expand Down
Binary file added tools/xalan/lib/sdss-xalan-md-1.0.jar
Binary file not shown.

0 comments on commit 480c28b

Please sign in to comment.