[java-identity-provider] branch main updated: Rename Spring context package.

[Scott Cantor]

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=9e717523dc60d52c701ea753f1105b3bc2cd4d8a

The following commit(s) were added to refs/heads/main by this push:
     new 9e717523d Rename Spring context package.
9e717523d is described below

commit 9e717523dc60d52c701ea753f1105b3bc2cd4d8a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 16:33:38 2022 -0400

    Rename Spring context package.
---
 .../src/main/java/net/shibboleth/idp/installer/V4Install.java         | 4 ++--
 .../shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java   | 4 ++--
 .../idp/profile/spring/logic/RelyingPartyIdPredicateTest.java         | 2 +-
 idp-war/src/main/webapp/WEB-INF/web.xml                               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

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 5c28ce80b..66efcac35 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,8 +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.context.DeferPlaceholderFileSystemXmlWebApplicationContext;
-import net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext;
 import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
 import net.shibboleth.idp.Version;
 import net.shibboleth.idp.installer.impl.InstallationLogger;
@@ -60,6 +58,8 @@ import net.shibboleth.idp.module.ModuleException;
 import net.shibboleth.idp.plugin.IdPPlugin;
 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.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-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java b/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java
index cf74fbd7b..b914688b3 100644
--- a/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java
+++ b/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java
@@ -37,9 +37,9 @@ import org.springframework.webflow.scope.FlashScope;
 import org.springframework.webflow.scope.FlowScope;
 import org.springframework.webflow.scope.ViewScope;
 
-import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
-import net.shibboleth.ext.spring.context.FilesystemGenericWebApplicationContext;
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.shared.spring.context.FilesystemGenericWebApplicationContext;
 
 /**
  * This is subclassed in order to customize the Spring {@link ApplicationContext} used for flow configuration.
diff --git a/idp-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java b/idp-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
index 4c586f4cb..882e7e0c3 100644
--- a/idp-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
+++ b/idp-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
@@ -17,10 +17,10 @@
 
 package net.shibboleth.idp.profile.spring.logic;
 
-import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate;
+import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.springframework.context.support.GenericApplicationContext;
diff --git a/idp-war/src/main/webapp/WEB-INF/web.xml b/idp-war/src/main/webapp/WEB-INF/web.xml
index 2f8581117..711e149e5 100644
--- a/idp-war/src/main/webapp/WEB-INF/web.xml
+++ b/idp-war/src/main/webapp/WEB-INF/web.xml
@@ -13,7 +13,7 @@
     
     <context-param>
         <param-name>contextClass</param-name>
-        <param-value>net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext</param-value>
+        <param-value>net.shibboleth.shared.spring.context.DelimiterAwareApplicationContext</param-value>
     </context-param>
     
     <context-param>
@@ -130,7 +130,7 @@
         </init-param>
         <init-param>
             <param-name>contextClass</param-name>
-            <param-value>net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext</param-value>
+            <param-value>net.shibboleth.shared.spring.context.DelimiterAwareApplicationContext</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>

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