Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Simplify configuration using property placeholder replacement.
@iay
iay committed Jul 14, 2014
1 parent 6e3bff5 commit 7924156
Showing 73 changed files with 150 additions and 143 deletions.
2 changes: 1 addition & 1 deletion mdx/at_aconet/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/at_aconet/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/au_aaf/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/au_aaf/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/be_belnet/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/be_belnet/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/br_cafe/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/br_cafe/verbs.xml
View file
@@ -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>
4 changes: 2 additions & 2 deletions mdx/ca_caf/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/ca_caf/verbs.xml
View file
@@ -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>
4 changes: 2 additions & 2 deletions mdx/ch_switchaai/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/ch_switchaai/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/cl_cofre/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/cl_cofre/verbs.xml
View file
@@ -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>
7 changes: 7 additions & 0 deletions mdx/common-beans.xml
View file
@@ -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/>

<!--
***********************************
*** ***
2 changes: 1 addition & 1 deletion mdx/cz_eduid/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/cz_eduid/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/de_dfnaai/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/de_dfnaai/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/dk_wayf/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/dk_wayf/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/es_sir/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/es_sir/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/eu_clarin/verbs.xml
View file
@@ -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>
4 changes: 2 additions & 2 deletions mdx/fi_haka/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/fi_haka/verbs.xml
View file
@@ -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>
4 changes: 2 additions & 2 deletions mdx/fr_renater/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/fr_renater/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/gr_grnet/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/gr_grnet/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/hr_eduhr/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/hr_eduhr/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/hu_eduid/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/hu_eduid/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/ie_edugate/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/ie_edugate/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/in_infed/verbs.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/int_cobweb/beans.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion mdx/int_cobweb/verbs.xml
View file
@@ -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>

0 comments on commit 7924156

Please sign in to comment.