[java-shib-shared] branch main updated: Move custom schema Spring classes to new package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 20:53:55 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=ce143c1bc85ed30c670bd1edf0a2dabb3d4c3d42
The following commit(s) were added to refs/heads/main by this push:
new ce143c1b Move custom schema Spring classes to new package.
ce143c1b is described below
commit ce143c1bc85ed30c670bd1edf0a2dabb3d4c3d42
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 16:53:52 2022 -0400
Move custom schema Spring classes to new package.
---
.../resource/ConditionalResourceTest.java | 2 +-
.../resource/FileBackedHTTPResourceTest.java | 2 +-
.../httpclient/resource/HTTPResourceTest.java | 2 +-
.../ext/spring/util/ApplicationContextBuilder.java | 1 +
.../context/DelimiterAwareApplicationContext.java | 2 +-
.../custom}/AbstractCustomBeanDefinitionParser.java | 2 +-
.../spring/custom}/BaseSpringNamespaceHandler.java | 2 +-
.../custom}/EmbeddedAndSchemaAwareReader.java | 2 +-
...SchemaTypeAwareBeanDefinitionDocumentReader.java | 2 +-
...SchemaTypeAwareBeanDefinitionParserDelegate.java | 2 +-
.../SchemaTypeAwareXMLBeanDefinitionReader.java | 2 +-
.../spring/custom}/SecondaryNamespaceHandler.java | 2 +-
.../shared/spring/custom/package-info.java | 21 +++++++++++++++++++++
.../spring/util/IdentifiedComponentManagerTest.java | 1 +
.../spring/util/ParameterNameAnnotationTest.java | 2 ++
.../RelocatedBeanFactoryPostProcessorTest.java | 2 +-
.../spring/custom}/LowerParsersAndBean.java | 5 ++++-
.../spring/custom}/NestedParsersTest.java | 6 ++++--
.../spring/custom}/UpperParserAndBean.java | 4 +++-
.../shibboleth/shared/spring/resource/Idp1326.java | 2 +-
.../spring/resource/RunnableResourceTest.java | 2 +-
.../spring/handlers/urn-mace-shibboleth-2.0-nested | 2 +-
.../src/test/resources/META-INF/spring.handlers | 2 +-
.../spring/util => shared/spring/custom}/nested.xml | 0
24 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
index c8bd22f6..463beb87 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
@@ -19,7 +19,7 @@ package net.shibboleth.shared.spring.httpclient.resource;
import java.io.IOException;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.spring.resource.ConditionalResource;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
index bc0ed25b..50431bcb 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.shared.spring.httpclient.resource;
import java.io.File;
import java.io.IOException;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import org.apache.http.client.HttpClient;
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
index 287bdba9..6e58915f 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
@@ -36,7 +36,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
import net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
index 481f8843..f1f81a0f 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
@@ -36,6 +36,7 @@ import net.shibboleth.shared.spring.config.StringToDurationConverter;
import net.shibboleth.shared.spring.config.StringToIPRangeConverter;
import net.shibboleth.shared.spring.config.StringToResourceConverter;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java
index b9f82128..e166f2f0 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.xml.ResourceEntityResolver;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.util.StringUtils;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
/**
* Version of {@link DeferPlaceholderFileSystemXmlWebApplicationContext} which does not necessarily assume that file
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/AbstractCustomBeanDefinitionParser.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/AbstractCustomBeanDefinitionParser.java
similarity index 97%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/AbstractCustomBeanDefinitionParser.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/custom/AbstractCustomBeanDefinitionParser.java
index b4282421..be85baff 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/AbstractCustomBeanDefinitionParser.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/AbstractCustomBeanDefinitionParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
similarity index 99%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
index 86cbe230..38baacd3 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/EmbeddedAndSchemaAwareReader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/EmbeddedAndSchemaAwareReader.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/EmbeddedAndSchemaAwareReader.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/custom/EmbeddedAndSchemaAwareReader.java
index 869d9300..fbe30ef6 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/EmbeddedAndSchemaAwareReader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/EmbeddedAndSchemaAwareReader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import java.util.List;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionDocumentReader.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionDocumentReader.java
index f0164c47..72049620 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionDocumentReader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import java.util.LinkedHashSet;
import java.util.Set;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionParserDelegate.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionParserDelegate.java
index a7840144..877725c8 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionParserDelegate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareXMLBeanDefinitionReader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java
similarity index 97%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareXMLBeanDefinitionReader.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java
index 2b973b00..2238da10 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareXMLBeanDefinitionReader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SecondaryNamespaceHandler.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SecondaryNamespaceHandler.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
index 8ab40314..c2afae5a 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SecondaryNamespaceHandler.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import java.util.Map;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/package-info.java
new file mode 100644
index 00000000..5884c1f5
--- /dev/null
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Classes used in custom XML Spring configuration handling.
+ */
+package net.shibboleth.shared.spring.custom;
\ 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/ext/spring/util/IdentifiedComponentManagerTest.java
index 7b9cfa72..b36d16ae 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/IdentifiedComponentManagerTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/ext/spring/util/IdentifiedComponentManagerTest.java
@@ -29,6 +29,7 @@ import org.springframework.context.support.GenericApplicationContext;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParameterNameAnnotationTest.java b/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParameterNameAnnotationTest.java
index 7cffd0a1..34a86751 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParameterNameAnnotationTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/ext/spring/util/ParameterNameAnnotationTest.java
@@ -24,6 +24,8 @@ import org.springframework.context.support.GenericApplicationContext;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
+
/** {@link AnnotationParameterNameDiscoverer} unit test. */
@SuppressWarnings("javadoc")
public class ParameterNameAnnotationTest {
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
index 07d0fd47..e575c327 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
@@ -23,7 +23,7 @@ import org.springframework.context.support.GenericApplicationContext;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
/**
* Test for {@link RelocatedBeanFactoryPostProcessor}.
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/LowerParsersAndBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
similarity index 92%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/LowerParsersAndBean.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
index f5d5c2e3..365092b5 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/LowerParsersAndBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -27,6 +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.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/ext/spring/util/NestedParsersTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/NestedParsersTest.java
similarity index 91%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/NestedParsersTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/custom/NestedParsersTest.java
index 3a21ecad..f4f13d63 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/NestedParsersTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/NestedParsersTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -26,6 +26,8 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.testng.annotations.Test;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
+
public class NestedParsersTest {
@Test void Test() {
@@ -35,7 +37,7 @@ public class NestedParsersTest {
final SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
new SchemaTypeAwareXMLBeanDefinitionReader(context);
- beanDefinitionReader.loadBeanDefinitions(new ClassPathResource("/net/shibboleth/ext/spring/util/nested.xml"));
+ beanDefinitionReader.loadBeanDefinitions(new ClassPathResource("/net/shibboleth/shared/spring/custom/nested.xml"));
context.refresh();
final Collection<UpperParserAndBean> uppers = context.getBeansOfType(UpperParserAndBean.class).values();
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/UpperParserAndBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/UpperParserAndBean.java
similarity index 91%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/UpperParserAndBean.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/custom/UpperParserAndBean.java
index bd10bbdc..c4042a6e 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/UpperParserAndBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/UpperParserAndBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.custom;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
@@ -24,6 +24,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.custom.SecondaryNamespaceHandler;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
public class UpperParserAndBean extends SecondaryNamespaceHandler {
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
index d69cdded..baaa2b4e 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
@@ -32,8 +32,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
@SuppressWarnings("javadoc")
public class Idp1326{
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
index eef6261f..73af257d 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
@@ -34,7 +34,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
import net.shibboleth.utilities.java.support.scripting.ScriptedRunnable;
diff --git a/shib-spring/src/test/resources/META-INF/net/shibboleth/spring/handlers/urn-mace-shibboleth-2.0-nested b/shib-spring/src/test/resources/META-INF/net/shibboleth/spring/handlers/urn-mace-shibboleth-2.0-nested
index 1641f97d..5180d0b1 100644
--- a/shib-spring/src/test/resources/META-INF/net/shibboleth/spring/handlers/urn-mace-shibboleth-2.0-nested
+++ b/shib-spring/src/test/resources/META-INF/net/shibboleth/spring/handlers/urn-mace-shibboleth-2.0-nested
@@ -1 +1 @@
-net.shibboleth.ext.spring.util.UpperParserAndBean
\ No newline at end of file
+net.shibboleth.shared.spring.custom.UpperParserAndBean
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/META-INF/spring.handlers b/shib-spring/src/test/resources/META-INF/spring.handlers
index 6b6cd71c..5152d084 100644
--- a/shib-spring/src/test/resources/META-INF/spring.handlers
+++ b/shib-spring/src/test/resources/META-INF/spring.handlers
@@ -1,2 +1,2 @@
urn\:mace\:shibboleth\:2.0\:naturestudy = net.shibboleth.ext.spring.naturestudy.NamespaceHandler
-urn\:mace\:shibboleth\:2.0\:nested = net.shibboleth.ext.spring.util.LowerParsersAndBean
\ No newline at end of file
+urn\:mace\:shibboleth\:2.0\:nested = net.shibboleth.shared.spring.custom.LowerParsersAndBean
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/util/nested.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/custom/nested.xml
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/util/nested.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/custom/nested.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list