[java-shib-attribute] branch main updated: Rename 2 spring-extensions packages.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 13 23:12:33 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=34d5be340ce99bfddb18f4e94c8dc06f656da9cf
The following commit(s) were added to refs/heads/main by this push:
new 34d5be340 Rename 2 spring-extensions packages.
34d5be340 is described below
commit 34d5be340ce99bfddb18f4e94c8dc06f656da9cf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 19:12:30 2022 -0400
Rename 2 spring-extensions packages.
---
.../filter/spring/AttributeFilterServiceTest.java | 2 +-
.../idp/attribute/filter/failfast/filterBeans.xml | 16 ++++++++--------
.../attribute/filter/failfast/filterBeansDefaultFF.xml | 16 ++++++++--------
.../resolver/spring/dc/impl/CacheConfigParser.java | 2 +-
.../attribute/resolver/spring/AttributeMapperTest.java | 2 +-
.../spring/AttributeMappingNodeProcessorTest.java | 2 +-
.../attribute/resolver/spring/AttributeResolverTest.java | 6 +++---
.../idp/attribute/resolver/spring/IdP1676Test.java | 4 ++--
.../testing/BaseAttributeDefinitionParserTest.java | 8 ++++----
.../resolver/failfast/attributeResolverBeans.xml | 16 ++++++++--------
.../failfast/attributeResolverBeansDefaultFF.xml | 16 ++++++++--------
.../idp/attribute/resolver/spring/idp-1676-service.xml | 2 +-
.../attribute/resolver/spring/mappedTemplateService.xml | 2 +-
.../shibboleth/idp/attribute/resolver/spring/service.xml | 2 +-
.../idp/attribute/resolver/spring/serviceNullStrip.xml | 2 +-
.../idp/attribute/resolver/spring/storageService.xml | 6 +++---
16 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
index 8f323d4b8..5ddeec96f 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
@@ -33,7 +33,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -41,6 +40,7 @@ import net.shibboleth.idp.attribute.filter.AttributeFilter;
import net.shibboleth.idp.attribute.filter.AttributeFilterException;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.spring.impl.AttributeFilterServiceStrategy;
+import net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.service.ServiceException;
diff --git a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml
index ea01c4fde..fe19d1d22 100644
--- a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml
+++ b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml
@@ -14,20 +14,20 @@
p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<!-- This bean MUST be called "conversionService" to work properly. -->
<bean id="conversionService" destroy-method=""
class="org.springframework.context.support.ConversionServiceFactoryBean">
<property name="converters">
<set>
- <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.FunctionToFunctionConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.PredicateToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringToDurationConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.FunctionToFunctionConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" destroy-method=""/>
</set>
</property>
</bean>
diff --git a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml
index 9393bee71..45732041f 100644
--- a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml
+++ b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml
@@ -14,20 +14,20 @@
p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<!-- This bean MUST be called "conversionService" to work properly. -->
<bean id="conversionService" destroy-method=""
class="org.springframework.context.support.ConversionServiceFactoryBean">
<property name="converters">
<set>
- <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.FunctionToFunctionConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.PredicateToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringToDurationConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.FunctionToFunctionConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" destroy-method=""/>
</set>
</property>
</bean>
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
index a59654eb6..2799aa9cd 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
@@ -26,9 +26,9 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.config.StringToDurationConverter;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.shared.spring.config.StringToDurationConverter;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
index d6fd0fecf..dbd760397 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
@@ -32,7 +32,6 @@ import org.springframework.context.support.GenericApplicationContext;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.config.StringToDurationConverter;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
@@ -41,6 +40,7 @@ import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.saml.attribute.transcoding.SAML2AttributeTranscoder;
import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ScopedStringAttributeTranscoder;
+import net.shibboleth.shared.spring.config.StringToDurationConverter;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceException;
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
index c1941d223..455b8b1dd 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
@@ -36,7 +36,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.Multimap;
-import net.shibboleth.ext.spring.config.StringToDurationConverter;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.AttributesMapContainer;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -44,6 +43,7 @@ import net.shibboleth.idp.attribute.IdPRequestedAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.saml.attribute.impl.AttributeMappingNodeProcessor;
+import net.shibboleth.shared.spring.config.StringToDurationConverter;
import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index ad01fcbd9..8ea6bde7f 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -50,9 +50,6 @@ import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
-import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
-import net.shibboleth.ext.spring.config.StringToDurationConverter;
-import net.shibboleth.ext.spring.config.StringToResourceConverter;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
@@ -62,6 +59,9 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.spring.testing.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
+import net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor;
+import net.shibboleth.shared.spring.config.StringToDurationConverter;
+import net.shibboleth.shared.spring.config.StringToResourceConverter;
import net.shibboleth.shared.testing.DatabaseTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/IdP1676Test.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/IdP1676Test.java
index d299773a9..c1feaae86 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/IdP1676Test.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/IdP1676Test.java
@@ -40,13 +40,13 @@ import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
-import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
-import net.shibboleth.ext.spring.config.StringToDurationConverter;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
+import net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor;
+import net.shibboleth.shared.spring.config.StringToDurationConverter;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.service.ReloadableService;
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/testing/BaseAttributeDefinitionParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/testing/BaseAttributeDefinitionParserTest.java
index a002619dc..c788bfcff 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/testing/BaseAttributeDefinitionParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/testing/BaseAttributeDefinitionParserTest.java
@@ -30,10 +30,6 @@ import org.springframework.context.support.ConversionServiceFactoryBean;
import org.springframework.context.support.GenericApplicationContext;
import org.testng.annotations.AfterMethod;
-import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
-import net.shibboleth.ext.spring.config.StringToDurationConverter;
-import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
-import net.shibboleth.ext.spring.config.StringToResourceConverter;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
@@ -42,6 +38,10 @@ import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.ad.impl.SimpleAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy;
+import net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor;
+import net.shibboleth.shared.spring.config.StringToDurationConverter;
+import net.shibboleth.shared.spring.config.StringToIPRangeConverter;
+import net.shibboleth.shared.spring.config.StringToResourceConverter;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml
index 9169a329f..d01c5a49e 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml
@@ -14,19 +14,19 @@
p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<!-- 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.ext.spring.config.StringToIPRangeConverter" />
- <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
- <bean class="net.shibboleth.ext.spring.config.FunctionToFunctionConverter" />
- <bean class="net.shibboleth.ext.spring.config.PredicateToPredicateConverter" />
- <bean class="net.shibboleth.ext.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 class="net.shibboleth.shared.spring.config.FunctionToFunctionConverter" />
+ <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" />
+ <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
</set>
</property>
</bean>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml
index 5a98b5d32..7122fce5f 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml
@@ -14,19 +14,19 @@
p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<!-- 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.ext.spring.config.StringToIPRangeConverter" />
- <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
- <bean class="net.shibboleth.ext.spring.config.FunctionToFunctionConverter" />
- <bean class="net.shibboleth.ext.spring.config.PredicateToPredicateConverter" />
- <bean class="net.shibboleth.ext.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 class="net.shibboleth.shared.spring.config.FunctionToFunctionConverter" />
+ <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" />
+ <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
</set>
</property>
</bean>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml
index bdd4d18ce..4fa8cff74 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml
@@ -10,7 +10,7 @@
<!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<bean id="shibboleth.VelocityEngine" destroy-method=""
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml
index d08c9b59b..10184df95 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml
@@ -11,7 +11,7 @@
<!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<bean id="shibboleth.VelocityEngine" destroy-method=""
class="net.shibboleth.shared.spring.velocity.VelocityEngineFactoryBean">
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
index 661c289f7..dc74b6a63 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
@@ -10,7 +10,7 @@
<!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<bean id="shibboleth.VelocityEngine" destroy-method=""
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/serviceNullStrip.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/serviceNullStrip.xml
index b447c6078..3ace36897 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/serviceNullStrip.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/serviceNullStrip.xml
@@ -11,7 +11,7 @@
<!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<bean id="shibboleth.VelocityEngine" destroy-method=""
class="net.shibboleth.shared.spring.velocity.VelocityEngineFactoryBean">
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
index 7d3463c33..7c2140e50 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
@@ -13,9 +13,9 @@
class="org.springframework.context.support.ConversionServiceFactoryBean">
<property name="converters">
<list>
- <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringToDurationConverter" destroy-method=""/>
- <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" destroy-method="" />
+ <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" destroy-method=""/>
+ <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" destroy-method="" />
</list>
</property>
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list