[java-metadata-aggregator] branch main updated: MDA-294 - Additional abstract parent beans
Ian Young
ian at iay.org.uk
Thu Apr 25 16:14:52 UTC 2024
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=120c285eca560415e7ff3c2f67f0ce5a897cc2c8
The following commit(s) were added to refs/heads/main by this push:
new 120c285 MDA-294 - Additional abstract parent beans
120c285 is described below
commit 120c285eca560415e7ff3c2f67f0ce5a897cc2c8
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Apr 25 17:14:48 2024 +0100
MDA-294 - Additional abstract parent beans
https://shibboleth.atlassian.net/browse/MDA-294
---
doc/wiki/aggregate-and-republish.xml | 24 ++++++------
doc/wiki/aggregate-and-sign.xml | 6 +--
doc/wiki/discofeed.xml | 3 +-
doc/wiki/filter-aggregate.xml | 8 ++--
doc/wiki/per-entity.xml | 8 ++--
doc/wiki/sign-using-token.xml | 10 ++---
.../resources/net/shibboleth/metadata/beans.xml | 45 ++++++++++++++++++++++
7 files changed, 74 insertions(+), 30 deletions(-)
diff --git a/doc/wiki/aggregate-and-republish.xml b/doc/wiki/aggregate-and-republish.xml
index 65cb636..2fef0ce 100644
--- a/doc/wiki/aggregate-and-republish.xml
+++ b/doc/wiki/aggregate-and-republish.xml
@@ -17,11 +17,11 @@
<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
<property name="converters">
<set>
- <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" />
- <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" />
+ <bean parent="mda.StringToDurationConverter"/>
+ <bean parent="mda.StringToIPRangeConverter"/>
+ <bean parent="mda.BooleanToPredicateConverter"/>
+ <bean parent="mda.StringBooleanToPredicateConverter"/>
+ <bean parent="mda.StringToResourceConverter"/>
</set>
</property>
</bean>
@@ -75,8 +75,8 @@
<!-- Define some beans we'll use throughout this config -->
- <bean id="parserPool" class="net.shibboleth.shared.xml.impl.BasicParserPool"/>
- <bean id="httpClientBuilder" class="net.shibboleth.shared.httpclient.HttpClientBuilder"
+ <bean id="parserPool" parent="mda.BasicParserPool"/>
+ <bean id="httpClientBuilder" parent="mda.HttpClientBuilder"
p:connectionDisregardTLSCertificate="true"/>
<bean id="httpClient" factory-bean="httpClientBuilder" factory-method="buildClient"/>
<bean id="domSerializer" parent="mda.DOMElementSerializer"/>
@@ -175,7 +175,7 @@
<bean id="readIncommonMetadta" parent="mda.DOMResourceSourceStage"
p:id="readIncommonMetadta" p:parserPool-ref="parserPool">
<property name="DOMResource">
- <bean class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource" >
+ <bean parent="mda.HTTPResource">
<constructor-arg ref="httpClient"/>
<constructor-arg ref="incommonMdUrl"/>
</bean>
@@ -185,7 +185,7 @@
<bean id="validateIncommonSignature" parent="mda.XMLSignatureValidationStage"
p:id="validateIncommonSignature">
<property name="verificationCertificate">
- <bean class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean">
+ <bean parent="mda.X509CertificateFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.FileSystemResource">
<constructor-arg ref="incommonCertFile"/>
@@ -211,7 +211,7 @@
<bean id="readUkMetadata" parent="mda.DOMResourceSourceStage"
p:id="readUkMetadata" p:parserPool-ref="parserPool">
<property name="DOMResource">
- <bean class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource" >
+ <bean parent="mda.HTTPResource">
<constructor-arg ref="httpClient"/>
<constructor-arg ref="ukMdUrl"/>
</bean>
@@ -221,7 +221,7 @@
<bean id="validateUkSignature" parent="mda.XMLSignatureValidationStage"
p:id="validateUkSignature">
<property name="verificationCertificate">
- <bean class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean">
+ <bean parent="mda.X509CertificateFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.FileSystemResource">
<constructor-arg ref="ukCertFile"/>
@@ -275,7 +275,7 @@
<bean id="signEntitiesDescriptor" parent="mda.XMLSignatureSigningStage"
p:id="signEntitiesDescriptor">
<property name="privateKey">
- <bean class="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean">
+ <bean parent="mda.PrivateKeyFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.FileSystemResource">
<constructor-arg ref="signingKeyFile"/>
diff --git a/doc/wiki/aggregate-and-sign.xml b/doc/wiki/aggregate-and-sign.xml
index d01ad87..a3b8094 100644
--- a/doc/wiki/aggregate-and-sign.xml
+++ b/doc/wiki/aggregate-and-sign.xml
@@ -13,7 +13,7 @@
<bean id="source" parent="mda.DOMFilesystemSourceStage">
<property name="id" value="source"/>
<property name="parserPool">
- <bean class="net.shibboleth.shared.xml.impl.BasicParserPool" init-method="initialize"/>
+ <bean class="mda.BasicParserPool"/>
</property>
<property name="source">
<bean class="java.io.File">
@@ -42,7 +42,7 @@
<bean id="signMetadata" parent="mda.XMLSignatureSigningStage">
<property name="id" value="signMetadata"/>
<property name="privateKey">
- <bean class="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean">
+ <bean parent="mda.PrivateKeyFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.FileSystemResource">
<constructor-arg>
@@ -69,7 +69,7 @@
</bean>
<!-- Next we define a pipeline with all the stages in it -->
- <bean id="main" parent="mda.SimplePipeline" init-method="initialize">
+ <bean id="main" parent="mda.SimplePipeline">
<property name="id" value="main"/>
<property name="stages">
<list>
diff --git a/doc/wiki/discofeed.xml b/doc/wiki/discofeed.xml
index 15af4e9..5c8c4dc 100644
--- a/doc/wiki/discofeed.xml
+++ b/doc/wiki/discofeed.xml
@@ -25,8 +25,7 @@
<!-- Acquire the metadata aggregate. -->
<bean id="source" parent="mda.DOMFilesystemSourceStage">
<property name="parserPool">
- <bean class="net.shibboleth.shared.xml.impl.BasicParserPool"
- init-method="initialize"/>
+ <bean parent="mda.BasicParserPool"/>
</property>
<property name="source">
<bean class="java.io.File">
diff --git a/doc/wiki/filter-aggregate.xml b/doc/wiki/filter-aggregate.xml
index b0e2456..7a1c32f 100644
--- a/doc/wiki/filter-aggregate.xml
+++ b/doc/wiki/filter-aggregate.xml
@@ -3,7 +3,7 @@
xmlns="http://www.springframework.org/schema/beans" 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-3.0.xsd">
- <bean id="httpClientBuilder" class="net.shibboleth.shared.httpclient.HttpClientBuilder"/>
+ <bean id="httpClientBuilder" parent="mda.HttpClientBuilder"/>
<bean id="httpClient" factory-bean="httpClientBuilder" factory-method="buildClient"/>
<!-- Import the Standard bean definition resource. -->
@@ -15,10 +15,10 @@
<bean id="source" parent="mda.DOMResourceSourceStage">
<property name="id" value="source"/>
<property name="parserPool">
- <bean class="net.shibboleth.shared.xml.impl.BasicParserPool" init-method="initialize"/>
+ <bean parent="mda.BasicParserPool"/>
</property>
<property name="DOMResource">
- <bean class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource">
+ <bean parent="mda.HTTPResource">
<constructor-arg ref="httpClient"/>
<constructor-arg
value="http://metadata.ukfederation.org.uk/ukfederation-metadata.xml"/>
@@ -35,7 +35,7 @@
<bean id="validateSignature" parent="mda.XMLSignatureValidationStage">
<property name="id" value="validateSignature"/>
<property name="verificationCertificate">
- <bean class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean">
+ <bean parent="mda.X509CertificateFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.FileSystemResource">
<constructor-arg>
diff --git a/doc/wiki/per-entity.xml b/doc/wiki/per-entity.xml
index fc72658..b1e218a 100644
--- a/doc/wiki/per-entity.xml
+++ b/doc/wiki/per-entity.xml
@@ -11,7 +11,7 @@
<bean id="source" parent="mda.DOMFilesystemSourceStage">
<property name="id" value="source"/>
<property name="parserPool">
- <bean class="net.shibboleth.shared.xml.impl.BasicParserPool" init-method="initialize"/>
+ <bean parent="mda.BasicParserPool"/>
</property>
<property name="source">
<bean class="java.io.File">
@@ -35,7 +35,7 @@
<bean id="signMetadata" parent="mda.XMLSignatureSigningStage">
<property name="id" value="signMetadata"/>
<property name="privateKey">
- <bean class="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean">
+ <bean parent="mda.PrivateKeyFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.FileSystemResource">
<constructor-arg>
@@ -52,7 +52,7 @@
<bean id="serialize" parent="mda.MultiOutputSerializationStage">
<property name="id" value="serializeIdPs"/>
<property name="serializer">
- <bean id="domSerializer" parent="mda.DOMElementSerializer" />
+ <bean id="domSerializer" parent="mda.DOMElementSerializer"/>
</property>
<property name="outputStrategy">
<bean parent="mda.FilesInDirectoryMultiOutputStrategy">
@@ -71,7 +71,7 @@
</bean>
<!-- Next we define a pipeline with all the stages in it -->
- <bean id="main" parent="mda.SimplePipeline" init-method="initialize">
+ <bean id="main" parent="mda.SimplePipeline">
<property name="id" value="main"/>
<property name="stages">
<list>
diff --git a/doc/wiki/sign-using-token.xml b/doc/wiki/sign-using-token.xml
index 06eccb4..2c0f909 100644
--- a/doc/wiki/sign-using-token.xml
+++ b/doc/wiki/sign-using-token.xml
@@ -11,7 +11,7 @@
<bean id="source" parent="mda.DOMFilesystemSourceStage">
<property name="id" value="source"/>
<property name="parserPool">
- <bean class="net.shibboleth.shared.xml.impl.BasicParserPool" init-method="initialize"/>
+ <bean parent="mda.BasicParserPool"/>
</property>
<property name="source">
<bean class="java.io.File">
@@ -27,12 +27,12 @@
<bean id="signMetadata" parent="mda.XMLSignatureSigningStage">
<property name="id" value="signMetadata"/>
<property name="certificates">
- <bean class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean">
+ <bean parent="mda.X509CertificateFactoryBean">
<property name="resource" value="file:path/to/secrets/self-signed.pem"/>
</bean>
</property>
<property name="privateKey">
- <bean class="net.shibboleth.shared.spring.security.factory.PKCS11PrivateKeyFactoryBean">
+ <bean parent="mda.PKCS11PrivateKeyFactoryBean">
<property name="pkcs11Config" value="path/to/input/pkcs11-softhsm.cfg"/>
<property name="keyPassword" value="12341234"/>
<property name="keyAlias" value="key10"/>
@@ -48,12 +48,12 @@
</bean>
</property>
<property name="serializer">
- <bean id="domSerializer" parent="mda.DOMElementSerializer" />
+ <bean id="domSerializer" parent="mda.DOMElementSerializer"/>
</property>
</bean>
<!-- Next we define a pipeline with all the stages in it -->
- <bean id="main" parent="mda.SimplePipeline" init-method="initialize">
+ <bean id="main" parent="mda.SimplePipeline">
<property name="id" value="main"/>
<property name="stages">
<list>
diff --git a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
index b8c70aa..ddc7f10 100644
--- a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
+++ b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
@@ -79,6 +79,9 @@
<bean id="mda.NamespaceStrippingStage" abstract="true" parent="mda.stage_parent"
class="net.shibboleth.metadata.dom.NamespaceStrippingStage"/>
+ <bean id="mda.SimpleNamespaceContext" abstract="true"
+ class="net.shibboleth.metadata.dom.SimpleNamespaceContext"/>
+
<bean id="mda.StringAttributeValidationStage" abstract="true" parent="mda.stage_parent"
class="net.shibboleth.metadata.dom.StringAttributeValidationStage"/>
@@ -387,9 +390,51 @@
***********************************************************
-->
+ <bean id="mda.HttpClientBuilder" abstract="true"
+ class="net.shibboleth.shared.httpclient.HttpClientBuilder"/>
+
+ <bean id="mda.BooleanToPredicateConverter" abstract="true"
+ class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter"/>
+
<bean id="mda.IdentifiableBeanPostProcessor" abstract="true"
class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor"/>
+ <bean id="mda.StringBooleanToPredicateConverter" abstract="true"
+ class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter"/>
+
+ <bean id="mda.StringToDurationConverter" abstract="true"
+ class="net.shibboleth.shared.spring.config.StringToDurationConverter"/>
+
+ <bean id="mda.StringToIPRangeConverter" abstract="true"
+ class="net.shibboleth.shared.spring.config.StringToIPRangeConverter"/>
+
+ <bean id="mda.StringToResourceConverter" abstract="true"
+ class="net.shibboleth.shared.spring.config.StringToResourceConverter"/>
+
+ <bean id="mda.DOMDocumentFactoryBean" abstract="true"
+ class="net.shibboleth.shared.spring.factory.DOMDocumentFactoryBean"/>
+
+ <bean id="mda.HTTPResource" abstract="true"
+ class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"/>
+
+ <bean id="mda.PKCS11PrivateKeyFactoryBean" abstract="true"
+ class="net.shibboleth.shared.spring.security.factory.PKCS11PrivateKeyFactoryBean"/>
+
+ <bean id="mda.PrivateKeyFactoryBean" abstract="true"
+ class="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean"/>
+
+ <bean id="mda.PublicKeyFactoryBean" abstract="true"
+ class="net.shibboleth.shared.spring.security.factory.PublicKeyFactoryBean"/>
+
+ <bean id="mda.X509CertificateChainFactoryBean" abstract="true"
+ class="net.shibboleth.shared.spring.security.factory.X509CertificateChainFactoryBean"/>
+
+ <bean id="mda.X509CertificateFactoryBean" abstract="true"
+ class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean"/>
+
+ <bean id="mda.BasicParserPool" abstract="true" parent="mda.component_parent"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"/>
+
<!--
***************************************************
*** ***
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list