From 7924156b1c761401399df039ac24744366e3bcac Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 14 Jul 2014 17:04:46 +0000
Subject: [PATCH] Simplify configuration using property placeholder
 replacement.

---
 mdx/at_aconet/beans.xml     |  2 +-
 mdx/at_aconet/verbs.xml     |  2 +-
 mdx/au_aaf/beans.xml        |  2 +-
 mdx/au_aaf/verbs.xml        |  2 +-
 mdx/be_belnet/beans.xml     |  2 +-
 mdx/be_belnet/verbs.xml     |  2 +-
 mdx/br_cafe/beans.xml       |  2 +-
 mdx/br_cafe/verbs.xml       |  2 +-
 mdx/ca_caf/beans.xml        |  4 +-
 mdx/ca_caf/verbs.xml        |  2 +-
 mdx/ch_switchaai/beans.xml  |  4 +-
 mdx/ch_switchaai/verbs.xml  |  2 +-
 mdx/cl_cofre/beans.xml      |  2 +-
 mdx/cl_cofre/verbs.xml      |  2 +-
 mdx/common-beans.xml        |  7 ++++
 mdx/cz_eduid/beans.xml      |  2 +-
 mdx/cz_eduid/verbs.xml      |  2 +-
 mdx/de_dfnaai/beans.xml     |  2 +-
 mdx/de_dfnaai/verbs.xml     |  2 +-
 mdx/dk_wayf/beans.xml       |  2 +-
 mdx/dk_wayf/verbs.xml       |  2 +-
 mdx/es_sir/beans.xml        |  2 +-
 mdx/es_sir/verbs.xml        |  2 +-
 mdx/eu_clarin/verbs.xml     |  2 +-
 mdx/fi_haka/beans.xml       |  4 +-
 mdx/fi_haka/verbs.xml       |  2 +-
 mdx/fr_renater/beans.xml    |  4 +-
 mdx/fr_renater/verbs.xml    |  2 +-
 mdx/gr_grnet/beans.xml      |  2 +-
 mdx/gr_grnet/verbs.xml      |  2 +-
 mdx/hr_eduhr/beans.xml      |  2 +-
 mdx/hr_eduhr/verbs.xml      |  2 +-
 mdx/hu_eduid/beans.xml      |  2 +-
 mdx/hu_eduid/verbs.xml      |  2 +-
 mdx/ie_edugate/beans.xml    |  2 +-
 mdx/ie_edugate/verbs.xml    |  2 +-
 mdx/in_infed/verbs.xml      |  2 +-
 mdx/int_cobweb/beans.xml    |  2 +-
 mdx/int_cobweb/verbs.xml    |  2 +-
 mdx/int_edugain/beans.xml   |  2 +-
 mdx/int_edugain/verbs.xml   |  4 +-
 mdx/int_testshib/verbs.xml  |  2 +-
 mdx/it_idem/beans.xml       |  2 +-
 mdx/it_idem/verbs.xml       |  2 +-
 mdx/jp_gakunin/beans.xml    |  2 +-
 mdx/jp_gakunin/verbs.xml    |  2 +-
 mdx/lv_laife/beans.xml      |  2 +-
 mdx/lv_laife/verbs.xml      |  2 +-
 mdx/nl_surfconext/beans.xml |  2 +-
 mdx/nl_surfconext/verbs.xml |  2 +-
 mdx/nl_surfnet/beans.xml    |  2 +-
 mdx/nl_surfnet/verbs.xml    |  2 +-
 mdx/no_feide/beans.xml      |  2 +-
 mdx/no_feide/verbs.xml      |  2 +-
 mdx/nz_tuakiri/beans.xml    |  2 +-
 mdx/nz_tuakiri/verbs.xml    |  2 +-
 mdx/pl_pionier/beans.xml    |  4 +-
 mdx/pl_pionier/verbs.xml    |  2 +-
 mdx/se_swamid/beans.xml     |  2 +-
 mdx/se_swamid/verbs.xml     |  2 +-
 mdx/si_arnes/beans.xml      |  2 +-
 mdx/si_arnes/verbs.xml      |  2 +-
 mdx/test/beans.xml          |  2 +-
 mdx/test/verbs.xml          |  2 +-
 mdx/uk/beans.xml            | 24 ++++++------
 mdx/uk/collect.xml          |  2 +-
 mdx/uk/generate.xml         | 26 ++++++-------
 mdx/uk/verbs.xml            | 10 ++---
 mdx/uk_eduserv/beans.xml    |  2 +-
 mdx/uk_eduserv/verbs.xml    |  2 +-
 mdx/us_incommon/beans.xml   |  2 +-
 mdx/us_incommon/verbs.xml   |  2 +-
 mdx/validation-beans.xml    | 78 ++++++++++++++++++-------------------
 73 files changed, 150 insertions(+), 143 deletions(-)

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 286154a1..4fcf3c37 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -56,7 +56,7 @@
     <bean id="at_aconet_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/at_aconet/aconet-aai-metadata-signing.crt"/>
