[java-shib-shared] branch main updated: Move new BFPP into config package.

Scott Cantor cantor.2 at osu.edu
Wed Sep 14 20:37:32 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-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=3f5491e7e2d83b73ec17f7eaaa310a70bf8d3ee2

The following commit(s) were added to refs/heads/main by this push:
     new 3f5491e7 Move new BFPP into config package.
3f5491e7 is described below

commit 3f5491e7e2d83b73ec17f7eaaa310a70bf8d3ee2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 16:37:29 2022 -0400

    Move new BFPP into config package.
---
 .../spring/config}/RelocatedBeanFactoryPostProcessor.java           | 2 +-
 .../spring/config}/RelocatedBeanFactoryPostProcessorTest.java       | 6 ++++--
 .../{ext/spring/util => shared/spring/config}/relocated.xml         | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessor.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessor.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
index 3d68b202..19f23120 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessor.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.config;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessorTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
similarity index 92%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessorTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
index a03c644b..07d0fd47 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/RelocatedBeanFactoryPostProcessorTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.config;
 
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
@@ -23,6 +23,8 @@ import org.springframework.context.support.GenericApplicationContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+
 /**
  * Test for {@link RelocatedBeanFactoryPostProcessor}.
  */
@@ -32,7 +34,7 @@ public class RelocatedBeanFactoryPostProcessorTest {
      * Test replacement of bean's class.
      */
     @Test public void testRelocated() {
-        final ApplicationContext context = getContext("net/shibboleth/ext/spring/util/relocated.xml");
+        final ApplicationContext context = getContext("net/shibboleth/shared/spring/config/relocated.xml");
         
         final String foo = (String) context.getBean("foo");
         Assert.assertEquals(foo, "bar");
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/relocated.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/relocated.xml
similarity index 93%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/util/relocated.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/config/relocated.xml
index 0628d6b1..b078cd54 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/relocated.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/relocated.xml
@@ -8,7 +8,7 @@
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-    <bean class="net.shibboleth.ext.spring.util.RelocatedBeanFactoryPostProcessor">
+    <bean class="net.shibboleth.shared.spring.config.RelocatedBeanFactoryPostProcessor">
         <property name="classes">
             <map>
                 <entry key="org.example.missing.Foo" value="java.lang.String" />

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


More information about the commits mailing list