[java-shib-shared] branch main updated: Rename Spring util package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 21:03:35 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=ac4810c3488688a67777ee4daff75d16cd5a491b
The following commit(s) were added to refs/heads/main by this push:
new ac4810c3 Rename Spring util package.
ac4810c3 is described below
commit ac4810c3488688a67777ee4daff75d16cd5a491b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 17:03:32 2022 -0400
Rename Spring util package.
---
.../java/net/shibboleth/shared/cli/AbstractCommandLine.java | 2 +-
.../ext/spring/service/ReloadableSpringService.java | 2 +-
.../ext/spring/service/ReloadableBeanServiceTest.java | 2 +-
.../ext/spring/service/ReloadableSpringServiceTest.java | 2 +-
.../util => shared/spring/config}/DeprecatedBeanDetector.java | 2 +-
.../spring/config}/IdentifiedComponentManager.java | 2 +-
.../spring/context/FileSystemXmlWebApplicationContext.java | 2 +-
.../spring/context/FilesystemGenericApplicationContext.java | 2 +-
.../context/FilesystemGenericWebApplicationContext.java | 2 +-
.../spring/util/AnnotationParameterNameDiscoverer.java | 4 ++--
.../spring/util/ApplicationContextBuilder.java | 2 +-
.../shibboleth/{ext => shared}/spring/util/SpringSupport.java | 2 +-
.../shibboleth/{ext => shared}/spring/util/package-info.java | 2 +-
.../spring/config}/IdentifiedComponentManagerTest.java | 10 +++++-----
.../shibboleth/shared/spring/custom/LowerParsersAndBean.java | 2 +-
.../shared/spring/factory/CombiningListFactoryBeanTest.java | 2 +-
.../shibboleth/{ext => shared}/spring/util/ParamClass.java | 2 +-
.../spring/util/ParameterNameAnnotationTest.java | 6 +++---
.../resources/net/shibboleth/ext/spring/util/paramBeans.xml | 11 -----------
.../{ext/spring/util => shared/spring/config}/combined.xml | 8 ++++----
.../{ext/spring/util => shared/spring/config}/freeOnly.xml | 4 ++--
.../{ext/spring/util => shared/spring/config}/overlap.xml | 10 +++++-----
.../{ext/spring/util => shared/spring/config}/staticOnly.xml | 8 ++++----
.../net/shibboleth/shared/spring/util/paramBeans.xml | 11 +++++++++++
24 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
index e5421b3e..f445854b 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
@@ -37,9 +37,9 @@ import org.springframework.core.io.support.ResourcePropertySource;
import com.beust.jcommander.JCommander;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
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/shib-service/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java b/shib-service/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
index cd9ed40b..f83f7e83 100644
--- a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
+++ b/shib-service/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
@@ -42,7 +42,7 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.io.Resource;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
index 235d49f3..f504d021 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
@@ -20,7 +20,7 @@ package net.shibboleth.ext.spring.service;
import java.io.IOException;
import java.util.Collections;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
index cfb0e3ac..2df3f4b7 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
@@ -25,7 +25,7 @@ import java.time.Duration;
import java.time.Instant;
import java.util.Collections;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.springframework.beans.factory.BeanInitializationException;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/DeprecatedBeanDetector.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/DeprecatedBeanDetector.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
index da78051e..2e2f9222 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/DeprecatedBeanDetector.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.config;
import java.util.HashMap;
import java.util.Map;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/IdentifiedComponentManager.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/IdentifiedComponentManager.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
index 0d6dd3ab..bc34ce15 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/IdentifiedComponentManager.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.config;
import java.util.Collection;
import java.util.Collections;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
index 835239a2..9eeebd6b 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
@@ -24,8 +24,8 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.web.context.support.XmlWebApplicationContext;
-import net.shibboleth.ext.spring.util.AnnotationParameterNameDiscoverer;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
+import net.shibboleth.shared.spring.util.AnnotationParameterNameDiscoverer;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java
index 6df14c97..c6ef459e 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java
@@ -17,8 +17,8 @@
package net.shibboleth.shared.spring.context;
-import net.shibboleth.ext.spring.util.AnnotationParameterNameDiscoverer;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
+import net.shibboleth.shared.spring.util.AnnotationParameterNameDiscoverer;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.ApplicationContext;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java
index 37d922bd..6fae147b 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java
@@ -17,8 +17,8 @@
package net.shibboleth.shared.spring.context;
-import net.shibboleth.ext.spring.util.AnnotationParameterNameDiscoverer;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
+import net.shibboleth.shared.spring.util.AnnotationParameterNameDiscoverer;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.FileSystemResource;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/AnnotationParameterNameDiscoverer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/AnnotationParameterNameDiscoverer.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
index b4335bfb..a7c8dcd4 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/AnnotationParameterNameDiscoverer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.util;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
@@ -33,7 +33,7 @@ import net.shibboleth.utilities.java.support.annotation.ParameterName;
/**
* An implementation of {@link ParameterNameDiscoverer} that is driven by the {@link ParameterName} Annotation.
*
- * @since 5.3.0 (IdP 3.3.0)
+ * @since 5.3.0
*/
public class AnnotationParameterNameDiscoverer extends DefaultParameterNameDiscoverer implements
ParameterNameDiscoverer {
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
similarity index 99%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
index f1f81a0f..e9c72174 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.util;
import java.io.IOException;
import java.util.Arrays;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
similarity index 99%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
index 317c0c4c..7d059012 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/package-info.java
similarity index 95%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/package-info.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/util/package-info.java
index d7b62d76..23bb7f8a 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/package-info.java
@@ -19,4 +19,4 @@
* Supporting classes for using Spring.
*/
-package net.shibboleth.ext.spring.util;
\ No newline at end of file
+package net.shibboleth.shared.spring.util;
\ No newline at end of file
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/IdentifiedComponentManagerTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
similarity index 96%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/IdentifiedComponentManagerTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
index b36d16ae..f0f65360 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/IdentifiedComponentManagerTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.config;
import java.util.Collection;
import java.util.Iterator;
@@ -40,7 +40,7 @@ import net.shibboleth.utilities.java.support.component.AbstractIdentifiableIniti
public class IdentifiedComponentManagerTest {
@Test public void testCombining() {
- final ApplicationContext context = getContext("net/shibboleth/ext/spring/util/combined.xml");
+ final ApplicationContext context = getContext("net/shibboleth/shared/spring/config/combined.xml");
final MockComponentManager manager = context.getBean(MockComponentManager.class);
Assert.assertNotNull(manager);
@@ -58,7 +58,7 @@ public class IdentifiedComponentManagerTest {
}
@Test public void testOverlap() {
- final ApplicationContext context = getContext("net/shibboleth/ext/spring/util/overlap.xml");
+ final ApplicationContext context = getContext("net/shibboleth/shared/spring/config/overlap.xml");
final MockComponentManager manager = context.getBean(MockComponentManager.class);
Assert.assertNotNull(manager);
@@ -76,7 +76,7 @@ public class IdentifiedComponentManagerTest {
}
@Test public void testStaticOnly() {
- final ApplicationContext context = getContext("net/shibboleth/ext/spring/util/staticOnly.xml");
+ final ApplicationContext context = getContext("net/shibboleth/shared/spring/config/staticOnly.xml");
final MockComponentManager manager = context.getBean(MockComponentManager.class);
Assert.assertNotNull(manager);
@@ -94,7 +94,7 @@ public class IdentifiedComponentManagerTest {
}
@Test public void testFreeOnly() {
- final ApplicationContext context = getContext("net/shibboleth/ext/spring/util/freeOnly.xml");
+ final ApplicationContext context = getContext("net/shibboleth/shared/spring/config/freeOnly.xml");
final MockComponentManager manager = context.getBean(MockComponentManager.class);
Assert.assertNotNull(manager);
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
index 365092b5..db32f25c 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
@@ -27,9 +27,9 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.custom.BaseSpringNamespaceHandler;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
index 6c9af781..161aaf1e 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
@@ -28,7 +28,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
@SuppressWarnings("javadoc")
public class CombiningListFactoryBeanTest {
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParamClass.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
similarity index 97%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParamClass.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
index 3d8a4999..b65c6a5b 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParamClass.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.util;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParameterNameAnnotationTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParameterNameAnnotationTest.java
similarity index 97%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParameterNameAnnotationTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParameterNameAnnotationTest.java
index 34a86751..048ea329 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParameterNameAnnotationTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParameterNameAnnotationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.util;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory;
@@ -36,7 +36,7 @@ public class ParameterNameAnnotationTest {
final XmlBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(context);
beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- beanDefinitionReader.loadBeanDefinitions("net/shibboleth/ext/spring/util/paramBeans.xml");
+ beanDefinitionReader.loadBeanDefinitions("net/shibboleth/shared/spring/util/paramBeans.xml");
context.refresh();
final ParamClass byNumber = context.getBean("TheBeanRemainsTheSame", ParamClass.class);
@@ -66,7 +66,7 @@ public class ParameterNameAnnotationTest {
}
beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- beanDefinitionReader.loadBeanDefinitions("net/shibboleth/ext/spring/util/paramBeans.xml");
+ beanDefinitionReader.loadBeanDefinitions("net/shibboleth/shared/spring/util/paramBeans.xml");
context.refresh();
final ParamClass byNumber = context.getBean("TheBeanRemainsTheSame", ParamClass.class);
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/paramBeans.xml b/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/paramBeans.xml
deleted file mode 100644
index f40dd3bb..00000000
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/paramBeans.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="TheBeanRemainsTheSame" class="net.shibboleth.ext.spring.util.ParamClass" c:_0="Param the First" c:_1="Param the Second"/>
-
- <bean id="InThroughTheOutBean" class="net.shibboleth.ext.spring.util.ParamClass" c:param1="Param the First" c:param2="Param the Second"/>
-
- <bean id="SingleParam" class="net.shibboleth.ext.spring.util.ParamClass" c:param1="Param the First"/>
-
-</beans>
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/combined.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/combined.xml
similarity index 69%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/util/combined.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/config/combined.xml
index 8597875d..bab61bb9 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/combined.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/combined.xml
@@ -16,13 +16,13 @@
<context:annotation-config />
<util:list id="StaticList">
- <bean id="One" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo1" />
- <bean id="Two" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo2" />
+ <bean id="One" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo1" />
+ <bean id="Two" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo2" />
</util:list>
- <bean id="Three" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
+ <bean id="Three" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
- <bean class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponentManager"
+ <bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
</beans>
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/freeOnly.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/freeOnly.xml
similarity index 82%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/util/freeOnly.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/config/freeOnly.xml
index 336e2ab1..42358083 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/freeOnly.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/freeOnly.xml
@@ -18,9 +18,9 @@
<util:list id="StaticList">
</util:list>
- <bean id="Three" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
+ <bean id="Three" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
- <bean class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponentManager"
+ <bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
</beans>
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/overlap.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/overlap.xml
similarity index 63%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/util/overlap.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/config/overlap.xml
index 29bfbbc3..27a569ee 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/overlap.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/overlap.xml
@@ -16,14 +16,14 @@
<context:annotation-config />
<util:list id="StaticList">
- <bean id="One" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo1" />
- <bean id="Three" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
- <bean id="Two" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo2" />
+ <bean id="One" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo1" />
+ <bean id="Three" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
+ <bean id="Two" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo2" />
</util:list>
- <bean p:id="Three" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo4" />
+ <bean p:id="Three" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo4" />
- <bean class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponentManager"
+ <bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
</beans>
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/staticOnly.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/staticOnly.xml
similarity index 68%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/util/staticOnly.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/config/staticOnly.xml
index 709aca9e..69d8f3da 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/staticOnly.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/staticOnly.xml
@@ -16,12 +16,12 @@
<context:annotation-config />
<util:list id="StaticList">
- <bean id="One" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo1" />
- <bean id="Two" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo2" />
- <bean id="Three" class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
+ <bean id="One" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo1" />
+ <bean id="Two" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo2" />
+ <bean id="Three" class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponent" c:_0="Foo3" />
</util:list>
- <bean class="net.shibboleth.ext.spring.util.IdentifiedComponentManagerTest.MockComponentManager"
+ <bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
</beans>
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/util/paramBeans.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/util/paramBeans.xml
new file mode 100644
index 00000000..1fdd4ff2
--- /dev/null
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/util/paramBeans.xml
@@ -0,0 +1,11 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="TheBeanRemainsTheSame" class="net.shibboleth.shared.spring.util.ParamClass" c:_0="Param the First" c:_1="Param the Second"/>
+
+ <bean id="InThroughTheOutBean" class="net.shibboleth.shared.spring.util.ParamClass" c:param1="Param the First" c:param2="Param the Second"/>
+
+ <bean id="SingleParam" class="net.shibboleth.shared.spring.util.ParamClass" c:param1="Param the First"/>
+
+</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list