[java-identity-provider] branch main updated: Rename Spring util package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 21:04:44 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=5b8caeb026441b5df6c2e44f7d79d20921123410
The following commit(s) were added to refs/heads/main by this push:
new 5b8caeb02 Rename Spring util package.
5b8caeb02 is described below
commit 5b8caeb026441b5df6c2e44f7d79d20921123410
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 17:04:41 2022 -0400
Rename Spring util package.
---
.../shibboleth/idp/admin/impl/AdministrativeFlowDescriptorManager.java | 2 +-
.../idp/admin/impl/InitializeAdministrativeProfileContextTree.java | 2 +-
.../shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java | 2 +-
.../src/main/resources/net/shibboleth/idp/conf/global-system.xml | 2 +-
.../net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml | 2 +-
.../net/shibboleth/idp/flows/intercept/attribute-release-beans.xml | 2 +-
.../idp/consent/logic/impl/AbstractAttributeDisplayFunction.java | 3 +--
.../src/main/java/net/shibboleth/idp/installer/V4Install.java | 2 +-
.../net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java | 2 +-
.../interceptor/impl/ProfileInterceptorFlowDescriptorManager.java | 2 +-
.../idp/session/impl/LogoutPropagationFlowDescriptorManager.java | 2 +-
.../main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java | 2 +-
.../src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java | 2 +-
13 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/AdministrativeFlowDescriptorManager.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/AdministrativeFlowDescriptorManager.java
index 9b5c348cc..853a5c051 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/AdministrativeFlowDescriptorManager.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/AdministrativeFlowDescriptorManager.java
@@ -23,8 +23,8 @@ import javax.annotation.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
-import net.shibboleth.ext.spring.util.IdentifiedComponentManager;
import net.shibboleth.idp.admin.AdministrativeFlowDescriptor;
+import net.shibboleth.shared.spring.config.IdentifiedComponentManager;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
/**
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java
index 3cbbeb067..0d5577100 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java
@@ -27,12 +27,12 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.admin.AdministrativeFlowDescriptor;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.ui.context.RelyingPartyUIContext;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
/**
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java
index b06eea2e6..1d540597e 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java
@@ -23,8 +23,8 @@ import javax.annotation.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
-import net.shibboleth.ext.spring.util.IdentifiedComponentManager;
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
+import net.shibboleth.shared.spring.config.IdentifiedComponentManager;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
/**
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index fa34dd240..4a5d99789 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -338,7 +338,7 @@
<bean id="shibboleth.NonFailFastValidator"
class="net.shibboleth.idp.attribute.resolver.dc.NonFailFastValidator" lazy-init="true" />
- <bean class="net.shibboleth.ext.spring.util.DeprecatedBeanDetector" c:_1="global.xml">
+ <bean class="net.shibboleth.shared.spring.config.DeprecatedBeanDetector" c:_1="global.xml">
<constructor-arg index="0">
<map>
<entry key="shibboleth.SignatureWhitelist" value="shibboleth.IncludedSignatureAlgorithms" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
index 18ceee23e..184e3c612 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
@@ -26,7 +26,7 @@
<import resource="conditional:%{idp.home}/conf/authn/remoteuser-internal-authn-config.xml" />
- <bean class="net.shibboleth.ext.spring.util.DeprecatedBeanDetector" c:_1="remoteuser-internal-authn-config.xml">
+ <bean class="net.shibboleth.shared.spring.config.DeprecatedBeanDetector" c:_1="remoteuser-internal-authn-config.xml">
<constructor-arg index="0">
<map>
<entry key="shibboleth.authn.RemoteUser.whitelistedUsernames">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
index 28f9a34c5..48bedf8eb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
@@ -21,7 +21,7 @@
<import resource="conditional:%{idp.home}/conf/intercept/consent-intercept-config.xml" />
- <bean class="net.shibboleth.ext.spring.util.DeprecatedBeanDetector" c:_1="consent-intercept-config.xml">
+ <bean class="net.shibboleth.shared.spring.config.DeprecatedBeanDetector" c:_1="consent-intercept-config.xml">
<constructor-arg index="0">
<map>
<entry key="shibboleth.consent.attribute-release.WhitelistedAttributeIDs" value="shibboleth.consent.attribute-release.PromptedAttributeIDs" />
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 7b13395a8..79c5410c2 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
@@ -29,10 +29,9 @@ import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
-
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+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;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 66efcac35..ba9797c04 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -48,7 +48,6 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
import net.shibboleth.idp.Version;
import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.idp.installer.plugin.impl.PluginState;
@@ -60,6 +59,7 @@ import net.shibboleth.idp.plugin.PluginVersion;
import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
import net.shibboleth.shared.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext;
import net.shibboleth.shared.spring.context.DelimiterAwareApplicationContext;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java
index 128b3f5f5..3ec55190a 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java
@@ -31,10 +31,10 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
import net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorImpl;
import net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorParametersImpl;
import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
/**
* Task to generate metadata.
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/ProfileInterceptorFlowDescriptorManager.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/ProfileInterceptorFlowDescriptorManager.java
index b1552fc9f..1cd1a6788 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/ProfileInterceptorFlowDescriptorManager.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/ProfileInterceptorFlowDescriptorManager.java
@@ -23,8 +23,8 @@ import javax.annotation.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
-import net.shibboleth.ext.spring.util.IdentifiedComponentManager;
import net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor;
+import net.shibboleth.shared.spring.config.IdentifiedComponentManager;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
/**
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/LogoutPropagationFlowDescriptorManager.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/LogoutPropagationFlowDescriptorManager.java
index f830f260b..bacc49bf7 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/LogoutPropagationFlowDescriptorManager.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/LogoutPropagationFlowDescriptorManager.java
@@ -23,8 +23,8 @@ import javax.annotation.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
-import net.shibboleth.ext.spring.util.IdentifiedComponentManager;
import net.shibboleth.idp.session.LogoutPropagationFlowDescriptor;
+import net.shibboleth.shared.spring.config.IdentifiedComponentManager;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
/**
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
index 6c3c82781..8ba7e71a6 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
@@ -47,11 +47,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.attribute.AttributesMapContainer;
import net.shibboleth.idp.saml.metadata.ACSUIInfo;
import net.shibboleth.idp.saml.metadata.IdPUIInfo;
import net.shibboleth.idp.saml.metadata.OrganizationUIInfo;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
index 8fc9500da..94d5607b6 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
@@ -40,11 +40,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.saml.profile.context.navigate.SAMLMetadataContextLookupFunction;
import net.shibboleth.idp.ui.context.RelyingPartyUIContext;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list