From 6832134172dbd198ceba18c2f6cc4b36b14f2080 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 16 Sep 2014 11:03:56 +0000
Subject: [PATCH] Trim whitespace from md:EmailAddress elements.

---
 mdx/common-beans.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index a64deb1f..24e66b1a 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -615,6 +615,7 @@
     <!--
         QNames for SAML metadata elements.
     -->
+    <bean id="md-EmailAddress"            parent="QName" c:_0-ref="md_namespace" c:_1="EmailAddress"/>
     <bean id="md-NameIDFormat"            parent="QName" c:_0-ref="md_namespace" c:_1="NameIDFormat"/>
     <bean id="md-OrganizationDisplayName" parent="QName" c:_0-ref="md_namespace" c:_1="OrganizationDisplayName"/>
     <bean id="md-OrganizationURL"         parent="QName" c:_0-ref="md_namespace" c:_1="OrganizationURL"/>
@@ -1030,6 +1031,7 @@
         p:id="trimImportElementWhitespace">
         <property name="elementNames">
             <set>
+                <ref bean="md-EmailAddress"/>
                 <ref bean="md-NameIDFormat"/>
                 <ref bean="md-OrganizationDisplayName"/>
                 <ref bean="md-OrganizationURL"/>