+                <constructor-arg value="${basedir}/mdx/at_aconet/aconet-aai-metadata-signing.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index 5e3c7bdb..f731c821 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/at_aconet/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/at_aconet/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
index ed55a297..cd17c6dd 100644
--- a/mdx/au_aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -31,7 +31,7 @@
     <bean id="au_aaf_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/aaf-metadata-cert.pem"/>
+                <constructor-arg value="${basedir}/mdx/au_aaf/aaf-metadata-cert.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
index 3ad0172f..e9d4c340 100644
--- a/mdx/au_aaf/verbs.xml
+++ b/mdx/au_aaf/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/au_aaf/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
index 71464648..d4c54d62 100644
--- a/mdx/be_belnet/beans.xml
+++ b/mdx/be_belnet/beans.xml
@@ -54,7 +54,7 @@
     <bean id="be_belnet_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/be_belnet/certificate.federation.belnet.be.pem"/>
+                <constructor-arg value="${basedir}/mdx/be_belnet/certificate.federation.belnet.be.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
index 2ca2e769..45a6c164 100644
--- a/mdx/be_belnet/verbs.xml
+++ b/mdx/be_belnet/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/be_belnet/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/be_belnet/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
index 2dacea21..22702a08 100644
--- a/mdx/br_cafe/beans.xml
+++ b/mdx/br_cafe/beans.xml
@@ -54,7 +54,7 @@
     <bean id="br_cafe_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/br_cafe/metadata.crt"/>
+                <constructor-arg value="${basedir}/mdx/br_cafe/metadata.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
index 10ccfcd4..69b6c3f2 100644
--- a/mdx/br_cafe/verbs.xml
+++ b/mdx/br_cafe/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/br_cafe/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/br_cafe/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
index b6715580..72aaff00 100644
--- a/mdx/ca_caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -56,7 +56,7 @@
     <bean id="ca_caf_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/ca_caf/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
@@ -77,7 +77,7 @@
     <bean id="ca_caf_cafShibSigningCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/cafshib_metadata_verify.crt"/>
+                <constructor-arg value="${basedir}/mdx/ca_caf/cafshib_metadata_verify.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
index 246d4a3b..f3963717 100644
--- a/mdx/ca_caf/verbs.xml
+++ b/mdx/ca_caf/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/ca_caf/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
index 79a59f7d..57a0056d 100644
--- a/mdx/ch_switchaai/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -54,7 +54,7 @@
     <bean id="ch_switchaai_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/metadata.crt"/>
+                <constructor-arg value="${basedir}/mdx/ch_switchaai/metadata.crt"/>
             </bean>
         </property>
     </bean>
@@ -65,7 +65,7 @@
     <bean id="ch_switchaai_interfedSigningCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/interfed.crt"/>
+                <constructor-arg value="${basedir}/mdx/ch_switchaai/interfed.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
index bc6fa3cc..27143d6b 100644
--- a/mdx/ch_switchaai/verbs.xml
+++ b/mdx/ch_switchaai/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/ch_switchaai/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/cl_cofre/beans.xml b/mdx/cl_cofre/beans.xml
index a1bf708e..42b9628d 100644
--- a/mdx/cl_cofre/beans.xml
+++ b/mdx/cl_cofre/beans.xml
@@ -39,7 +39,7 @@
     <bean id="cl_cofre_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cl_cofre/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/cl_cofre/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/cl_cofre/verbs.xml b/mdx/cl_cofre/verbs.xml
index ccfe9e01..30e618fb 100644
--- a/mdx/cl_cofre/verbs.xml
+++ b/mdx/cl_cofre/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cl_cofre/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/cl_cofre/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 24b2575c..9c2cb544 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -5,13 +5,20 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
     xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:context="http://www.springframework.org/schema/context"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
+    <!--
+        Enable property placeholder replacement from system properties only.
+    -->
+    <context:property-placeholder/>
+
     <!--
         ***********************************
         ***                             ***
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index baf00fc7..7846ffea 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -64,7 +64,7 @@
     <bean id="cz_eduid_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz_eduid/metadata.eduid.cz.crt.pem"/>
+                <constructor-arg value="${basedir}/mdx/cz_eduid/metadata.eduid.cz.crt.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
index c35d766a..1c65f95c 100644
--- a/mdx/cz_eduid/verbs.xml
+++ b/mdx/cz_eduid/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz_eduid/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/cz_eduid/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
index 99747ad5..efbc5fee 100644
--- a/mdx/de_dfnaai/beans.xml
+++ b/mdx/de_dfnaai/beans.xml
@@ -54,7 +54,7 @@
     <bean id="de_dfnaai_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/de_dfnaai/dfn-aai.pem"/>
