[java-shib-metadata] branch main updated: Test cleanup.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=6faa3c9c732ee20b6e08802e37e72c41eb7d27c4

The following commit(s) were added to refs/heads/main by this push:
     new 6faa3c9c Test cleanup.
6faa3c9c is described below

commit 6faa3c9c732ee20b6e08802e37e72c41eb7d27c4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 14 13:08:28 2023 -0400

    Test cleanup.
---
 .../shibboleth/spring/failfast/metadataBeans.xml   |  1 -
 .../spring/failfast/metadataBeansDefaultFF.xml     |  1 -
 .../spring/metadata/filter/predicateCustomBean.xml |  3 ---
 .../net/shibboleth/spring/metadata/parent.xml      | 31 ----------------------
 4 files changed, 36 deletions(-)

diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
index 51eaf702..1391b7e4 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
@@ -19,7 +19,6 @@
 	<bean id="shibboleth.MetadataResolverService"
 		class="net.shibboleth.shared.spring.service.ReloadableSpringService"
 		p:serviceConfigurations="%{ServiceConfiguration}"
-        p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
 		p:failFast="%{failFast}" p:reloadCheckDelay="0">
 		<constructor-arg name="claz"
 			value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
index 6e200000..b68025f6 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
@@ -19,7 +19,6 @@
 	<bean id="shibboleth.MetadataResolverService"
 		class="net.shibboleth.shared.spring.service.ReloadableSpringService"
 		p:serviceConfigurations="%{ServiceConfiguration}"
-        p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
 		p:reloadCheckDelay="0">
 		<constructor-arg name="claz"
 			value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/predicateCustomBean.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/predicateCustomBean.xml
index c6271868..e584066f 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/predicateCustomBean.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/predicateCustomBean.xml
@@ -9,9 +9,6 @@
                            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">
 
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
     <util:constant id="myTRUE" static-field="java.lang.Boolean.TRUE" />
     <util:constant id="myFALSE" static-field="java.lang.Boolean.FALSE" />
 
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/parent.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/parent.xml
deleted file mode 100644
index 90caf87b..00000000
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/parent.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       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"
-
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
-        class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
-    <!-- This bean MUST be called "conversionService" to work properly. -->
-    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
-        <property name="converters">
-            <set>
-                <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 class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
-            </set>
-        </property>
-    </bean>
-</beans>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.