From 4fd95849a086d2ad27b1401642cddcce1e87e263 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Fri, 28 Jun 2013 12:02:18 +0200
Subject: entity-categories added to sp summary space normalized (extra
 newlines removed) SWAMIDOPS-6922

---
 xslt/sp-summary.xslt | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'xslt/sp-summary.xslt')

diff --git a/xslt/sp-summary.xslt b/xslt/sp-summary.xslt
index 2e0981df..8f1e8241 100644
--- a/xslt/sp-summary.xslt
+++ b/xslt/sp-summary.xslt
@@ -5,6 +5,8 @@
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+		xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+		xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
                 xmlns:exsl="http://exslt.org/common"
                 extension-element-prefixes="exsl"
                 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
@@ -26,18 +28,19 @@
   </xsl:template>
 
   <xsl:template match="/md:EntitiesDescriptor">
-    <xsl:text>||EntityID||Service Name||Service Description||Organization||Technical Contact||Administrative Contact||
+    <xsl:text>||EntityID||Service Name||Service Description||Organization||Technical Contact||Administrative Contact||Entity Categories||
 </xsl:text>
     <xsl:apply-templates select="md:EntityDescriptor[md:SPSSODescriptor]"/>
   </xsl:template>
 
   <xsl:template match="md:EntityDescriptor">
-     <xsl:text> | </xsl:text><xsl:value-of select="@entityID"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceName"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceDescription"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:Organization"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='technical']"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='administrative']"/><xsl:text>|
+     <xsl:text> | </xsl:text><xsl:value-of select="@entityID"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceName"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceDescription"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:Organization"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='technical']"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='administrative']"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdattr:EntityAttributes/samla:Attribute[@Name='http://macedir.org/entity-category']/samla:AttributeValue"/><xsl:text> |
 </xsl:text>
   </xsl:template>
 
@@ -46,13 +49,17 @@
   </xsl:template>
 
   <xsl:template match="md:ServiceDescription">
-    <xsl:value-of select="text()"/>
+    <xsl:value-of select="normalize-space(text())"/><xsl:text> </xsl:text>
   </xsl:template>
 
   <xsl:template match="md:ServiceName">
     <xsl:value-of select="text()"/>
   </xsl:template>
 
+  <xsl:template match="samla:AttributeValue">
+    <xsl:value-of select="substring-after(text(),'/category/')"/><xsl:text> </xsl:text>
+  </xsl:template> 
+
   <xsl:template match="md:ContactPerson">
     <xsl:apply-templates select="md:EmailAddress"/><xsl:text> </xsl:text>
   </xsl:template> 
@@ -71,11 +78,11 @@
   </xsl:template>
 
   <xsl:template match="md:OrganizationDisplayName">
-     <xsl:value-of select="text()"/>
+     <xsl:value-of select="normalize-space(text())"/>
   </xsl:template>
 
   <xsl:template match="md:OrganizationURL">
-     <xsl:value-of select="text()"/>
+     <xsl:value-of select="normalize-space(text())"/>
   </xsl:template>
 
   <xsl:template match="shibmd:Scope">
-- 
cgit v1.2.3


From a3a252254dfcddfd492ae01f4a6c4cc3591963b9 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Fri, 28 Jun 2013 12:08:23 +0200
Subject: space added after mail addresses

---
 xslt/sp-summary.xslt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xslt/sp-summary.xslt')

diff --git a/xslt/sp-summary.xslt b/xslt/sp-summary.xslt
index 8f1e8241..c0360ad8 100644
--- a/xslt/sp-summary.xslt
+++ b/xslt/sp-summary.xslt
@@ -74,7 +74,7 @@
   </xsl:template>
 
   <xsl:template match="md:EmailAddress">
-     <xsl:value-of select="text()"/>
+     <xsl:value-of select="text()"/><xsl:text> </xsl:text>
   </xsl:template>
 
   <xsl:template match="md:OrganizationDisplayName">
-- 
cgit v1.2.3


From 793093717acfee2c273c9e00550a68a54b3c93a2 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Fri, 28 Jun 2013 12:39:09 +0200
Subject: replace | with \| in ServiceName

---
 xslt/sp-summary.xslt | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'xslt/sp-summary.xslt')

diff --git a/xslt/sp-summary.xslt b/xslt/sp-summary.xslt
index c0360ad8..7708cf19 100644
--- a/xslt/sp-summary.xslt
+++ b/xslt/sp-summary.xslt
@@ -53,7 +53,11 @@
   </xsl:template>
 
   <xsl:template match="md:ServiceName">