+                <constructor-arg value="${basedir}/mdx/de_dfnaai/dfn-aai.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/de_dfnaai/verbs.xml b/mdx/de_dfnaai/verbs.xml
index 9036ac17..b148c3e5 100644
--- a/mdx/de_dfnaai/verbs.xml
+++ b/mdx/de_dfnaai/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/de_dfnaai/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/de_dfnaai/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
index 0bcecc7c..a22e14f8 100644
--- a/mdx/dk_wayf/beans.xml
+++ b/mdx/dk_wayf/beans.xml
@@ -114,7 +114,7 @@
     <bean id="dk_wayf_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/dk_wayf/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/dk_wayf/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/dk_wayf/verbs.xml b/mdx/dk_wayf/verbs.xml
index d485fe44..697a6804 100644
--- a/mdx/dk_wayf/verbs.xml
+++ b/mdx/dk_wayf/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/dk_wayf/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/dk_wayf/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index 8841f100..b005ba15 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/beans.xml
@@ -54,7 +54,7 @@
     <bean id="es_sir_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/es_sir/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/es_sir/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/es_sir/verbs.xml b/mdx/es_sir/verbs.xml
index 6a9a22c6..b67925fa 100644
--- a/mdx/es_sir/verbs.xml
+++ b/mdx/es_sir/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/es_sir/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/es_sir/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/eu_clarin/verbs.xml b/mdx/eu_clarin/verbs.xml
index 6091ee2d..0022c32c 100644
--- a/mdx/eu_clarin/verbs.xml
+++ b/mdx/eu_clarin/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/eu_clarin/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/eu_clarin/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
index 2102c286..bdd09215 100644
--- a/mdx/fi_haka/beans.xml
+++ b/mdx/fi_haka/beans.xml
@@ -54,7 +54,7 @@
     <bean id="fi_haka_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/fi_haka/haka-sign.csc.fi.pem"/>
+                <constructor-arg value="${basedir}/mdx/fi_haka/haka-sign.csc.fi.pem"/>
             </bean>
         </property>
     </bean>
@@ -74,7 +74,7 @@
     <bean id="fi_haka_edugainSigningCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/fi_haka/edugain.crt"/>
+                <constructor-arg value="${basedir}/mdx/fi_haka/edugain.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/fi_haka/verbs.xml b/mdx/fi_haka/verbs.xml
index bd92f34f..9cfeb3a9 100644
--- a/mdx/fi_haka/verbs.xml
+++ b/mdx/fi_haka/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/fi_haka/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/fi_haka/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index 11854d71..4a9fbec8 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -70,7 +70,7 @@
     <bean id="fr_renater_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/fr_renater/metadata-federation-renater.crt"/>
+                <constructor-arg value="${basedir}/mdx/fr_renater/metadata-federation-renater.crt"/>
             </bean>
         </property>
     </bean>
@@ -90,7 +90,7 @@
     <bean id="fr_renater_edugainSigningCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/fr_renater/renater-federation-metadata.crt"/>
+                <constructor-arg value="${basedir}/mdx/fr_renater/renater-federation-metadata.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/fr_renater/verbs.xml b/mdx/fr_renater/verbs.xml
index 1d8ab4a1..17deed00 100644
--- a/mdx/fr_renater/verbs.xml
+++ b/mdx/fr_renater/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/fr_renater/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/fr_renater/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
index 3775c10a..2f72a672 100644
--- a/mdx/gr_grnet/beans.xml
+++ b/mdx/gr_grnet/beans.xml
@@ -54,7 +54,7 @@
     <bean id="gr_grnet_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/gr_grnet/wayf.grnet.gr.pem"/>
+                <constructor-arg value="${basedir}/mdx/gr_grnet/wayf.grnet.gr.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/gr_grnet/verbs.xml b/mdx/gr_grnet/verbs.xml
index 25ffdb14..f663b797 100644
--- a/mdx/gr_grnet/verbs.xml
+++ b/mdx/gr_grnet/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/gr_grnet/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/gr_grnet/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
index 775650f1..ed39d9c4 100644
--- a/mdx/hr_eduhr/beans.xml
+++ b/mdx/hr_eduhr/beans.xml
@@ -38,7 +38,7 @@
     <bean id="hr_eduhr_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/hr_eduhr/metadata.crt"/>
+                <constructor-arg value="${basedir}/mdx/hr_eduhr/metadata.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/hr_eduhr/verbs.xml b/mdx/hr_eduhr/verbs.xml
index 155db450..377c311b 100644
--- a/mdx/hr_eduhr/verbs.xml
+++ b/mdx/hr_eduhr/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/hr_eduhr/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/hr_eduhr/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index e4f01f8b..f9d369be 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -54,7 +54,7 @@
     <bean id="hu_eduid_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/hu_eduid/href-metadata-signer-2011.crt"/>
