[java-shib-attribute] branch main updated: Rename resource and resolver packages.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=71ccb660d6df7c2904d4ef4666c962b4f0c9e2f6

The following commit(s) were added to refs/heads/main by this push:
     new 71ccb660d Rename resource and resolver packages.
71ccb660d is described below

commit 71ccb660d6df7c2904d4ef4666c962b4f0c9e2f6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 12:27:17 2022 -0400

    Rename resource and resolver packages.
---
 .../filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java        | 4 ++--
 .../java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java | 4 ++--
 .../resolver/dc/http/impl/ScriptedResponseMappingStrategy.java        | 2 +-
 .../resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java      | 2 +-
 .../shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java | 4 ++--
 .../idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java
index f74c9e033..42dddb9a8 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java
@@ -41,9 +41,9 @@ import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.idp.saml.metadata.impl.ScopesNodeProcessor;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resolver.CriteriaSet;
+import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.shared.spring.resource.ResourceHelper;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 /**
  * Tests for {@link AttributeScopeMatchesShibMDScope} and {@link AttributeValueMatchesShibMDScope} matchers.
diff --git a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
index f6c43c5bd..396b7b369 100644
--- a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
+++ b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
@@ -28,9 +28,9 @@ import net.shibboleth.shared.component.IdentifiedComponent;
  * 
  * <p><em>Note Well</em>This class is about <em>attribute resolution</em>, that is to say the summoning
  * up of attributes in response to the exigies of the provided context. It does <em>not</em> implement
- * net.shibboleth.utilities.java.support.resolver.Resolver which is about summoning up bits of
+ * net.shibboleth.shared.resolver.Resolver which is about summoning up bits of
  * generic data from the configuration (e.g., metadata) in response to specific
- * net.shibboleth.utilities.java.support.resolver.Criterion.</p>
+ * net.shibboleth.shared.resolver.Criterion.</p>
  * */
 @ThreadSafe
 public interface AttributeResolver extends IdentifiedComponent {
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
index 0a38f1f5b..e176a5949 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
@@ -47,9 +47,9 @@ import net.shibboleth.idp.attribute.resolver.dc.http.HTTPResponseMappingStrategy
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.resource.Resource;
 import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
 import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
 
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java
index e089423ce..c0f8847c8 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java
@@ -41,7 +41,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.dc.storage.StorageMappingStrategy;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.resource.Resource;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
 import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
 
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index ab6c74760..2e152a9e6 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -71,9 +71,9 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
  * 
  * <em>Note Well</em>This class is about <em>attribute resolution</em>, that is to say the summoning up of attributes in
  * response to the exigies of the provided context. It does <em>not</em> implement
- * {@link net.shibboleth.utilities.java.support.resolver.Resolver} which in about summoning up bits of generic data from
+ * {@link net.shibboleth.shared.resolver.Resolver} which in about summoning up bits of generic data from
  * the configuration (usually the metadata) in response to specific
- * {@link net.shibboleth.utilities.java.support.resolver.Criterion}s. <br>
+ * {@link net.shibboleth.shared.resolver.Criterion}s. <br>
  */
 @ThreadSafe
 public class AttributeResolverImpl extends AbstractServiceableComponent<AttributeResolver> implements
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
index cc9260c59..fe3ad01c8 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
@@ -47,11 +47,11 @@ import net.shibboleth.idp.attribute.resolver.testing.ResolverTestSupport;
 import net.shibboleth.idp.attribute.resolver.testing.TestSources;
 import net.shibboleth.shared.collection.LazySet;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.security.DataSealer;
 import net.shibboleth.shared.security.DataSealerException;
 import net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy;
 import net.shibboleth.shared.spring.resource.ResourceHelper;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 /** Test for {@link DecryptedAttributeDefinition}. */
 @SuppressWarnings("javadoc")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.