Use parent beans to simplify declaring Shibboleth spring-extensions f…

…actory beans.
internet2 · May 30, 2014 · 0162fca · 0162fca
1 parent 50514ac
commit 0162fca
Show file tree

Hide file tree

Showing 33 changed files with 51 additions and 37 deletions.
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -53,7 +53,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="at_aconet_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
@@ -28,7 +28,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="au_aaf_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="be_belnet_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="br_cafe_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
@@ -53,7 +53,7 @@
         
         This one is used to sign the eduGAIN aggregate.
     -->
-    <bean id="ca_caf_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>
@@ -74,7 +74,7 @@
         
         This one is used to sign the production aggregate.
     -->
-    <bean id="ca_caf_cafShibSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Federation signing certificate.
     -->
-    <bean id="ch_switchaai_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>
@@ -62,7 +62,7 @@
     <!--
         Interfederation signing certificate.
     -->
-    <bean id="ch_switchaai_interfedSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/cl_cofre/beans.xml b/mdx/cl_cofre/beans.xml
@@ -36,7 +36,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="cl_cofre_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -218,6 +218,20 @@
     <bean id="EntityRegistrationAuthorityFilterStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.saml.EntityRegistrationAuthorityFilterStage"/>
 
+    <!-- *** Parent beans for Shibboleth spring-extensions factory beans. *** -->
+
+    <bean id="PrivateKeyFactoryBean" abstract="true"
+        class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"/>
+
+    <bean id="PublicKeyFactoryBean" abstract="true"
+        class="net.shibboleth.ext.spring.factory.PublicKeyFactoryBean"/>
+
+    <bean id="X509CertificateChainFactoryBean" abstract="true"
+        class="net.shibboleth.ext.spring.factory.X509CertificateChainFactoryBean"/>
+
+    <bean id="X509CertificateFactoryBean" abstract="true"
+        class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"/>
+
     <!-- *** Parent beans for Shibboleth MDA components. *** -->
 
     <bean id="EntityFilterStage" abstract="true" parent="stage_parent"

diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
@@ -61,7 +61,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="cz_eduid_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="de_dfnaai_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
@@ -111,7 +111,7 @@
         
         This one is used to sign the eduGAIN aggregate.
     -->
-    <bean id="dk_wayf_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="es_sir_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Federation signing certificate.
     -->
-    <bean id="fi_haka_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>
@@ -71,7 +71,7 @@
     <!--
         eduGAIN signing certificate.
     -->
-    <bean id="fi_haka_edugainSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
@@ -67,7 +67,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="fr_renater_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>
@@ -87,7 +87,7 @@
     <!--
         eduGAIN signing certificate.
     -->
-    <bean id="fr_renater_edugainSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="gr_grnet_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
@@ -35,7 +35,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="hr_eduhr_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="hu_eduid_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
@@ -41,7 +41,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="ie_edugate_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
@@ -35,7 +35,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="int_cobweb_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
@@ -64,7 +64,7 @@
     <!--
         eduGAIN signing certificate.
     -->
-    <bean id="int_edugain_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
@@ -51,7 +51,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="it_idem_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
@@ -28,7 +28,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="jp_gakunin_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
@@ -54,7 +54,7 @@
         This certificate is used to sign the eduGAIN aggregate, but the production
         aggregate is not signed.
     -->
-    <bean id="lv_laife_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
@@ -23,7 +23,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="nl_surfconext_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
@@ -35,7 +35,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="nl_surfnet_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
@@ -65,7 +65,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="no_feide_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
@@ -28,7 +28,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="nz_tuakiri_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/pl_pionier/beans.xml b/mdx/pl_pionier/beans.xml
@@ -53,7 +53,7 @@
     <!--
         Federation signing certificate.
     -->
-    <bean id="pl_pionier_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>
@@ -64,7 +64,7 @@
     <!--
         eduGAIN signing certificate.
     -->
-    <bean id="pl_pionier_edugainCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
@@ -57,7 +57,7 @@
     <!--
         Federation signing certificate.
     -->
-    <bean id="se_swamid_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
@@ -28,7 +28,7 @@
     <!--
         ARNES signing certificate.
     -->
-    <bean id="si_arnes_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
@@ -71,7 +71,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="uk_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <bean id="uk_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/metadata-signer.crt"/>

diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
@@ -28,7 +28,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="uk_eduserv_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>

diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
@@ -44,7 +44,7 @@
     <!--
         InCommon signing certificate.
     -->
-    <bean id="us_incommon_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <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"/>