+                <constructor-arg value="${basedir}/mdx/hu_eduid/href-metadata-signer-2011.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/hu_eduid/verbs.xml b/mdx/hu_eduid/verbs.xml
index 63432d66..d5514a4b 100644
--- a/mdx/hu_eduid/verbs.xml
+++ b/mdx/hu_eduid/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/hu_eduid/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/hu_eduid/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index 644d4b85..59cc6135 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -44,7 +44,7 @@
     <bean id="ie_edugate_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie_edugate/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/ie_edugate/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/ie_edugate/verbs.xml b/mdx/ie_edugate/verbs.xml
index af2abf1c..591f7333 100644
--- a/mdx/ie_edugate/verbs.xml
+++ b/mdx/ie_edugate/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie_edugate/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/ie_edugate/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/in_infed/verbs.xml b/mdx/in_infed/verbs.xml
index ceb31e4a..0801a1ab 100644
--- a/mdx/in_infed/verbs.xml
+++ b/mdx/in_infed/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/in_infed/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/in_infed/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
index 70206bbe..5569adf4 100644
--- a/mdx/int_cobweb/beans.xml
+++ b/mdx/int_cobweb/beans.xml
@@ -38,7 +38,7 @@
     <bean id="int_cobweb_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_cobweb/cobweb.pem"/>
+                <constructor-arg value="${basedir}/mdx/int_cobweb/cobweb.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml
index d4571b55..7f955df6 100644
--- a/mdx/int_cobweb/verbs.xml
+++ b/mdx/int_cobweb/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_cobweb/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/int_cobweb/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index e3697894..da39f23f 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -67,7 +67,7 @@
     <bean id="int_edugain_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/edugain-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/int_edugain/edugain-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 9138a50a..ae4800f9 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -27,7 +27,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/int_edugain/imported.xml"/>
             </bean>
         </property>
     </bean>
@@ -117,7 +117,7 @@
                     p:id="check_recovered">
                     <property name="XSLResource">
                         <bean parent="FileSystemResource">
-                            <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/check_recovered.xsl"/>
+                            <constructor-arg value="${basedir}/mdx/int_edugain/check_recovered.xsl"/>
                         </bean>
                     </property>
                 </bean>
diff --git a/mdx/int_testshib/verbs.xml b/mdx/int_testshib/verbs.xml
index 54c5db85..4dd6849f 100644
--- a/mdx/int_testshib/verbs.xml
+++ b/mdx/int_testshib/verbs.xml
@@ -29,7 +29,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_testshib/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/int_testshib/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 5348d62c..c00b815d 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -54,7 +54,7 @@
     <bean id="it_idem_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/it_idem/signer-bundle.pem"/>
+                <constructor-arg value="${basedir}/mdx/it_idem/signer-bundle.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/it_idem/verbs.xml b/mdx/it_idem/verbs.xml
index 8f54b9b1..5c44c6fc 100644
--- a/mdx/it_idem/verbs.xml
+++ b/mdx/it_idem/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/it_idem/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/it_idem/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index 67e6fe64..b675aa22 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -31,7 +31,7 @@
     <bean id="jp_gakunin_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/jp_gakunin/gakunin-signer-2010.cer"/>
+                <constructor-arg value="${basedir}/mdx/jp_gakunin/gakunin-signer-2010.cer"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/jp_gakunin/verbs.xml b/mdx/jp_gakunin/verbs.xml
index 256ea75f..ebefbf44 100644
--- a/mdx/jp_gakunin/verbs.xml
+++ b/mdx/jp_gakunin/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/jp_gakunin/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/jp_gakunin/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index e3713fed..b1002a01 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -57,7 +57,7 @@
     <bean id="lv_laife_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/lv_laife/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/lv_laife/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/lv_laife/verbs.xml b/mdx/lv_laife/verbs.xml
index 0a7b6a2b..fc9fcd7b 100644
--- a/mdx/lv_laife/verbs.xml
+++ b/mdx/lv_laife/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/lv_laife/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/lv_laife/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
index 0eb002d4..d471e879 100644
--- a/mdx/nl_surfconext/beans.xml
+++ b/mdx/nl_surfconext/beans.xml
@@ -26,7 +26,7 @@
     <bean id="nl_surfconext_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/nl_surfconext/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/nl_surfconext/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/nl_surfconext/verbs.xml b/mdx/nl_surfconext/verbs.xml
