[java-shib-metadata] branch main updated: Rename resource and resolver packages.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 26 16:27:08 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-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=959074336cd7216fc0b4b692accca0893610f525
The following commit(s) were added to refs/heads/main by this push:
new 959074336 Rename resource and resolver packages.
959074336 is described below
commit 959074336cd7216fc0b4b692accca0893610f525
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 12:27:06 2022 -0400
Rename resource and resolver packages.
---
.../idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java | 2 +-
.../idp/saml/metadata/impl/MetadataResolverServiceStrategy.java | 2 +-
.../idp/saml/metadata/impl/ReloadableMetadataResolver.java | 4 ++--
.../security/impl/MetadataPKIXValidationInformationResolver.java | 4 ++--
.../shibboleth/idp/saml/metadata/impl/BaseNodeProcessorTest.java | 2 +-
.../shibboleth/idp/saml/metadata/impl/ScopesNodeProcessorTest.java | 4 ++--
.../shibboleth/idp/saml/metadata/impl/UIInfoNodeProcessorTest.java | 4 ++--
.../idp/saml/security/impl/KeyAuthorityNodeProcessorTest.java | 6 +++---
.../impl/MetadataPKIXValidationInformationResolverTest.java | 4 ++--
.../metadata/filter/SignatureValidationCriteriaSetFactoryBean.java | 6 +++---
.../net/shibboleth/spring/metadata/AbstractMetadataParserTest.java | 2 +-
.../net/shibboleth/spring/metadata/ChainingMetadataParserTest.java | 4 ++--
.../spring/metadata/DynamicHTTPMetadataProviderParserTest.java | 2 +-
.../net/shibboleth/spring/metadata/InlineMetadataParserTest.java | 2 +-
.../spring/metadata/LocalDynamicMetadataProviderParserTest.java | 2 +-
.../spring/metadata/filter/AlgorithmFilterParserTest.java | 4 ++--
.../spring/metadata/filter/ByReferenceFilterParserTest.java | 4 ++--
.../spring/metadata/filter/EntityAttributesFilterParserTest.java | 4 ++--
.../spring/metadata/filter/NameIDFormatFilterParserTest.java | 4 ++--
.../net/shibboleth/spring/metadata/filter/NodeProcessingTest.java | 4 ++--
.../spring/metadata/filter/PredicateFilterParserTest.java | 4 ++--
.../filter/SignatureValidationCriteriaSetFactoryBeanTest.java | 4 ++--
.../spring/metadata/filter/SignatureValidationParserTest.java | 2 +-
.../java/net/shibboleth/spring/security/trust/MockTrustEngine.java | 4 ++--
.../spring/security/trust/SignatureChainingParserTest.java | 2 +-
.../spring/security/trust/StaticExplicitKeyParserTest.java | 2 +-
.../spring/security/trust/StaticExplicitKeySignatureParserTest.java | 2 +-
.../spring/security/trust/StaticPKIXSignatureParserTest.java | 2 +-
.../spring/security/trust/StaticPKIXX509CredentialParserTest.java | 2 +-
.../spring/metadata/filter/signatureValidationRefs-beans.xml | 2 +-
30 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
index 998165ffa..78676562a 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
@@ -43,9 +43,9 @@ import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.service.ReloadableServiceGaugeSet;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
* Additional gauges for metadata resolvers.
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
index d7b7793f3..f8df3cc79 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
@@ -33,9 +33,9 @@ import org.springframework.context.ApplicationContext;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
* Strategy for summoning up a {@link MetadataResolver} from a populated {@link ApplicationContext}.
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
index f7f16b7cf..f7a59d304 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
@@ -30,11 +30,11 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
* This class uses the service interface to implement {@link MetadataResolver}.
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 3a8ee64f5..4c3e89635 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.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
* An implementation of {@link PKIXValidationInformationResolver} which resolves {@link PKIXValidationInformation} based
diff --git a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/BaseNodeProcessorTest.java b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/BaseNodeProcessorTest.java
index 4bb40706c..57184cda7 100644
--- a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/BaseNodeProcessorTest.java
+++ b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/BaseNodeProcessorTest.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
import org.testng.annotations.BeforeClass;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import net.shibboleth.shared.resolver.ResolverException;
public abstract class BaseNodeProcessorTest extends XMLObjectBaseTestCase {
diff --git a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessorTest.java b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessorTest.java
index 227ec64ec..eb548575f 100644
--- a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessorTest.java
+++ b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessorTest.java
@@ -31,8 +31,8 @@ import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
import org.testng.annotations.Test;
import net.shibboleth.idp.saml.metadata.ScopesContainer;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
public final class ScopesNodeProcessorTest extends BaseNodeProcessorTest {
diff --git a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/UIInfoNodeProcessorTest.java b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/UIInfoNodeProcessorTest.java
index f3063910b..6f37af9ae 100644
--- a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/UIInfoNodeProcessorTest.java
+++ b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/UIInfoNodeProcessorTest.java
@@ -33,8 +33,8 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.saml.metadata.ACSUIInfo;
import net.shibboleth.idp.saml.metadata.IdPUIInfo;
import net.shibboleth.idp.saml.metadata.OrganizationUIInfo;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
public final class UIInfoNodeProcessorTest extends BaseNodeProcessorTest {
diff --git a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/KeyAuthorityNodeProcessorTest.java b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/KeyAuthorityNodeProcessorTest.java
index 0b77ad1d9..2c59fc3f5 100644
--- a/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/KeyAuthorityNodeProcessorTest.java
+++ b/shib-metadata-impl/src/test/java/net/shibboleth/idp/saml/security/impl/KeyAuthorityNodeProcessorTest.java
@@ -22,9 +22,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
@@ -36,6 +33,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
+
public class KeyAuthorityNodeProcessorTest extends XMLObjectBaseTestCase {
private FilesystemMetadataResolver metadataProvider;
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 14d6ac95f..65489814b 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.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.xml.XMLParserException;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
* Testing the Shibboleth metadata PKIX validation information resolver.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java
index 4b877ac79..bcc65cad9 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java
@@ -24,9 +24,6 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.Criterion;
-
import org.opensaml.xmlsec.SecurityConfigurationSupport;
import org.opensaml.xmlsec.SignatureValidationConfiguration;
import org.opensaml.xmlsec.SignatureValidationParameters;
@@ -38,6 +35,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.FactoryBean;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.Criterion;
+
/**
* Factory bean impl for producing a {@link CriteriaSet} instance specialized for signature validation use
* cases, such as input to the {@link org.opensaml.saml.metadata.resolver.filter.impl.SignatureValidationFilter}.
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java
index 9ea3571fa..e39e11309 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java
@@ -39,9 +39,9 @@ import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
+import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
* Base class for testing metadata providers.
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/ChainingMetadataParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/ChainingMetadataParserTest.java
index 888a82795..c7e8a0ca1 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/ChainingMetadataParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/ChainingMetadataParserTest.java
@@ -20,14 +20,14 @@ package net.shibboleth.spring.metadata;
import java.io.IOException;
import java.util.Iterator;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-
import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
import org.opensaml.saml.metadata.resolver.DetectDuplicateEntityIDs;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.resolver.ResolverException;
+
@SuppressWarnings("javadoc")
public class ChainingMetadataParserTest extends AbstractMetadataParserTest {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java
index 2f1226648..a48b3aeba 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java
@@ -43,8 +43,8 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
+import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.testing.RepositorySupport;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@SuppressWarnings("javadoc")
public class DynamicHTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
index de48feff8..049c9a002 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
@@ -23,11 +23,11 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.stream.Collectors;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.shared.spring.service.ReloadableSpringService;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.DOMMetadataResolver;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParserTest.java
index f4f976c55..a38e60be0 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParserTest.java
@@ -44,9 +44,9 @@ import org.testng.annotations.Test;
import com.google.common.util.concurrent.Uninterruptibles;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
+import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.codec.StringDigester;
import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
*
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParserTest.java
index 8826f9d41..e6de97b35 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParserTest.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.xml.XMLObject;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/ByReferenceFilterParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/ByReferenceFilterParserTest.java
index 2f5d36bd7..98b2fd45c 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/ByReferenceFilterParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/ByReferenceFilterParserTest.java
@@ -20,9 +20,9 @@ package net.shibboleth.spring.metadata.filter;
import java.io.IOException;
import java.util.Collection;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.xml.XMLObject;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParserTest.java
index 69cc98856..6d09b8792 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParserTest.java
@@ -20,9 +20,9 @@ package net.shibboleth.spring.metadata.filter;
import java.io.IOException;
import java.util.Collection;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.xml.XMLObject;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParserTest.java
index 8032c101d..82277cecd 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParserTest.java
@@ -19,9 +19,9 @@ package net.shibboleth.spring.metadata.filter;
import java.io.IOException;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NodeProcessingTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NodeProcessingTest.java
index a9222e5ef..472a5b4f6 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NodeProcessingTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/NodeProcessingTest.java
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.util.List;
import net.shibboleth.idp.saml.security.impl.KeyAuthorityNodeProcessor;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.saml.metadata.EntityGroupName;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java
index 80eaa7c55..9c89af9dd 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java
@@ -33,10 +33,10 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
* Test for parser for PredicateFilter filter.
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java
index 0e977dd5f..ab0ae4c3f 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java
@@ -21,8 +21,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.security.credential.UsageType;
@@ -34,6 +32,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.shared.resolver.CriteriaSet;
+
@SuppressWarnings("javadoc")
public class SignatureValidationCriteriaSetFactoryBeanTest extends OpenSAMLInitBaseTestCase {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationParserTest.java
index a69f81701..b466abf31 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/SignatureValidationParserTest.java
@@ -27,8 +27,8 @@ import org.springframework.context.ApplicationContext;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/MockTrustEngine.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/MockTrustEngine.java
index 9acb8046f..9d03aaa6f 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/MockTrustEngine.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/MockTrustEngine.java
@@ -17,11 +17,11 @@
package net.shibboleth.spring.security.trust;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-
import org.opensaml.security.SecurityException;
import org.opensaml.security.trust.TrustEngine;
+import net.shibboleth.shared.resolver.CriteriaSet;
+
@SuppressWarnings("javadoc")
public class MockTrustEngine<T> implements TrustEngine<T> {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/SignatureChainingParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/SignatureChainingParserTest.java
index 02bc60822..061dd9ff2 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/SignatureChainingParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/SignatureChainingParserTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.spring.security.trust;
import java.io.IOException;
import java.time.Instant;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.security.AbstractSecurityParserTest;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.security.credential.impl.StaticCredentialResolver;
import org.opensaml.security.trust.TrustedCredentialTrustEngine;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParserTest.java
index 351eb66d8..fce25940a 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParserTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.spring.security.trust;
import java.io.IOException;
import java.time.Instant;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.security.AbstractSecurityParserTest;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.security.credential.impl.StaticCredentialResolver;
import org.opensaml.security.trust.TrustEngine;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParserTest.java
index 943fb210e..5e6d0f15a 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParserTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.spring.security.trust;
import java.io.IOException;
import java.time.Instant;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.security.AbstractSecurityParserTest;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.security.credential.impl.StaticCredentialResolver;
import org.opensaml.security.trust.TrustEngine;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXSignatureParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXSignatureParserTest.java
index d8b06e175..677fb10b3 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXSignatureParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXSignatureParserTest.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.security.AbstractSecurityParserTest;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.security.trust.TrustEngine;
import org.opensaml.security.x509.PKIXValidationInformation;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXX509CredentialParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXX509CredentialParserTest.java
index 58a51db41..86ad3bb7a 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXX509CredentialParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/StaticPKIXX509CredentialParserTest.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.spring.security.AbstractSecurityParserTest;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.security.trust.TrustEngine;
import org.opensaml.security.x509.PKIXValidationInformation;
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml
index 01a9cf7c1..3a54ceb0b 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml
@@ -10,7 +10,7 @@
default-init-method="initialize">
- <bean id="test.CriteriaSet" class="net.shibboleth.utilities.java.support.resolver.CriteriaSet" />
+ <bean id="test.CriteriaSet" class="net.shibboleth.shared.resolver.CriteriaSet" />
<bean id="test.SignaturePrevalidator" class="org.opensaml.saml.security.impl.SAMLSignatureProfileValidator" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list