From 9a9b95cc3486ad923dacd0007ce218e1f2337b9f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sat, 9 Jan 2016 16:01:21 +0000
Subject: [PATCH] Convert most uses of FileSystemResource to use "classpath:"
 prefix resource strings.

---
 mdx/int_edugain/verbs.xml | 10 +++-----
 mdx/uk/beans.xml          | 53 +++++++++------------------------------
 mdx/uk/generate.xml       | 45 ++++++++-------------------------
 mdx/uk/verbs.xml          |  9 ++-----
 4 files changed, 27 insertions(+), 90 deletions(-)

diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index ed89148c..f345a97d 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -105,13 +105,9 @@
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
                 
                 <!-- flag up any remaining entities -->
-                <bean id="check_recovered" parent="XSLValidationStage">
-                    <property name="XSLResource">
-                        <bean parent="FileSystemResource">
-                            <constructor-arg value="${basedir}/mdx/int_edugain/check_recovered.xsl"/>
-                        </bean>
-                    </property>
-                </bean>
+                <bean id="check_recovered" parent="XSLValidationStage"
+                    p:XSLResource="classpath:int_edugain/check_recovered.xsl"/>
+
                 <ref bean="errorTerminatingFilter"/>
             </list>
         </property>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 1bd73fa1..87ee0297 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -202,12 +202,8 @@
         
         Checks specific to the UK registrar function.
     -->
-    <bean id="check_ukreg" parent="XSLValidationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/check_ukreg.xsl"/>
-            </bean>
-        </property>
+    <bean id="check_ukreg" parent="XSLValidationStage"
+        p:XSLResource="classpath:uk/check_ukreg.xsl">
         <property name="transformParameters">
             <map>
                 <entry key="members" value-ref="uk_members"/>
@@ -219,49 +215,29 @@
     <!--
         check_uk_keydesc_key
     -->
-    <bean id="check_uk_keydesc_key" parent="XSLValidationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/check_uk_keydesc_key.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="check_uk_keydesc_key" parent="XSLValidationStage"
+        p:XSLResource="classpath:uk/check_uk_keydesc_key.xsl"/>
 
 
     <!--
         check_uk_mdattr
     -->
-    <bean id="check_uk_mdattr" parent="XSLValidationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/check_uk_mdattr.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="check_uk_mdattr" parent="XSLValidationStage"
+        p:XSLResource="classpath:uk/check_uk_mdattr.xsl"/>
     
     
     <!--
         check_uk_mdrps
     -->
-    <bean id="check_uk_mdrps" parent="XSLValidationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/check_uk_mdrps.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="check_uk_mdrps" parent="XSLValidationStage"
+        p:XSLResource="classpath:uk/check_uk_mdrps.xsl"/>
     
     
     <!--
         check_uk_urlenc
     -->
-    <bean id="check_uk_urlenc" parent="XSLValidationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/check_uk_urlenc.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="check_uk_urlenc" parent="XSLValidationStage"
+        p:XSLResource="classpath:uk/check_uk_urlenc.xsl"/>
     
 
     <!--
@@ -433,13 +409,8 @@
         used in an XML document.  This one is UK-specific, as it makes specific choices
         in order to limit the number of prefixes used.
     -->
-    <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/ns_norm_uk.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
+        p:XSLResource="classpath:uk/ns_norm_uk.xsl"/>
     
     <!--
         *************************************************
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index d02f8190..a51d2e67 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -98,13 +98,8 @@
     <!--
         check_fixup_keyuse
     -->
-    <bean id="check_fixup_keyuse" parent="XSLValidationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/check_fixup_keyuse.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="check_fixup_keyuse" parent="XSLValidationStage"
+        p:XSLResource="classpath:uk/check_fixup_keyuse.xsl"/>
     
     <!--
         checkPublishable
@@ -388,13 +383,8 @@
         </property>
     </bean>
     
-    <bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/ns_norm_cds.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage"
+        p:XSLResource="classpath:uk/ns_norm_cds.xsl"/>
 
     <!--
         *******************************************
@@ -473,13 +463,8 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseFallback" parent="XSLTransformationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/ns_norm_back.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="uk_normaliseFallback" parent="XSLTransformationStage"
+        p:XSLResource="classpath:uk/ns_norm_back.xsl"/>
     
     <bean id="serializeUnsignedFallbackAggregate" parent="SerializationStage">
         <property name="outputFile">
@@ -532,13 +517,8 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseTest" parent="XSLTransformationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/ns_norm_test.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="uk_normaliseTest" parent="XSLTransformationStage"
+        p:XSLResource="classpath:uk/ns_norm_test.xsl"/>
     
     <bean id="serializeUnsignedTestAggregate" parent="SerializationStage">
         <property name="outputFile">
@@ -588,13 +568,8 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseExport" parent="XSLTransformationStage">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/ns_norm_export.xsl"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="uk_normaliseExport" parent="XSLTransformationStage"
+        p:XSLResource="classpath:uk/ns_norm_export.xsl"/>
     
     <bean id="uk_exportSelector" parent="XPathItemSelectionStrategy">
         <constructor-arg value="/md:EntityDescriptor[not(md:Extensions/ukfedlabel:ExportOptOut)]"/>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 2396fdd3..eadd2695 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -238,13 +238,8 @@
                     p:XSLResource="classpath:uk/import.xsl"/>
                 
                 <!-- normalise namespaces in a specific way -->
-                <bean id="normalizeFragment" parent="XSLTransformationStage">
-                    <property name="XSLResource">
-                        <bean parent="FileSystemResource">
-                            <constructor-arg value="${basedir}/mdx/uk/ns_norm_fragment.xsl"/>
-                        </bean>
-                    </property>
-                </bean>
+                <bean id="normalizeFragment" parent="XSLTransformationStage"
+                    p:XSLResource="classpath:uk/ns_norm_fragment.xsl"/>
                 
                 <!-- check the transformed input -->
                 <ref bean="checkSchemas"/>