index 12fe322d..5e979f48 100644
--- a/mdx/nl_surfconext/verbs.xml
+++ b/mdx/nl_surfconext/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/nl_surfconext/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/nl_surfconext/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index d0f57e8a..0b322bcc 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -38,7 +38,7 @@
     <bean id="nl_surfnet_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/nl_surfnet/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/nl_surfnet/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/nl_surfnet/verbs.xml b/mdx/nl_surfnet/verbs.xml
index 10af71eb..a9ac6046 100644
--- a/mdx/nl_surfnet/verbs.xml
+++ b/mdx/nl_surfnet/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/nl_surfnet/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/nl_surfnet/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index 4c07ff08..32cad219 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -68,7 +68,7 @@
     <bean id="no_feide_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/no_feide/metadata.crt"/>
+                <constructor-arg value="${basedir}/mdx/no_feide/metadata.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/no_feide/verbs.xml b/mdx/no_feide/verbs.xml
index ed150ede..07fce29c 100644
--- a/mdx/no_feide/verbs.xml
+++ b/mdx/no_feide/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/no_feide/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/no_feide/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index a0647d6e..3bfe79e5 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -31,7 +31,7 @@
     <bean id="nz_tuakiri_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/nz_tuakiri/tuakiri-test-metadata-cert.pem"/>
+                <constructor-arg value="${basedir}/mdx/nz_tuakiri/tuakiri-test-metadata-cert.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/nz_tuakiri/verbs.xml b/mdx/nz_tuakiri/verbs.xml
index f3b87e1b..ac51ffc1 100644
--- a/mdx/nz_tuakiri/verbs.xml
+++ b/mdx/nz_tuakiri/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/nz_tuakiri/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/nz_tuakiri/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/pl_pionier/beans.xml b/mdx/pl_pionier/beans.xml
index 6e283ae2..df44df76 100644
--- a/mdx/pl_pionier/beans.xml
+++ b/mdx/pl_pionier/beans.xml
@@ -56,7 +56,7 @@
     <bean id="pl_pionier_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/pl_pionier/pionier.crt"/>
+                <constructor-arg value="${basedir}/mdx/pl_pionier/pionier.crt"/>
             </bean>
         </property>
     </bean>
@@ -67,7 +67,7 @@
     <bean id="pl_pionier_edugainCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/pl_pionier/edugain.crt"/>
+                <constructor-arg value="${basedir}/mdx/pl_pionier/edugain.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/pl_pionier/verbs.xml b/mdx/pl_pionier/verbs.xml
index e008a4c1..a0a98256 100644
--- a/mdx/pl_pionier/verbs.xml
+++ b/mdx/pl_pionier/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/pl_pionier/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/pl_pionier/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 5851b3e6..77fa9495 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -60,7 +60,7 @@
     <bean id="se_swamid_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/se_swamid/md-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/se_swamid/md-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/se_swamid/verbs.xml b/mdx/se_swamid/verbs.xml
index 02658b20..6ff15162 100644
--- a/mdx/se_swamid/verbs.xml
+++ b/mdx/se_swamid/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/se_swamid/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/se_swamid/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index 84c25b63..0212ccbc 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -31,7 +31,7 @@
     <bean id="si_arnes_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/si_arnes/aai.arnes.si.crt"/>
+                <constructor-arg value="${basedir}/mdx/si_arnes/aai.arnes.si.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/si_arnes/verbs.xml b/mdx/si_arnes/verbs.xml
index fbeecd93..db5bbcac 100644
--- a/mdx/si_arnes/verbs.xml
+++ b/mdx/si_arnes/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/si_arnes/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/si_arnes/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index 89f6b319..df4b72ce 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -21,7 +21,7 @@
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/test/input.xml"/>
+                <constructor-arg value="${basedir}/mdx/test/input.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index 9e64b2c7..3ec747b3 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/test/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/test/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 8c259197..25c67e10 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -74,7 +74,7 @@
     <bean id="uk_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/uk/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
@@ -124,7 +124,7 @@
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/entities"/>
+                <constructor-arg value="${basedir}/entities"/>
             </bean>
         </property>
         <property name="sourceFileFilter">
@@ -170,7 +170,7 @@
         A Resource referencing the members.xml document.
     -->
     <bean id="uk_membersResource" parent="FileSystemResource">
-        <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
+        <constructor-arg value="${basedir}/xml/members.xml"/>
     </bean>
     
     
@@ -193,7 +193,7 @@
     <bean id="uk_members" class="uk.org.ukfederation.members.Members">
         <constructor-arg>
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
+                <constructor-arg value="${basedir}/xml/members.xml"/>
             </bean>
         </constructor-arg>
     </bean>
@@ -241,7 +241,7 @@
         p:id="check_ukreg">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_ukreg.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/check_ukreg.xsl"/>
             </bean>
         </property>
         <property name="transformParameters">
