[java-identity-provider] branch main updated: Rename service abstraction packages.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 21 19:29: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-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1c77d16e1233bea233dcfadb74d78d331711e684
The following commit(s) were added to refs/heads/main by this push:
new 1c77d16e1 Rename service abstraction packages.
1c77d16e1 is described below
commit 1c77d16e1233bea233dcfadb74d78d331711e684
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 21 15:29:30 2022 -0400
Rename service abstraction packages.
---
.../authn/impl/ValidateExternalAuthentication.java | 4 +-
.../impl/AttributeRevocationCondition.java | 2 +-
.../impl/AttributeRevocationConditionTest.java | 4 +-
.../idp/cas/service/PatternServiceRegistry.java | 2 +-
.../PrepareTicketValidationResponseAction.java | 4 +-
.../cas/service/impl/ReloadingServiceRegistry.java | 6 +-
.../net/shibboleth/idp/conf/admin-system.xml | 16 +++---
.../net/shibboleth/idp/conf/services-system.xml | 65 +++++++++-------------
.../net/shibboleth/idp/flows/admin/status-flow.xml | 2 +-
.../impl/AbstractAttributeDisplayFunction.java | 4 +-
.../impl/AttributeDisplayDescriptionFunction.java | 2 +-
.../logic/impl/AttributeDisplayNameFunction.java | 2 +-
...ttributeDisplayNameDescriptionFunctionTest.java | 4 +-
.../idp/profile/impl/FilterAttributes.java | 4 +-
.../profile/impl/ReloadServiceConfiguration.java | 4 +-
.../idp/profile/impl/ResolveAttributes.java | 4 +-
.../DefaultRelyingPartyConfigurationResolver.java | 2 +-
.../impl/EncryptionCredentialsResolver.java | 4 +-
...ReloadingRelyingPartyConfigurationResolver.java | 4 +-
.../impl/SigningCredentialsResolver.java | 4 +-
.../impl/NameIdentifierGenerationServiceImpl.java | 2 +-
.../impl/ProxySAML1NameIdentifierGenerator.java | 4 +-
.../nameid/impl/ProxySAML2NameIDGenerator.java | 4 +-
.../impl/BaseAddAttributeStatementToAssertion.java | 2 +-
.../idp/saml/profile/impl/ReloadMetadata.java | 4 +-
.../impl/AddAttributeStatementToAssertion.java | 2 +-
.../impl/FilterByQueriedAttributeDesignators.java | 4 +-
.../impl/AddAttributeStatementToAssertion.java | 2 +-
.../profile/impl/FilterByQueriedAttributes.java | 4 +-
...estedAttributesInAttributeConsumingService.java | 2 +-
.../profile/impl/ValidateSAMLAuthentication.java | 4 +-
.../logic/tests/EntityAttributesPredicateTest.java | 2 +-
.../FilterByQueriedAttributeDesignatorsTest.java | 2 +-
.../impl/FilterByQueriedAttributesTest.java | 2 +-
.../profile/logic/attribute-registry-service.xml | 2 +-
idp-war/src/main/webapp/WEB-INF/jsp/status.jsp | 4 +-
36 files changed, 89 insertions(+), 100 deletions(-)
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
index a314468b7..d70b8f934 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
@@ -46,9 +46,9 @@ import net.shibboleth.idp.authn.context.ExternalAuthenticationContext;
import net.shibboleth.idp.authn.principal.IdPAttributePrincipal;
import net.shibboleth.idp.authn.principal.ProxyAuthenticationPrincipal;
import net.shibboleth.idp.authn.principal.UsernamePrincipal;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* An action that checks for an {@link ExternalAuthenticationContext} and directly produces an
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
index 98800c7ba..815353176 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationCondition.java
@@ -42,6 +42,7 @@ import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -49,7 +50,6 @@ import net.shibboleth.utilities.java.support.component.AbstractInitializableComp
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
* A condition for login flows that checks for revocation against a resolved
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationConditionTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationConditionTest.java
index db8763817..ae608ec3e 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationConditionTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/AttributeRevocationConditionTest.java
@@ -33,10 +33,10 @@ import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
index be9912790..9d890f1f7 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java
index 92561f8ee..af0b5389d 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java
@@ -54,13 +54,13 @@ import net.shibboleth.idp.cas.ticket.TicketPrincipalLookupFunction;
import net.shibboleth.idp.cas.ticket.TicketState;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Prepares {@link TicketValidationResponse} for use in CAS protocol response views. Possible outcomes:
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java
index 3fc704162..78467cdb9 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java
@@ -25,14 +25,14 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.idp.cas.service.Service;
import net.shibboleth.idp.cas.service.ServiceRegistry;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
- * Service registry wrapper around a {@link net.shibboleth.utilities.java.support.service.ReloadableService}.
+ * Service registry wrapper around a {@link net.shibboleth.shared.service.ReloadableService}.
*
* @author Marvin S. Addison
*/
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
index 4716a5812..88ff070fb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
@@ -272,12 +272,12 @@
p:exposedProperties="#{getObject('shibboleth.metrics.ExposedProperties')}" />
<bean id="shibboleth.metrics.LoggingGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="logging"
p:service-ref="shibboleth.LoggingService" />
<bean id="shibboleth.metrics.AccessControlGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="accesscontrol"
p:service-ref="shibboleth.ReloadableAccessControlService" />
@@ -287,17 +287,17 @@
p:service-ref="shibboleth.MetadataResolverService" />
<bean id="shibboleth.metrics.RelyingPartyGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="relyingparty"
p:service-ref="shibboleth.RelyingPartyResolverService" />
<bean id="shibboleth.metrics.NameIdentifierGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="nameid"
p:service-ref="shibboleth.NameIdentifierGenerationService" />
<bean id="shibboleth.metrics.AttributeRegistryGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="attribute.registry"
p:service-ref="shibboleth.AttributeRegistryService" />
@@ -307,17 +307,17 @@
p:service-ref="shibboleth.AttributeResolverService" />
<bean id="shibboleth.metrics.AttributeFilterGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="attribute.filter"
p:service-ref="shibboleth.AttributeFilterService" />
<bean id="shibboleth.metrics.CASServiceRegistryGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="cas.registry"
p:service-ref="shibboleth.ReloadableCASServiceRegistry" />
<bean id="shibboleth.metrics.ManagedBeanGaugeSet"
- class="net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet" lazy-init="true"
+ class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
c:metricName="managedbean"
p:service-ref="shibboleth.ManagedBeanService" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
index 5349fd22d..ecb596241 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
@@ -14,6 +14,13 @@
<import resource="${idp.home}/conf/services.xml" />
+ <bean id="shibboleth.ReloadableService" abstract="true"
+ class="net.shibboleth.shared.spring.service.ReloadableSpringService"
+ p:failFast="%{idp.service.failFast:false}"
+ p:reloadCheckDelay="PT0S"
+ p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
+ p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors" />
+
<!--
These are beans that define reloadable services. The actual Spring resources that configure the
services are generally defined in the services.xml file edited by deployers.
@@ -33,13 +40,11 @@
<ref bean="shibboleth.RelocatedBeanFactoryPostProcessor" />
</util:list>
- <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.AttributeFilterService" parent="shibboleth.ReloadableService"
depends-on="shibboleth.VelocityEngine"
p:serviceConfigurations-ref="ExtendedAttributeFilterResources"
p:failFast="%{idp.service.attribute.filter.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.attribute.filter.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors">
+ p:reloadCheckDelay="%{idp.service.attribute.filter.checkInterval:PT0S}">
<constructor-arg name="claz" value="net.shibboleth.idp.attribute.filter.AttributeFilter" />
<constructor-arg name="strategy">
<bean class="net.shibboleth.idp.attribute.filter.spring.impl.AttributeFilterServiceStrategy"
@@ -56,13 +61,11 @@
</property>
</bean>
- <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.AttributeResolverService" parent="shibboleth.ReloadableService"
depends-on="shibboleth.VelocityEngine"
p:serviceConfigurations-ref="ExtendedAttributeResolverResources"
p:failFast="%{idp.service.attribute.resolver.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.attribute.resolver.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors">
+ p:reloadCheckDelay="%{idp.service.attribute.resolver.checkInterval:PT0S}">
<constructor-arg name="claz" value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
<constructor-arg name="strategy">
<bean class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
@@ -80,12 +83,10 @@
</property>
</bean>
- <bean id="shibboleth.AttributeRegistryService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.AttributeRegistryService" parent="shibboleth.ReloadableService"
p:serviceConfigurations-ref="ExtendedAttributeRegistryResources"
p:failFast="%{idp.service.attribute.registry.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.attribute.registry.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors">
+ p:reloadCheckDelay="%{idp.service.attribute.registry.checkInterval:PT0S}">
<constructor-arg name="claz" value="net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry" />
<constructor-arg name="strategy">
<bean class="net.shibboleth.idp.attribute.transcoding.impl.AttributeRegistryServiceStrategy">
@@ -114,13 +115,11 @@
</property>
</bean>
- <bean id="shibboleth.NameIdentifierGenerationService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.NameIdentifierGenerationService" parent="shibboleth.ReloadableService"
c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"
p:serviceConfigurations-ref="ExtendedNameIdentifierGenerationResources"
p:failFast="%{idp.service.nameidGeneration.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.nameidGeneration.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors" />
+ p:reloadCheckDelay="%{idp.service.nameidGeneration.checkInterval:PT0S}"/>
<!-- Auto-append system config file to resource set. -->
<bean id ="ExtendedNameIdentifierGenerationResources" parent="shibboleth.ListCombiner"
p:firstList-ref="#{'%{idp.service.nameidGeneration.resources:shibboleth.NameIdentifierGenerationResources}'.trim()}" >
@@ -131,15 +130,13 @@
</property>
</bean>
- <bean id="shibboleth.RelyingPartyResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.RelyingPartyResolverService" parent="shibboleth.ReloadableService"
p:serviceConfigurations-ref="ExtendedRelyingPartyResolverResources"
p:failFast="%{idp.service.relyingparty.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.relyingparty.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors">
+ p:reloadCheckDelay="%{idp.service.relyingparty.checkInterval:PT0S}">
<constructor-arg name="claz" value="net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver" />
<constructor-arg name="strategy">
- <bean class="net.shibboleth.ext.spring.service.ClassBasedServiceStrategy"
+ <bean class="net.shibboleth.shared.spring.service.ClassBasedServiceStrategy"
c:serviceableClaz="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver" />
</constructor-arg>
</bean>
@@ -153,13 +150,11 @@
</property>
</bean>
- <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.MetadataResolverService" parent="shibboleth.ReloadableService"
depends-on="shibboleth.AttributeRegistryService"
p:serviceConfigurations-ref="ExtendedMetadataResolverResources"
p:failFast="%{idp.service.metadata.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.metadata.checkInterval:PT0S}"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor">
+ p:reloadCheckDelay="%{idp.service.metadata.checkInterval:PT0S}">
<constructor-arg name="claz" value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
<constructor-arg name="strategy">
<bean class="net.shibboleth.idp.saml.metadata.impl.MetadataResolverServiceStrategy" />
@@ -175,13 +170,11 @@
</property>
</bean>
- <bean id="shibboleth.ReloadableAccessControlService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.ReloadableAccessControlService" parent="shibboleth.ReloadableService"
c:claz="net.shibboleth.utilities.java.support.security.AccessControlService"
p:serviceConfigurations-ref="ExtendedAccessControlResources"
p:failFast="%{idp.service.access.failFast:%{idp.service.failFast:true}}"
- p:reloadCheckDelay="%{idp.service.access.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors" />
+ p:reloadCheckDelay="%{idp.service.access.checkInterval:PT0S}"/>
<!-- Auto-append system config file to resource set. -->
<bean id ="ExtendedAccessControlResources" parent="shibboleth.ListCombiner"
p:firstList-ref="#{'%{idp.service.access.resources:shibboleth.AccessControlResources}'.trim()}" >
@@ -192,14 +185,12 @@
</property>
</bean>
- <bean id="shibboleth.ReloadableCASServiceRegistry" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.ReloadableCASServiceRegistry" parent="shibboleth.ReloadableService"
c:claz="net.shibboleth.idp.cas.service.ServiceRegistry"
p:serviceConfigurations="#{getObject('%{idp.service.cas.registry.resources:shibboleth.CASServiceRegistryResources}'.trim()) ?:
getObject('shibboleth.DefaultCASServiceRegistryResources')}"
p:failFast="%{idp.service.cas.registry.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.cas.registry.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors" />
+ p:reloadCheckDelay="%{idp.service.cas.registry.checkInterval:PT0S}" />
<!-- This default populates the service with an empty CAS registry as a substitute for a real config. -->
<util:list id="shibboleth.DefaultCASServiceRegistryResources">
@@ -220,16 +211,14 @@
</bean>
</util:list>
- <bean id="shibboleth.ManagedBeanService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.ManagedBeanService" parent="shibboleth.ReloadableService"
c:claz="org.springframework.context.ApplicationContext"
p:serviceConfigurations="#{getObject('%{idp.service.managedBean.resources:shibboleth.ManagedBeanResources}'.trim()) ?:
getObject('shibboleth.DefaultManagedBeanResources')}"
p:failFast="%{idp.service.managedBean.failFast:%{idp.service.failFast:false}}"
- p:reloadCheckDelay="%{idp.service.managedBean.checkInterval:PT0S}"
- p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
- p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors">
+ p:reloadCheckDelay="%{idp.service.managedBean.checkInterval:PT0S}">
<constructor-arg name="strategy">
- <bean class="net.shibboleth.ext.spring.service.ApplicationContextServiceStrategy" />
+ <bean class="net.shibboleth.shared.spring.service.ApplicationContextServiceStrategy" />
</constructor-arg>
</bean>
<util:list id="shibboleth.DefaultManagedBeanResources">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-flow.xml
index 2f3d3916f..b9345d9e8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-flow.xml
@@ -28,7 +28,7 @@
<end-state id="Status" view="status">
<on-entry>
<evaluate expression="WriteAuditLog" />
- <evaluate expression="T(org.springframework.beans.factory.BeanFactoryUtils).beansOfTypeIncludingAncestors(flowRequestContext.getActiveFlow().getApplicationContext(), T(net.shibboleth.utilities.java.support.service.AbstractReloadableService)).values()" result="requestScope.services" />
+ <evaluate expression="T(org.springframework.beans.factory.BeanFactoryUtils).beansOfTypeIncludingAncestors(flowRequestContext.getActiveFlow().getApplicationContext(), T(net.shibboleth.shared.service.AbstractReloadableService)).values()" result="requestScope.services" />
<evaluate expression="environment" result="requestScope.environment" />
<evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.metrics.AttributeResolverGaugeSet')" result="requestScope.attributeResolverGaugeSet" />
<evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.metrics.MetadataGaugeSet')" result="requestScope.metadataResolverGaugeSet" />
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AbstractAttributeDisplayFunction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AbstractAttributeDisplayFunction.java
index 79c5410c2..a752619bf 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AbstractAttributeDisplayFunction.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AbstractAttributeDisplayFunction.java
@@ -31,12 +31,12 @@ import javax.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Abstract Function which returns {@link Locale}-aware information about an attribute. The abstract method
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayDescriptionFunction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayDescriptionFunction.java
index f3f1c6fed..2f353414b 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayDescriptionFunction.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayDescriptionFunction.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
+import net.shibboleth.shared.service.ReloadableService;
/**
* Function which returns the locale-aware display description of an attribute, defaulting to the
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameFunction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameFunction.java
index 83c622f39..452834add 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameFunction.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameFunction.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
+import net.shibboleth.shared.service.ReloadableService;
/**
* Function which returns the locale-aware display name of an attribute, defaulting to the
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameDescriptionFunctionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameDescriptionFunctionTest.java
index 2285b6b80..7d9651835 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameDescriptionFunctionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeDisplayNameDescriptionFunctionTest.java
@@ -31,9 +31,9 @@ import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.springframework.mock.web.MockHttpServletRequest;
import org.testng.Assert;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
index ccdf84c97..87496f7f9 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
@@ -47,9 +47,9 @@ import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Action that invokes the {@link AttributeFilter} for the current request.
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
index 3f009fd9f..c5b9d31e6 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
@@ -34,11 +34,11 @@ import org.springframework.webflow.execution.RequestContext;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.context.SpringRequestContext;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceException;
/**
* Action that refreshes a {@link ReloadableService} manually.
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
index f4bb5ba4e..b87b2d344 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
@@ -43,12 +43,12 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.SpringRequestContext;
import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Action that invokes the {@link AttributeResolver} for the current request.
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index e320c30c9..b70c3d1d8 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -34,12 +34,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.logic.VerifiedProfilePredicate;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.idp.relyingparty.RelyingPartyResolverCredentialHolder;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java
index 322198e45..a7a010215 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java
@@ -22,15 +22,15 @@ import java.util.Collections;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.ext.spring.service.ReloadableSpringService;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
+import net.shibboleth.shared.service.ServiceableComponent;
+import net.shibboleth.shared.spring.service.ReloadableSpringService;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialResolver;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
index f17b21798..7f91a2baf 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
@@ -31,13 +31,13 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Retrieves a per-relying party configuration for a given profile request based on the request context. The
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java
index 0d1886431..435ccd512 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java
@@ -22,15 +22,15 @@ import java.util.Collections;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.ext.spring.service.ReloadableSpringService;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
+import net.shibboleth.shared.service.ServiceableComponent;
+import net.shibboleth.shared.spring.service.ReloadableSpringService;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.CredentialResolver;
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java
index 76d7bba8e..0ea66093f 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java
@@ -22,8 +22,8 @@ import javax.annotation.Nonnull;
import org.opensaml.saml.saml1.profile.SAML1NameIdentifierGenerator;
import org.opensaml.saml.saml2.profile.SAML2NameIDGenerator;
-import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
import net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML1NameIdentifierGenerator.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML1NameIdentifierGenerator.java
index 161cdf0e4..5a26abd8d 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML1NameIdentifierGenerator.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML1NameIdentifierGenerator.java
@@ -21,10 +21,10 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.common.SAMLException;
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML2NameIDGenerator.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML2NameIDGenerator.java
index 68dcaffb2..f60019e7e 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML2NameIDGenerator.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/ProxySAML2NameIDGenerator.java
@@ -21,10 +21,10 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.common.SAMLException;
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
index 97202bf4a..c6b058c6c 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
@@ -42,6 +42,7 @@ import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -49,7 +50,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
* Base class for actions that encode an {@link AttributeContext} into a SAML attribute statement.
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java
index d6161f4c1..7a3feffbc 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java
@@ -37,13 +37,13 @@ import org.springframework.webflow.execution.RequestContext;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.context.SpringRequestContext;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Action that refreshes or clears a {@link MetadataResolver} manually.
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
index 868eeed61..2b388c413 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
@@ -45,10 +45,10 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.saml.profile.impl.BaseAddAttributeStatementToAssertion;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Action that builds an {@link AttributeStatement} and adds it to an {@link Assertion} returned by a lookup
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java
index 69831e46e..fdaf9dd4d 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java
@@ -47,13 +47,13 @@ import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Action that filters a set of attributes against the {@link org.opensaml.saml.saml1.core.AttributeDesignator}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
index 3a9208bef..71b3a4c62 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
@@ -45,10 +45,10 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.saml.profile.impl.BaseAddAttributeStatementToAssertion;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Action that builds an {@link AttributeStatement} and adds it to an {@link Assertion} returned by a lookup
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java
index 6feb3c09b..82da6aa54 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java
@@ -49,13 +49,13 @@ import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Action that filters a set of attributes against the {@link org.opensaml.saml.saml2.core.Attribute} objects in
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java
index 0ad268003..f826ceb6c 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java
@@ -26,8 +26,8 @@ import net.shibboleth.idp.attribute.AttributesMapContainer;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.saml.attribute.impl.AttributeMappingNodeProcessor;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
index 37382684c..9192d742c 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
@@ -71,13 +71,13 @@ import net.shibboleth.idp.saml.authn.principal.AuthnContextDeclRefPrincipal;
import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
import net.shibboleth.idp.saml.profile.context.navigate.SAMLMetadataContextLookupFunction;
import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* An action that produces an {@link net.shibboleth.idp.authn.AuthenticationResult} based on an inbound
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/logic/tests/EntityAttributesPredicateTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/logic/tests/EntityAttributesPredicateTest.java
index 2e59b8034..777eb9546 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/logic/tests/EntityAttributesPredicateTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/logic/tests/EntityAttributesPredicateTest.java
@@ -44,11 +44,11 @@ import org.w3c.dom.Document;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.saml.attribute.impl.AttributeMappingNodeProcessor;
import net.shibboleth.idp.saml.profile.logic.MappedEntityAttributesPredicate;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.spring.config.StringToDurationConverter;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
* Unit test for {@link EntityAttributesPredicate} and {@link MappedEntityAttributesPredicate}.
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java
index a671238bc..5e66e0b23 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java
@@ -47,10 +47,10 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.testing.MockReloadableService;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
/** Tests for {@link FilterByQueriedAttributeDesignators} */
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java
index e01859f1b..a6761ecbb 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java
@@ -47,10 +47,10 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.testing.MockReloadableService;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
/** Tests for {@link FilterByQueriedAttributes} */
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/profile/logic/attribute-registry-service.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/profile/logic/attribute-registry-service.xml
index cede857e3..ecbf29ad0 100644
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/profile/logic/attribute-registry-service.xml
+++ b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/profile/logic/attribute-registry-service.xml
@@ -26,7 +26,7 @@
<bean id="RegistryServiceStrategy" class="net.shibboleth.idp.attribute.transcoding.impl.AttributeRegistryServiceStrategy"
p:id="shibboleth.AttributeRegistryService" />
- <bean id="shibboleth.AttributeRegistryService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.AttributeRegistryService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
c:claz="net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry"
c:strategy-ref="RegistryServiceStrategy"
p:failFast="true"
diff --git a/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp b/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
index 398a3746a..a632388ac 100644
--- a/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
+++ b/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
@@ -25,8 +25,8 @@
<%@ page import="net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl" %>
<%@ page import="net.shibboleth.idp.attribute.resolver.DataConnector" %>
<%@ page import="net.shibboleth.utilities.java.support.component.IdentifiedComponent" %>
-<%@ page import="net.shibboleth.utilities.java.support.service.ReloadableService" %>
-<%@ page import="net.shibboleth.utilities.java.support.service.ServiceableComponent" %>
+<%@ page import="net.shibboleth.shared.service.ReloadableService" %>
+<%@ page import="net.shibboleth.shared.service.ServiceableComponent" %>
<%
final RequestContext requestContext = (RequestContext) request.getAttribute("flowRequestContext");
final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_INSTANT;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list