[java-shib-metadata-new] 02/09: Rename XML package, and hide a couple of impl classes.
Ian Young
ian at iay.org.uk
Tue Oct 4 13:25:40 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-shib-metadata-new.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata-new.git;a=commit;h=2a001ac8eda90f38a50d30ad4a2e3b66850a78f6
commit 2a001ac8eda90f38a50d30ad4a2e3b66850a78f6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 12:03:19 2022 -0400
Rename XML package, and hide a couple of impl classes.
---
.../src/test/java/net/shibboleth/idp/saml/metadata/ACSUIInfoTest.java | 2 +-
.../java/net/shibboleth/idp/saml/metadata/OrganizationUIInfoTest.java | 2 +-
.../shibboleth/idp/saml/xmlobject/impl/KeyAuthorityUnmarshaller.java | 2 +-
.../java/net/shibboleth/idp/saml/xmlobject/impl/ScopeMarshaller.java | 2 +-
.../net/shibboleth/idp/saml/xmlobject/impl/ScopedValueMarshaller.java | 2 +-
.../security/impl/MetadataPKIXValidationInformationResolverTest.java | 2 +-
.../src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java | 3 ++-
.../spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java | 4 ++--
.../shibboleth/spring/metadata/AbstractMetadataProviderParser.java | 4 ++--
.../shibboleth/spring/metadata/ChainingMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/DynamicHTTPMetadataProviderParser.java | 2 +-
.../net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java | 2 +-
.../spring/metadata/HTTPMetadataProvidersParserSupport.java | 2 +-
.../net/shibboleth/spring/metadata/InlineMetadataProviderParser.java | 2 +-
.../spring/metadata/ResourceBackedMetadataProviderParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java | 2 +-
.../java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java | 2 +-
.../spring/metadata/filter/EntityAttributesFilterParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java | 2 +-
.../shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/NodeProcessingParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/PredicateFilterParser.java | 2 +-
.../shibboleth/spring/metadata/filter/SignatureValidationParser.java | 2 +-
.../spring/security/credential/AbstractBasicCredentialParser.java | 2 +-
.../spring/security/credential/AbstractCredentialParser.java | 2 +-
.../spring/security/credential/AbstractX509CredentialParser.java | 4 ++--
.../net/shibboleth/spring/security/trust/AbstractChainingParser.java | 2 +-
.../spring/security/trust/AbstractPKIXValidationInfoParser.java | 2 +-
.../shibboleth/spring/security/trust/AbstractStaticPKIXParser.java | 2 +-
.../spring/security/trust/CertPathPKIXValidationOptionsParser.java | 2 +-
.../net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java | 2 +-
.../spring/security/trust/StaticExplicitKeySignatureParser.java | 2 +-
.../shibboleth/spring/metadata/filter/EntityRoleFilterParserTest.java | 2 +-
.../test/resources/net/shibboleth/spring/failfast/metadataBeans.xml | 2 +-
.../net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml | 2 +-
.../src/test/resources/net/shibboleth/spring/metadata/beans.xml | 4 ++--
.../test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml | 2 +-
.../net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml | 2 +-
.../test/resources/net/shibboleth/spring/metadata/serviceBeans.xml | 2 +-
39 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/ACSUIInfoTest.java b/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/ACSUIInfoTest.java
index 023cc035..5b121eec 100644
--- a/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/ACSUIInfoTest.java
+++ b/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/ACSUIInfoTest.java
@@ -27,7 +27,7 @@ import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.shared.xml.XMLParserException;
/**
* test for the {@link ACSUIInfo}.
diff --git a/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfoTest.java b/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfoTest.java
index 1c8f2179..de30b0d2 100644
--- a/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfoTest.java
+++ b/shib-metadata-api/src/test/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfoTest.java
@@ -26,7 +26,7 @@ import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.saml.saml2.metadata.Organization;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.shared.xml.XMLParserException;
/**
* test for the {@link OrganizationUIInfo}.
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityUnmarshaller.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityUnmarshaller.java
index 03c2f48c..6536d809 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityUnmarshaller.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityUnmarshaller.java
@@ -21,7 +21,7 @@ import javax.annotation.concurrent.ThreadSafe;
import javax.xml.namespace.QName;
import net.shibboleth.idp.saml.xmlobject.KeyAuthority;
-import net.shibboleth.utilities.java.support.xml.QNameSupport;
+import net.shibboleth.shared.xml.QNameSupport;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeMarshaller.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeMarshaller.java
index 5f228ff0..2c9d085c 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeMarshaller.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeMarshaller.java
@@ -20,7 +20,7 @@ package net.shibboleth.idp.saml.xmlobject.impl;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.idp.saml.xmlobject.Scope;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectMarshaller;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueMarshaller.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueMarshaller.java
index 5dca125f..9a544b79 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueMarshaller.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueMarshaller.java
@@ -20,7 +20,7 @@ package net.shibboleth.idp.saml.xmlobject.impl;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.idp.saml.xmlobject.ScopedValue;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectMarshaller;
diff --git a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java
index 0cfc84e2..14d6ac95 100644
--- a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java
+++ b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java
@@ -44,9 +44,9 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.xml.XMLParserException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
/**
* Testing the Shibboleth metadata PKIX validation information resolver.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
index 9101aae3..9851f8ca 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
@@ -19,8 +19,9 @@ package net.shibboleth.spring;
import javax.annotation.Nonnull;
+
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
index 43ce9c73..eaf769b4 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
@@ -28,10 +28,10 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.shared.xml.XMLConstants;
import net.shibboleth.spring.http.InMemoryCachingHttpClientFactoryBean;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.XMLConstants;
/**
* Parser for abstract dynamic HTTP metadata resolvers.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
index 9e936201..0fe5fac7 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
@@ -36,9 +36,9 @@ import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.DOMTypeSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for the MetadataProviderType in the <code>urn:mace:shibboleth:2.0:metadata</code> namespace.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java
index 0e856a53..ecc9b9f7 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java
@@ -20,8 +20,8 @@ package net.shibboleth.spring.metadata;
import java.util.List;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParser.java
index 2b4eace4..727e5117 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParser.java
@@ -30,8 +30,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for concrete dynamic HTTP metadata resolvers, based on {@link FunctionDrivenDynamicHTTPMetadataResolver}.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
index 78426492..7e166e85 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
@@ -27,9 +27,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.http.HttpClientFactoryBean;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for a FilesystemMetadataProvider.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
index 694bdf1e..bcd24602 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
@@ -32,10 +32,10 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.http.HttpClientFactoryBean;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Helper class for Spring configuration of HTTP metadata providers.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
index d5209d0e..84f533fc 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
@@ -23,8 +23,8 @@ import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.metadata.resolver.impl.DOMMetadataResolver;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
index eabe90b4..bad162f7 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
@@ -33,8 +33,8 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.spring.resource.ResourceHelper;
+import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
/**
* Parser for a ResourceBackedMetadataProvider.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java
index b534f2f4..6bae5da3 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java
@@ -44,10 +44,10 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for Algorithm filter.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java
index d0946f41..cd898267 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java
@@ -34,8 +34,8 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for a <ByReference> filter.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
index c54fd939..7d651727 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
@@ -42,10 +42,10 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/** Parser for a <EntityAttributes> filter. */
public class EntityAttributesFilterParser extends AbstractCustomBeanDefinitionParser {
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java
index 46dd49a4..025b4314 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java
@@ -30,8 +30,8 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for a <EntityRolet> filter.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java
index 7ecfd78b..c281d0ad 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java
@@ -37,10 +37,10 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/** Parser for a <NameIDFormat> filter. */
public class NameIDFormatFilterParser extends AbstractCustomBeanDefinitionParser {
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java
index 2472fb56..2aa0a628 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java
@@ -29,9 +29,9 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.spring.metadata.MetadataNamespaceHandler;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for a <NodeProcessing> filter.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
index de793c06..8bff2dbe 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
@@ -41,12 +41,12 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.logic.PredicateSupport;
import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for a <Predicate> filter.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
index bb1d1002..a61ef898 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
@@ -45,9 +45,9 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for xsi:type="SignatureValidation".
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java
index 4420d2ff..bef8f762 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java
@@ -23,9 +23,9 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
index 113e7529..469a5cd0 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
@@ -28,9 +28,9 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Base parser for all <Credential> elements.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
index b5ce1792..d6b7f624 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
@@ -24,10 +24,10 @@ import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.AttributeSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java
index c96b27ce..fec721e1 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java
@@ -20,9 +20,9 @@ package net.shibboleth.spring.security.trust;
import java.util.List;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.factory.config.RuntimeBeanReference;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractPKIXValidationInfoParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractPKIXValidationInfoParser.java
index 16a31e8c..48f508c8 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractPKIXValidationInfoParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractPKIXValidationInfoParser.java
@@ -22,9 +22,9 @@ import java.util.List;
import javax.xml.namespace.QName;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java
index 3c76e60c..ab924a03 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java
@@ -23,9 +23,9 @@ import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.security.x509.impl.BasicX509CredentialNameEvaluator;
import org.opensaml.security.x509.impl.CertPathPKIXTrustEvaluator;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/CertPathPKIXValidationOptionsParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/CertPathPKIXValidationOptionsParser.java
index bac1b4f7..1302206b 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/CertPathPKIXValidationOptionsParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/CertPathPKIXValidationOptionsParser.java
@@ -21,9 +21,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.security.x509.impl.CertPathPKIXValidationOptions;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java
index 8c74725d..44886ca7 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java
@@ -22,8 +22,8 @@ import java.util.List;
import javax.xml.namespace.QName;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.security.credential.impl.StaticCredentialResolver;
import org.opensaml.security.trust.impl.ExplicitKeyTrustEngine;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java
index 70cee3ae..02b6f5c6 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java
@@ -22,8 +22,8 @@ import java.util.List;
import javax.xml.namespace.QName;
import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.opensaml.security.credential.impl.StaticCredentialResolver;
import org.opensaml.xmlsec.config.impl.DefaultSecurityConfigurationBootstrap;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParserTest.java
index 1357ed77..d45b5ab3 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParserTest.java
@@ -22,9 +22,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.xml.QNameSupport;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.xml.QNameSupport;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
index 71c581a9..683e45fc 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
@@ -30,7 +30,7 @@
</bean>
<bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
index c88600d6..f6e3d372 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
@@ -30,7 +30,7 @@
</bean>
<bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
index f25d016d..acea3f68 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
@@ -14,14 +14,14 @@
p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<bean id="shibboleth.ParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="100"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
<bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
index ea7aff55..07b91611 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
@@ -10,7 +10,7 @@
default-init-method="initialize" default-destroy-method="destroy">
<bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
index 2461995b..ce926b5e 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
@@ -18,7 +18,7 @@
c:_0="net/shibboleth/spring/metadata/filter/entityAttributesMetadata.xml" />
<bean id="shibboleth.ParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="100"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
index ad7adbd5..3d1a48b7 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
@@ -10,7 +10,7 @@
default-init-method="initialize" default-destroy-method="destroy">
<bean id="myParserPool"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list