@@ -259,7 +259,7 @@
         p:id="check_uk_keydesc_key">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_keydesc_key.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/check_uk_keydesc_key.xsl"/>
             </bean>
         </property>
     </bean>
@@ -272,7 +272,7 @@
         p:id="check_uk_mdattr">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_mdattr.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/check_uk_mdattr.xsl"/>
             </bean>
         </property>
     </bean>
@@ -285,7 +285,7 @@
         p:id="check_uk_mdrps">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_mdrps.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/check_uk_mdrps.xsl"/>
             </bean>
         </property>
     </bean>
@@ -298,7 +298,7 @@
         p:id="check_uk_urlenc">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_urlenc.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/check_uk_urlenc.xsl"/>
             </bean>
         </property>
     </bean>
@@ -313,7 +313,7 @@
         <property name="parserPool" ref="parserPool"/>
         <property name="documentResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/trust-roots.xml"/>
+                <constructor-arg value="${basedir}/mdx/uk/trust-roots.xml"/>
             </bean>
         </property>
     </bean>    
@@ -505,7 +505,7 @@
         p:id="uk_normaliseNamespaces">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_uk.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/ns_norm_uk.xsl"/>
             </bean>
         </property>
     </bean>
@@ -566,7 +566,7 @@
         p:id="uk_serializeStatistics">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-stats.html"/>
+                <constructor-arg value="${basedir}/xml/ukfederation-stats.html"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index a8ff9f36..2f5a99d9 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -26,7 +26,7 @@
         p:id="serializeCollected">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/collected.xml"/>
+                <constructor-arg value="${basedir}/mdx/uk/collected.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 3c955f01..1f94848e 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -150,7 +150,7 @@
         p:id="check_fixup_encmethod">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_encmethod.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/check_fixup_encmethod.xsl"/>
             </bean>
         </property>
     </bean>
@@ -162,7 +162,7 @@
         p:id="check_fixup_keyuse">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_keyuse.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/check_fixup_keyuse.xsl"/>
             </bean>
         </property>
     </bean>
@@ -293,7 +293,7 @@
         p:id="serializeUnsignedProductionAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-metadata-unsigned.xml"/>
+                <constructor-arg value="${basedir}/xml/ukfederation-metadata-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -342,7 +342,7 @@
         p:id="serializeUnsignedWayfAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-wayf-unsigned.xml"/>
+                <constructor-arg value="${basedir}/xml/ukfederation-wayf-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -434,7 +434,7 @@
         p:id="CDSNormaliseNamespaces">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_cds.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/ns_norm_cds.xsl"/>
             </bean>
         </property>
     </bean>
@@ -461,7 +461,7 @@
         p:id="serializeCDSAllAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-cdsall-unsigned.xml"/>
+                <constructor-arg value="${basedir}/xml/ukfederation-cdsall-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -516,7 +516,7 @@
         p:id="uk_normaliseFallback">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_back.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/ns_norm_back.xsl"/>
             </bean>
         </property>
     </bean>
@@ -525,7 +525,7 @@
         p:id="serializeUnsignedFallbackAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-back-unsigned.xml"/>
+                <constructor-arg value="${basedir}/xml/ukfederation-back-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -581,7 +581,7 @@
         p:id="uk_normaliseTest">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_test.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/ns_norm_test.xsl"/>
             </bean>
         </property>
     </bean>
@@ -590,7 +590,7 @@
         p:id="serializeUnsignedTestAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-test-unsigned.xml"/>
+                <constructor-arg value="${basedir}/xml/ukfederation-test-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -641,7 +641,7 @@
         p:id="uk_normaliseExport">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_export.xsl"/>
+                <constructor-arg value="${basedir}/mdx/uk/ns_norm_export.xsl"/>
             </bean>
         </property>
     </bean>
@@ -655,7 +655,7 @@
         p:id="serializeUnsignedExportAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-export-unsigned.xml"/>
+                <constructor-arg value="${basedir}/xml/ukfederation-export-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -762,7 +762,7 @@
         p:id="serializeCMSaggregate">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/xml/cms-metadata.xml"/>
+                <constructor-arg value="${basedir}/xml/cms-metadata.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 6b033af7..21669b66 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -71,7 +71,7 @@
                     p:id="serialize">
                     <property name="outputFile">
                         <bean class="java.io.File">
-                            <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/temp.html"/>
+                            <constructor-arg value="${basedir}/mdx/uk/temp.html"/>
                         </bean>
                     </property>
                 </bean>
@@ -208,7 +208,7 @@
         p:id="fetchImportMetadata">
         <property name="source">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/entities/import.xml"/>
+                <constructor-arg value="${basedir}/entities/import.xml"/>
             </bean>
         </property>
     </bean>
@@ -222,7 +222,7 @@
         p:id="serializeImportedMetadata">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/entities/imported.xml"/>
