[java-shib-metadata-new] 05/09: Rename primitive package.
Ian Young
ian at iay.org.uk
Tue Oct 4 13:25:43 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=6b5cf17306d1a42edbe4c502daffb51f8ee5538e
commit 6b5cf17306d1a42edbe4c502daffb51f8ee5538e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 13:17:38 2022 -0400
Rename primitive package.
---
.../main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java | 2 +-
.../saml/security/impl/MetadataPKIXValidationInformationResolver.java | 2 +-
.../src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java | 2 +-
.../spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java | 2 +-
.../spring/metadata/AbstractDynamicMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/AbstractMetadataProviderParser.java | 2 +-
.../spring/metadata/AbstractReloadingMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/ChainingMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/DynamicHTTPMetadataProviderParser.java | 2 +-
.../spring/metadata/FileBackedHTTPMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/FilesystemMetadataProviderParser.java | 2 +-
.../net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java | 2 +-
.../spring/metadata/HTTPMetadataProvidersParserSupport.java | 2 +-
.../net/shibboleth/spring/metadata/InlineMetadataProviderParser.java | 2 +-
.../spring/metadata/LocalDynamicMetadataProviderParser.java | 2 +-
.../spring/metadata/ResourceBackedMetadataProviderParser.java | 2 +-
.../spring/metadata/filter/DeprecatedEntityRoleFilterParser.java | 4 ++--
.../net/shibboleth/spring/metadata/filter/PredicateFilterParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/SchemaValidationParser.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 | 2 +-
.../net/shibboleth/spring/security/trust/AbstractChainingParser.java | 2 +-
.../spring/security/trust/AbstractPKIXValidationInfoParser.java | 2 +-
.../shibboleth/spring/security/trust/AbstractStaticPKIXParser.java | 2 +-
.../shibboleth/spring/security/trust/AbstractTrustEngineParser.java | 2 +-
.../spring/security/trust/CertPathPKIXValidationOptionsParser.java | 2 +-
.../shibboleth/spring/security/trust/PKIXValidationOptionsParser.java | 3 +--
29 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
index 8c1f5bb6..2f48981d 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
@@ -33,8 +33,8 @@ import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
import net.shibboleth.idp.saml.xmlobject.Scope;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* A container for all the {@link Scope} elements (attached to either a
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
index 4c3e8963..833fbeee 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
@@ -52,10 +52,10 @@ import net.shibboleth.idp.saml.xmlobject.KeyAuthority;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.collection.LockableClassToInstanceMultiMap;
import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* An implementation of {@link PKIXValidationInformationResolver} which resolves {@link PKIXValidationInformation} based
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 9851f8ca..13468390 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
@@ -20,8 +20,8 @@ package net.shibboleth.spring;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 eaf769b4..400ecdbe 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.primitive.StringSupport;
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;
/**
* Parser for abstract dynamic HTTP metadata resolvers.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
index 26be26fa..ded05862 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
@@ -17,8 +17,8 @@
package net.shibboleth.spring.metadata;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.opensaml.core.xml.persist.FilesystemLoadSaveManager;
import org.slf4j.Logger;
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 0fe5fac7..0aef188b 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
@@ -34,11 +34,11 @@ import org.w3c.dom.Node;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
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;
/**
* 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/AbstractReloadingMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
index 39fa4ff6..16175924 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
@@ -17,8 +17,8 @@
package net.shibboleth.spring.metadata;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
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 ecc9b9f7..08a33567 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
@@ -19,9 +19,9 @@ package net.shibboleth.spring.metadata;
import java.util.List;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.shared.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 727e5117..caeccfcd 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.primitive.StringSupport;
import net.shibboleth.shared.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* Parser for concrete dynamic HTTP metadata resolvers, based on {@link FunctionDrivenDynamicHTTPMetadataResolver}.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java
index b29e0e84..056e0106 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java
@@ -19,8 +19,8 @@ package net.shibboleth.spring.metadata;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.opensaml.saml.metadata.resolver.impl.FileBackedHTTPMetadataResolver;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FilesystemMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FilesystemMetadataProviderParser.java
index ae4735d1..fff94843 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FilesystemMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FilesystemMetadataProviderParser.java
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
/**
* Parser for a <FilesystemMetadataProvider>.
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 7e166e85..b427ad77 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.primitive.StringSupport;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.http.HttpClientFactoryBean;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* 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 bcd24602..3c85ed8f 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
@@ -31,11 +31,11 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
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;
/**
* 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 84f533fc..696b85a5 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
@@ -22,9 +22,9 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.shared.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
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/LocalDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
index c75778b1..b69f07ac 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
@@ -35,7 +35,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
/**
* Parser for {@link LocalDynamicMetadataResolver}.
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 bad162f7..2e182a15 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
@@ -32,9 +32,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.shared.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* Parser for a ResourceBackedMetadataProvider.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/DeprecatedEntityRoleFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/DeprecatedEntityRoleFilterParser.java
index 1b6bdafa..0fb9585f 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/DeprecatedEntityRoleFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/DeprecatedEntityRoleFilterParser.java
@@ -24,9 +24,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
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 8bff2dbe..d57e508f 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
@@ -39,6 +39,7 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.shared.xml.ElementSupport;
@@ -46,7 +47,6 @@ 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;
/**
* Parser for a <Predicate> filter.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.java
index 228caee3..4b5484bf 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.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.primitive.StringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* Parser for a <SchemaValidation> 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 a61ef898..6860ed5b 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
@@ -43,11 +43,11 @@ import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.StringSupport;
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;
/**
* 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 bef8f762..c1cbfa97 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.primitive.StringSupport;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 469a5cd0..c18ff99e 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
@@ -26,11 +26,11 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.StringSupport;
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;
/**
* 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 d6b7f624..f1c914a2 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
@@ -23,11 +23,11 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.primitive.StringSupport;
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 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 fec721e1..c28977d3 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
@@ -19,10 +19,10 @@ package net.shibboleth.spring.security.trust;
import java.util.List;
+import net.shibboleth.shared.primitive.StringSupport;
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 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 48f508c8..6f46b251 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
@@ -21,10 +21,10 @@ import java.util.List;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.primitive.StringSupport;
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 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 ab924a03..f59a3888 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
@@ -22,10 +22,10 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.primitive.StringSupport;
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 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/AbstractTrustEngineParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
index 2d74119c..851ac5fd 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
@@ -22,8 +22,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* Basis of all parsers for <security:TrustEngine>.
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 1302206b..abf48bea 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.primitive.StringSupport;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
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/PKIXValidationOptionsParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/PKIXValidationOptionsParser.java
index 93ffbf9f..f7045c5c 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/PKIXValidationOptionsParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/PKIXValidationOptionsParser.java
@@ -19,6 +19,7 @@ package net.shibboleth.spring.security.trust;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
@@ -27,8 +28,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
/**
* A Parser for the < ValidationOptions > within a StaticPKIXSignature.
*/
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list