Trim whitespace from imported md:OrganizationDisplayName and md:NameI…

…DFormat elements. This should resolve bugzilla 1025 and bugzilla 1029.
InCommon · Sep 12, 2013 · 00ec357 · 00ec357
1 parent fa0bce2
commit 00ec357
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -172,6 +172,14 @@
     <bean id="EntityRegistrationAuthorityFilterStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.saml.EntityRegistrationAuthorityFilterStage"/>
 
+
+    <!-- *** Parent beans for ukf-mda. *** -->
+
+    <bean id="ElementWhitespaceTrimmingStage" abstract="true" parent="stage_parent"
+        class="uk.org.ukfederation.mda.dom.ElementWhitespaceTrimmingStage"/>
+
+
+
     <!--
         ***********************************************
         ***                                         ***
@@ -727,6 +735,23 @@
         </property>
     </bean>
 
+    <!--
+        trimImportElementWhitespace
+        
+        Trim whitespace from the specified elements in imported
+        entities.  These would often be errors in UK-registered
+        metadata.
+    -->
+    <bean id="trimImportElementWhitespace" parent="ElementWhitespaceTrimmingStage"
+        p:id="trimImportElementWhitespace">
+        <property name="elementNames">
+            <set>
+                <ref bean="md-NameIDFormat"/>
+                <ref bean="md-OrganizationDisplayName"/>
+            </set>
+        </property>
+    </bean>
+
     <!--
         standardImportActions
         
@@ -757,6 +782,7 @@
                 <ref bean="stripMdattrNamespace"/>
 
                 <ref bean="cleanImport"/>
+                <ref bean="trimImportElementWhitespace"/>
                 <ref bean="removeEmptyExtensions"/>
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_imported"/>