+                <constructor-arg value="${basedir}/entities/imported.xml"/>
             </bean>
         </property>
     </bean>
@@ -264,7 +264,7 @@
                     p:id="normalizeFragment">
                     <property name="XSLResource">
                         <bean parent="FileSystemResource">
-                            <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_fragment.xsl"/>
+                            <constructor-arg value="${basedir}/mdx/uk/ns_norm_fragment.xsl"/>
                         </bean>
                     </property>
                 </bean>
@@ -352,7 +352,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/uk/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index 04461722..14f4cb3c 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -31,7 +31,7 @@
     <bean id="uk_eduserv_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk_eduserv/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/uk_eduserv/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk_eduserv/verbs.xml b/mdx/uk_eduserv/verbs.xml
index a98e13cb..fa7c5ada 100644
--- a/mdx/uk_eduserv/verbs.xml
+++ b/mdx/uk_eduserv/verbs.xml
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk_eduserv/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/uk_eduserv/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 6813e747..b64b0d3e 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -47,7 +47,7 @@
     <bean id="us_incommon_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/us_incommon/inc-md-cert.pem"/>
+                <constructor-arg value="${basedir}/mdx/us_incommon/inc-md-cert.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index d48d075a..b7d551a5 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -29,7 +29,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/us_incommon/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/us_incommon/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 16d8b3fa..c6b9b4d4 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -39,7 +39,7 @@
         p:id="check_future_0">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_0.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_0.xsl"/>
             </bean>
         </property>
     </bean>
@@ -51,7 +51,7 @@
         p:id="check_future_1">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_1.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_1.xsl"/>
             </bean>
         </property>
     </bean>
@@ -63,7 +63,7 @@
         p:id="check_future_2">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_2.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_2.xsl"/>
             </bean>
         </property>
     </bean>
@@ -75,7 +75,7 @@
         p:id="check_future_3">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_3.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_3.xsl"/>
             </bean>
         </property>
     </bean>
@@ -87,7 +87,7 @@
         p:id="check_future_4">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_4.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_4.xsl"/>
             </bean>
         </property>
     </bean>
@@ -99,7 +99,7 @@
         p:id="check_future_5">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_5.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_5.xsl"/>
             </bean>
         </property>
     </bean>
@@ -111,7 +111,7 @@
         p:id="check_future_6">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_6.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_6.xsl"/>
             </bean>
         </property>
     </bean>
@@ -123,7 +123,7 @@
         p:id="check_future_7">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_7.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_7.xsl"/>
             </bean>
         </property>
     </bean>
@@ -135,7 +135,7 @@
         p:id="check_future_8">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_8.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_8.xsl"/>
             </bean>
         </property>
     </bean>
@@ -147,7 +147,7 @@
         p:id="check_future_9">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_9.xsl"/>
+                <constructor-arg value="${rulesdir}/check_future_9.xsl"/>
             </bean>
         </property>
     </bean>
@@ -192,7 +192,7 @@
         p:id="check_algsupport">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_algsupport.xsl"/>
+                <constructor-arg value="${rulesdir}/check_algsupport.xsl"/>
             </bean>
         </property>
     </bean>
@@ -214,7 +214,7 @@
         p:id="check_adfs">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_adfs.xsl"/>
+                <constructor-arg value="${rulesdir}/check_adfs.xsl"/>
             </bean>
         </property>
     </bean>
@@ -226,7 +226,7 @@
         p:id="check_bindings">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_bindings.xsl"/>
+                <constructor-arg value="${rulesdir}/check_bindings.xsl"/>
             </bean>
         </property>
     </bean>
@@ -238,7 +238,7 @@
         p:id="check_filtered">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_filtered.xsl"/>
+                <constructor-arg value="${rulesdir}/check_filtered.xsl"/>
             </bean>
         </property>
     </bean>
@@ -250,7 +250,7 @@
         p:id="check_hoksso">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_hoksso.xsl"/>
+                <constructor-arg value="${rulesdir}/check_hoksso.xsl"/>
             </bean>
         </property>
     </bean>
@@ -262,7 +262,7 @@
         p:id="check_idpdisc">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_idpdisc.xsl"/>
+                <constructor-arg value="${rulesdir}/check_idpdisc.xsl"/>
             </bean>
         </property>
     </bean>
@@ -274,7 +274,7 @@
         p:id="check_imported">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_imported.xsl"/>
+                <constructor-arg value="${rulesdir}/check_imported.xsl"/>
             </bean>
         </property>
     </bean>
@@ -286,7 +286,7 @@
         p:id="check_init">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_init.xsl"/>
+                <constructor-arg value="${rulesdir}/check_init.xsl"/>
             </bean>
         </property>
     </bean>
@@ -298,7 +298,7 @@
         p:id="check_mdiop">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdiop.xsl"/>