-    <xsl:value-of select="text()"/>
+     <xsl:call-template name="string-replace-all">
+       <xsl:with-param name="text" select="text()" />
+       <xsl:with-param name="replace" select="'|'" />
+       <xsl:with-param name="by" select="'\|'" />
+     </xsl:call-template>
   </xsl:template>
 
   <xsl:template match="samla:AttributeValue">
@@ -93,4 +97,24 @@
   <xsl:template match="*"/>
   <xsl:template match="text()"/>
 
+  <xsl:template name="string-replace-all">
+    <xsl:param name="text" />
+    <xsl:param name="replace" />
+    <xsl:param name="by" />
+    <xsl:choose>
+      <xsl:when test="contains($text, $replace)">
+        <xsl:value-of select="substring-before($text,$replace)" />
+        <xsl:value-of select="$by" />
+        <xsl:call-template name="string-replace-all">
+          <xsl:with-param name="text" select="substring-after($text,$replace)" />
+          <xsl:with-param name="replace" select="$replace" />
+          <xsl:with-param name="by" select="$by" />
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$text" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
-- 
cgit v1.2.3


From d0a9da3a5e1c1935053ff69a2d04c0be29b7dabb Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Fri, 28 Jun 2013 13:03:46 +0200
Subject: do not line-break at - of entity categories, line break between
 entity categories line break between email addresses SWAMIDOPS-6922

---
 xslt/sp-summary.xslt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'xslt/sp-summary.xslt')

diff --git a/xslt/sp-summary.xslt b/xslt/sp-summary.xslt
index 7708cf19..cd16a519 100644
--- a/xslt/sp-summary.xslt
+++ b/xslt/sp-summary.xslt
@@ -61,16 +61,22 @@
   </xsl:template>
 
   <xsl:template match="samla:AttributeValue">
-    <xsl:value-of select="substring-after(text(),'/category/')"/><xsl:text> </xsl:text>
+     <xsl:call-template name="string-replace-all">
+       <xsl:with-param name="text" select="substring-after(text(),'/category/')" />
+       <xsl:with-param name="replace" select="'-'" />
+       <xsl:with-param name="by" select="'&amp;#x2011;'" />
+     </xsl:call-template>
+     <xsl:text>&lt;br/&gt;</xsl:text>
   </xsl:template> 
 
   <xsl:template match="md:ContactPerson">
-    <xsl:apply-templates select="md:EmailAddress"/><xsl:text> </xsl:text>
+    <xsl:apply-templates select="md:EmailAddress"/>
   </xsl:template> 
 
   <xsl:template match="md:Organization">
     <xsl:text>[</xsl:text>
-    <xsl:apply-templates select="md:OrganizationDisplayName[1]"/><xsl:text>|</xsl:text><xsl:apply-templates select="md:OrganizationURL[1]"/><xsl:text>]</xsl:text>
+    <xsl:apply-templates select="md:OrganizationDisplayName[1]"/><xsl:text>|</xsl:text>
+    <xsl:apply-templates select="md:OrganizationURL[1]"/><xsl:text>]</xsl:text>
   </xsl:template>
 
   <xsl:template match="md:SPPSSODescriptor">
@@ -78,7 +84,7 @@
   </xsl:template>
 
   <xsl:template match="md:EmailAddress">
-     <xsl:value-of select="text()"/><xsl:text> </xsl:text>
+     <xsl:value-of select="text()"/><xsl:text>&lt;br/&gt;</xsl:text>
   </xsl:template>
 
   <xsl:template match="md:OrganizationDisplayName">
-- 
cgit v1.2.3


From 54368ff640284e05a307b318d4a13b421177d389 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Fri, 28 Jun 2013 13:07:23 +0200
Subject: confluence uses \\ as <br/>

---
 xslt/sp-summary.xslt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xslt/sp-summary.xslt')

diff --git a/xslt/sp-summary.xslt b/xslt/sp-summary.xslt
index cd16a519..cc6b0056 100644
--- a/xslt/sp-summary.xslt
+++ b/xslt/sp-summary.xslt
@@ -66,7 +66,7 @@
        <xsl:with-param name="replace" select="'-'" />
        <xsl:with-param name="by" select="'&amp;#x2011;'" />
      </xsl:call-template>
-     <xsl:text>&lt;br/&gt;</xsl:text>
+     <xsl:text>\\</xsl:text>
   </xsl:template> 
 
   <xsl:template match="md:ContactPerson">
@@ -84,7 +84,7 @@
   </xsl:template>
 
   <xsl:template match="md:EmailAddress">
-     <xsl:value-of select="text()"/><xsl:text>&lt;br/&gt;</xsl:text>
+     <xsl:value-of select="text()"/><xsl:text>\\</xsl:text>
   </xsl:template>
 
   <xsl:template match="md:OrganizationDisplayName">
-- 
cgit v1.2.3