+                <constructor-arg value="${rulesdir}/check_mdiop.xsl"/>
             </bean>
         </property>
     </bean>
@@ -318,7 +318,7 @@
         p:id="check_mdattr">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdattr.xsl"/>
+                <constructor-arg value="${rulesdir}/check_mdattr.xsl"/>
             </bean>
         </property>
     </bean>
@@ -340,7 +340,7 @@
         p:id="check_mdrpi_xslt">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdrpi.xsl"/>
+                <constructor-arg value="${rulesdir}/check_mdrpi.xsl"/>
             </bean>
         </property>
     </bean>
@@ -370,7 +370,7 @@
     <bean id="check_regauth_parent" abstract="true" parent="XSLValidationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regauth.xsl"/>
+                <constructor-arg value="${rulesdir}/check_regauth.xsl"/>
             </bean>
         </property>
     </bean>
@@ -384,7 +384,7 @@
         p:id="check_hasreginfo">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_hasreginfo.xsl"/>
+                <constructor-arg value="${rulesdir}/check_hasreginfo.xsl"/>
             </bean>
         </property>
     </bean>
@@ -416,7 +416,7 @@
         p:id="check_mdui_xslt">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdui.xsl"/>
+                <constructor-arg value="${rulesdir}/check_mdui.xsl"/>
             </bean>
         </property>
     </bean>
@@ -433,7 +433,7 @@
         p:id="mdui_dn_en_match">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_match.xsl"/>
+                <constructor-arg value="${rulesdir}/mdui_dn_en_match.xsl"/>
             </bean>
         </property>
     </bean>
@@ -448,7 +448,7 @@
         p:id="mdui_dn_en_present">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_present.xsl"/>
+                <constructor-arg value="${rulesdir}/mdui_dn_en_present.xsl"/>
             </bean>
         </property>
     </bean>
@@ -489,7 +489,7 @@
         p:id="check_misc">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_misc.xsl"/>
+                <constructor-arg value="${rulesdir}/check_misc.xsl"/>
             </bean>
         </property>
     </bean>
@@ -501,7 +501,7 @@
         p:id="check_namespaces">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_namespaces.xsl"/>
+                <constructor-arg value="${rulesdir}/check_namespaces.xsl"/>
             </bean>
         </property>
     </bean>
@@ -515,7 +515,7 @@
         p:id="check_regscope">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regscope.xsl"/>
+                <constructor-arg value="${rulesdir}/check_regscope.xsl"/>
             </bean>
         </property>
     </bean>
@@ -527,7 +527,7 @@
         p:id="check_reqattr">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_reqattr.xsl"/>
+                <constructor-arg value="${rulesdir}/check_reqattr.xsl"/>
             </bean>
         </property>
     </bean>
@@ -539,7 +539,7 @@
         p:id="check_saml2int">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2int.xsl"/>
+                <constructor-arg value="${rulesdir}/check_saml2int.xsl"/>
             </bean>
         </property>
     </bean>
@@ -551,7 +551,7 @@
         p:id="check_saml1">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml1.xsl"/>
+                <constructor-arg value="${rulesdir}/check_saml1.xsl"/>
             </bean>
         </property>
     </bean>
@@ -563,7 +563,7 @@
         p:id="check_saml2">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2.xsl"/>
+                <constructor-arg value="${rulesdir}/check_saml2.xsl"/>
             </bean>
         </property>
     </bean>
@@ -575,7 +575,7 @@
         p:id="check_saml2meta">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2meta.xsl"/>
+                <constructor-arg value="${rulesdir}/check_saml2meta.xsl"/>
             </bean>
         </property>
     </bean>
@@ -587,7 +587,7 @@
         p:id="check_shibboleth">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_shibboleth.xsl"/>
+                <constructor-arg value="${rulesdir}/check_shibboleth.xsl"/>
             </bean>
         </property>
     </bean>
@@ -619,7 +619,7 @@
         p:id="check_vhosts">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_vhosts.xsl"/>
+                <constructor-arg value="${rulesdir}/check_vhosts.xsl"/>
             </bean>
         </property>
     </bean>
@@ -639,7 +639,7 @@
         p:id="check_incmd">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_incmd.xsl"/>
+                <constructor-arg value="${rulesdir}/check_incmd.xsl"/>
             </bean>
         </property>
     </bean>
@@ -659,7 +659,7 @@
         p:id="check_uk_trust">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_uk_trust.xsl"/>
+                <constructor-arg value="${rulesdir}/check_uk_trust.xsl"/>
             </bean>
         </property>
     </bean>
@@ -688,7 +688,7 @@
         p:id="check_aggregate">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_aggregate.xsl"/>
+                <constructor-arg value="${rulesdir}/check_aggregate.xsl"/>
             </bean>
         </property>
     </bean>