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

Scott Cantor cantor.2 at osu.edu
Mon Sep 26 16:26:38 UTC 2022


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

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

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

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

commit aaf2f449e65e45b342c60a74d6eb19238b7c96d9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 12:26:35 2022 -0400

    Rename resource and resolver packages.
---
 .../spring/httpclient/resource/HTTPResource.java       |  4 ++--
 .../shared/security/impl/BasicKeystoreKeyStrategy.java |  2 +-
 .../net/shibboleth/shared/security/DataSealerTest.java |  2 +-
 .../shared/security/TestResourceConverter.java         | 12 ++++++------
 .../net/shibboleth/shared/service/LoggingService.java  |  2 +-
 .../shared/service/impl/LogbackLoggingService.java     |  2 +-
 .../spring/config/StringToResourceConverter.java       |  2 +-
 .../shared/spring/resource/ConditionalResource.java    |  8 ++++----
 .../shared/spring/resource/ResourceHelper.java         | 18 +++++++++---------
 .../spring/resource/RunnableFileSystemResource.java    |  2 +-
 .../shared/spring/config/StringToResourceTest.java     |  2 +-
 .../support => shared}/resolver/ClassCriterion.java    |  2 +-
 .../java/support => shared}/resolver/CriteriaSet.java  |  2 +-
 .../java/support => shared}/resolver/Criterion.java    |  2 +-
 .../resolver/CriterionPredicateRegistry.java           |  2 +-
 .../java/support => shared}/resolver/Resolver.java     |  2 +-
 .../support => shared}/resolver/ResolverException.java |  2 +-
 .../support => shared}/resolver/ResolverSupport.java   |  2 +-
 .../java/support => shared}/resolver/package-info.java |  2 +-
 .../java/support => shared}/resource/Resource.java     |  2 +-
 .../java/support => shared}/resource/package-info.java |  2 +-
 .../java/net/shibboleth/shared/xml/SchemaBuilder.java  |  2 +-
 .../java/support/logic/ScriptedBiConsumer.java         |  2 +-
 .../java/support/logic/ScriptedBiFunction.java         |  2 +-
 .../java/support/logic/ScriptedBiPredicate.java        |  2 +-
 .../utilities/java/support/logic/ScriptedConsumer.java |  2 +-
 .../utilities/java/support/logic/ScriptedFunction.java |  2 +-
 .../java/support/logic/ScriptedPredicate.java          |  2 +-
 .../java/support/scripting/EvaluableScript.java        |  2 +-
 .../support => shared}/resolver/CriteriaSetTest.java   |  3 ++-
 .../resolver/CriterionPredicateRegistryTest.java       |  4 ++--
 .../resolver/EvaluableFooCriterion.java                |  2 +-
 .../resolver/EvaluableTestFooCriterion.java            |  2 +-
 .../java/support => shared}/resolver/Foo.java          |  2 +-
 .../java/support => shared}/resolver/FooPredicate.java |  2 +-
 .../resolver/ResolverSupportTest.java                  |  2 +-
 .../support => shared}/resolver/TestCriterion.java     |  5 +++--
 .../net/shibboleth/shared/xml/SchemaBuilderTest.java   |  4 ++--
 .../shibboleth/shared/xml/TestResourceConverter.java   | 12 ++++++------
 .../java/support/scripting/EvaluableScriptTest.java    |  2 +-
 .../test-criterion-predicate-mappings.properties       |  1 +
 .../test-criterion-predicate-mappings.properties       |  1 -
 42 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
index 8476274f..24a1d950 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
@@ -60,7 +60,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
  * based on OpenSAML <code>HTTPMetadataResolver</code> and {@link org.springframework.core.io.UrlResource}.
  */
 public class HTTPResource extends AbstractIdentifiedInitializableComponent implements Resource, BeanNameAware,
-        InitializingBean, net.shibboleth.utilities.java.support.resource.Resource {
+        InitializingBean, net.shibboleth.shared.resource.Resource {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(HTTPResource.class);
@@ -353,7 +353,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
     }
 
     /** {@inheritDoc} */
-    @Override public net.shibboleth.utilities.java.support.resource.Resource createRelativeResource(
+    @Override public net.shibboleth.shared.resource.Resource createRelativeResource(
             final String relativePath) throws IOException {
 
         return createRelative(relativePath);
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
index d486245b..1a7225d8 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
@@ -45,13 +45,13 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.security.DataSealerKeyStrategy;
 import net.shibboleth.shared.security.KeyNotFoundException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.primitive.TimerSupport;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 
 /**
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
index 229c852f..f505d757 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
@@ -19,9 +19,9 @@ package net.shibboleth.shared.security;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
index 966db59a..be0fb86a 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
@@ -30,9 +30,9 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
 import org.springframework.core.io.Resource;
 
 /**
- * Bridging class between {@link Resource} and {@link net.shibboleth.utilities.java.support.resource.Resource}.
+ * Bridging class between {@link Resource} and {@link net.shibboleth.shared.resource.Resource}.
  */
-public final class TestResourceConverter implements net.shibboleth.utilities.java.support.resource.Resource {
+public final class TestResourceConverter implements net.shibboleth.shared.resource.Resource {
 
     /** The cached Spring {@link Resource}. */
     private Resource springResource;
@@ -58,9 +58,9 @@ public final class TestResourceConverter implements net.shibboleth.utilities.jav
      * @param springResource the input
      * @return a {@link Resource} which reflects what the Spring one does
      */
-    public static net.shibboleth.utilities.java.support.resource.Resource of(Resource springResource) {
-        if (springResource instanceof net.shibboleth.utilities.java.support.resource.Resource) {
-            return (net.shibboleth.utilities.java.support.resource.Resource) springResource;
+    public static net.shibboleth.shared.resource.Resource of(Resource springResource) {
+        if (springResource instanceof net.shibboleth.shared.resource.Resource) {
+            return (net.shibboleth.shared.resource.Resource) springResource;
         }
         return new TestResourceConverter(springResource);
     }
@@ -111,7 +111,7 @@ public final class TestResourceConverter implements net.shibboleth.utilities.jav
     }
 
     /** {@inheritDoc} */
-    @Override public net.shibboleth.utilities.java.support.resource.Resource createRelativeResource(
+    @Override public net.shibboleth.shared.resource.Resource createRelativeResource(
             String relativePath) throws IOException {
 
         return of(springResource.createRelative(relativePath));
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java b/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java
index 82184c41..d98c0d2a 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java
@@ -19,7 +19,7 @@ package net.shibboleth.shared.service;
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.utilities.java.support.resource.Resource;
+import net.shibboleth.shared.resource.Resource;
 
 /**
  * A logging configuration abstraction that piggybacks on the {@link ReloadableService} interface.
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java b/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
index ce88a34e..9cebaf7b 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
@@ -39,13 +39,13 @@ import ch.qos.logback.core.status.StatusManager;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.service.AbstractReloadableService;
 import net.shibboleth.shared.service.LoggingService;
 import net.shibboleth.shared.service.ServiceException;
 import net.shibboleth.shared.service.ServiceableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 /**
  * Simple {@link LoggingService} that watches for logback configuration file changes
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
index 97977192..c28aedd4 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
@@ -20,9 +20,9 @@ package net.shibboleth.shared.spring.config;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
 import net.shibboleth.shared.spring.resource.ResourceHelper;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
index f8320031..f62440a8 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
@@ -45,7 +45,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
  * @since 5.4.0
  */
 public class ConditionalResource extends AbstractIdentifiedInitializableComponent
-        implements Resource, BeanNameAware, net.shibboleth.utilities.java.support.resource.Resource {
+        implements Resource, BeanNameAware, net.shibboleth.shared.resource.Resource {
 
     /** Dummy content. */
     @Nonnull @NotEmpty private static final String DEFAULT_CONTENT =
@@ -114,13 +114,13 @@ public class ConditionalResource extends AbstractIdentifiedInitializableComponen
     }
 
     /** {@inheritDoc} */
-    public net.shibboleth.utilities.java.support.resource.Resource createRelativeResource(final String relativePath)
+    public net.shibboleth.shared.resource.Resource createRelativeResource(final String relativePath)
             throws IOException {
         
         checkComponentActive();
         final Resource relative = wrappedResource.createRelative(relativePath);
-        if (relative instanceof net.shibboleth.utilities.java.support.resource.Resource) {
-            return (net.shibboleth.utilities.java.support.resource.Resource) relative;
+        if (relative instanceof net.shibboleth.shared.resource.Resource) {
+            return (net.shibboleth.shared.resource.Resource) relative;
         }
         
         return ResourceHelper.of(relative);
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
index 3fe30339..ee4257a8 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
@@ -31,9 +31,9 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
 import org.springframework.core.io.Resource;
 
 /**
- * Bridging class between {@link Resource} and {@link net.shibboleth.utilities.java.support.resource.Resource}.
+ * Bridging class between {@link Resource} and {@link net.shibboleth.shared.resource.Resource}.
  */
-public final class ResourceHelper implements net.shibboleth.utilities.java.support.resource.Resource {
+public final class ResourceHelper implements net.shibboleth.shared.resource.Resource {
 
     /** The cached Spring {@link Resource}. */
     private Resource springResource;
@@ -48,19 +48,19 @@ public final class ResourceHelper implements net.shibboleth.utilities.java.suppo
     }
 
     /**
-     * Return a {@link net.shibboleth.utilities.java.support.resource.Resource} that does all the work of the
+     * Return a {@link net.shibboleth.shared.resource.Resource} that does all the work of the
      * provided {@link Resource}.
      * 
-     * <p>If the input implements {@link net.shibboleth.utilities.java.support.resource.Resource} then it is cast
+     * <p>If the input implements {@link net.shibboleth.shared.resource.Resource} then it is cast
      * to the output, other a shim class is generated.</p>
      * 
      * @param springResource the input
-     * @return a {@link net.shibboleth.utilities.java.support.resource.Resource} which reflects what the Spring one does
+     * @return a {@link net.shibboleth.shared.resource.Resource} which reflects what the Spring one does
      */
-    @Nonnull public static net.shibboleth.utilities.java.support.resource.Resource
+    @Nonnull public static net.shibboleth.shared.resource.Resource
                  of(@ParameterName(name="springResource") final Resource springResource) {
-        if (springResource instanceof net.shibboleth.utilities.java.support.resource.Resource) {
-            return (net.shibboleth.utilities.java.support.resource.Resource) springResource;
+        if (springResource instanceof net.shibboleth.shared.resource.Resource) {
+            return (net.shibboleth.shared.resource.Resource) springResource;
         }
         return new ResourceHelper(springResource);
     }
@@ -111,7 +111,7 @@ public final class ResourceHelper implements net.shibboleth.utilities.java.suppo
     }
 
     /** {@inheritDoc} */
-    public net.shibboleth.utilities.java.support.resource.Resource
+    public net.shibboleth.shared.resource.Resource
             createRelativeResource(final String relativePath) throws IOException {
 
         return of(springResource.createRelative(relativePath));
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
index 72052de5..4c8f5e15 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
@@ -30,8 +30,8 @@ import org.springframework.core.io.FileSystemResource;
 
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 /**
  * A file backed resource which calls out to a provided {@link Runnable} as appropriate such that the resource becomes
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java
index 115f8ff7..c47b5e6d 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java
@@ -27,7 +27,7 @@ import java.nio.file.InvalidPathException;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import net.shibboleth.utilities.java.support.resource.Resource;
+import net.shibboleth.shared.resource.Resource;
 
 @SuppressWarnings("javadoc")
 public class StringToResourceTest {
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ClassCriterion.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
similarity index 96%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ClassCriterion.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
index fa4d322f..6d173312 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ClassCriterion.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import javax.annotation.Nonnull;
 
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriteriaSet.java
similarity index 96%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/CriteriaSet.java
index 3cc71775..e13c7909 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriteriaSet.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import javax.annotation.Nullable;
 
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Criterion.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/Criterion.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Criterion.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/Criterion.java
index e7c8f41c..3603f752 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Criterion.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/Criterion.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 /**
  * A generic marker interface for representing criteria used in resolution or evaluation operations.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
index 28af2931..a326970c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/Resolver.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/Resolver.java
index 6a7dbec6..d2f7d70f 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/Resolver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverException.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverException.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverException.java
index 366bd1d3..f064a1ff 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import javax.annotation.Nullable;
 
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
index 36fb0840..f8ee0f53 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/package-info.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/resolver/package-info.java
index 67980add..ada67261 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/package-info.java
@@ -17,4 +17,4 @@
 
 /** Interfaces for searching over data. */
 
-package net.shibboleth.utilities.java.support.resolver;
\ No newline at end of file
+package net.shibboleth.shared.resolver;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java b/shib-support/src/main/java/net/shibboleth/shared/resource/Resource.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
rename to shib-support/src/main/java/net/shibboleth/shared/resource/Resource.java
index 69dd1cb2..e5f592f0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resource/Resource.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resource;
+package net.shibboleth.shared.resource;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/resource/package-info.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/resource/package-info.java
index 1448fbb7..1c704439 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resource/package-info.java
@@ -19,4 +19,4 @@
  * the spring Resource http://docs.spring.io/spring/docs/2.5.x/api/org/springframework/core/io/Resource.html
  * but allows Resource consuming code to not require Spring.*/
 
-package net.shibboleth.utilities.java.support.resource;
\ No newline at end of file
+package net.shibboleth.shared.resource;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java b/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
index cdc21e48..05108f12 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
@@ -37,10 +37,10 @@ import javax.xml.validation.SchemaFactory;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.NullableElements;
+import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.xml.impl.LoggingErrorHandler;
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
index de4d15e5..92de413b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
@@ -30,7 +30,7 @@ import javax.script.ScriptException;
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.Pair;
-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-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
index fdf48adb..92be2652 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
@@ -30,7 +30,7 @@ import javax.script.ScriptException;
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.Pair;
-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-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
index 32795290..0e82d756 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
@@ -30,7 +30,7 @@ import javax.script.ScriptException;
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.Pair;
-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-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
index de2a5929..6c1fbbf4 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
@@ -29,7 +29,7 @@ import javax.script.ScriptException;
 
 import net.shibboleth.shared.annotation.ParameterName;
 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-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
index c9449488..fe8c4ab1 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
@@ -29,7 +29,7 @@ import javax.script.ScriptException;
 
 import net.shibboleth.shared.annotation.ParameterName;
 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-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
index 0650bc8a..9caecf4a 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
@@ -28,7 +28,7 @@ import javax.script.ScriptException;
 
 import net.shibboleth.shared.annotation.ParameterName;
 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-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
index 67f0c3a2..d1e732e1 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
@@ -41,10 +41,10 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 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.logic.ConstraintViolationException;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 /** This is a helper class that takes care of reading in, optionally compiling, and evaluating a script. */
 public final class EvaluableScript extends AbstractInitializableComponent {
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/CriteriaSetTest.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriteriaSetTest.java
similarity index 96%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/CriteriaSetTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/CriteriaSetTest.java
index 3d09ad44..251427b5 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/CriteriaSetTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriteriaSetTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -23,6 +23,7 @@ import org.testng.annotations.Test;
 /** {@link CriteriaSet} unit test. */
 public class CriteriaSetTest {
 
+    /** Test building. */
     @Test public void testConstruction() {
         CriteriaSet set = new CriteriaSet();
         Assert.assertTrue(set.isEmpty());
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriterionPredicateRegistryTest.java
similarity index 95%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/CriterionPredicateRegistryTest.java
index 9748c61d..25d8d257 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriterionPredicateRegistryTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -81,7 +81,7 @@ public class CriterionPredicateRegistryTest {
         
         Assert.assertNull(registry.getPredicate(fooCriterion));
         
-        registry.loadMappings("/net/shibboleth/utilities/java/support/resolver/test-criterion-predicate-mappings.properties");
+        registry.loadMappings("/net/shibboleth/shared/resolver/test-criterion-predicate-mappings.properties");
         
         final Predicate<Foo> predicate = registry.getPredicate(fooCriterion);
         Assert.assertNotNull(predicate);
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableFooCriterion.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableFooCriterion.java
similarity index 94%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableFooCriterion.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableFooCriterion.java
index 5dcd1cb1..9adb0204 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableFooCriterion.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableFooCriterion.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import java.util.function.Predicate;
 
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableTestFooCriterion.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableTestFooCriterion.java
similarity index 95%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableTestFooCriterion.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableTestFooCriterion.java
index 15b62898..88774849 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableTestFooCriterion.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableTestFooCriterion.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 public class EvaluableTestFooCriterion implements EvaluableFooCriterion {
     
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/Foo.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/Foo.java
similarity index 93%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/Foo.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/Foo.java
index b82ffad9..3fc6319c 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/Foo.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/Foo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 public class Foo {
 
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/FooPredicate.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/FooPredicate.java
similarity index 95%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/FooPredicate.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/FooPredicate.java
index 9a6a62eb..bf6f4332 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/FooPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/FooPredicate.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import java.util.function.Predicate;
 
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/ResolverSupportTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/ResolverSupportTest.java
index f99684fa..0d94ab3f 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/ResolverSupportTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
 
 import java.util.Set;
 import java.util.function.Predicate;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/TestCriterion.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/TestCriterion.java
similarity index 93%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/TestCriterion.java
rename to shib-support/src/test/java/net/shibboleth/shared/resolver/TestCriterion.java
index fd9b5c0f..09cb9b9f 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/resolver/TestCriterion.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/TestCriterion.java
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.resolver;
+package net.shibboleth.shared.resolver;
+
 
 /**
- *
+ * Test criterion.
  */
 public class TestCriterion implements Criterion {
 
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java
index 3f4ec3d2..f979ddc6 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java
@@ -114,8 +114,8 @@ public class SchemaBuilderTest {
      * May re-enable if cycle dependency resolved.
      */
     @Test public void testResource() throws SAXException, IOException, ComponentInitializationException {
-        net.shibboleth.utilities.java.support.resource.Resource first = TestResourceConverter.of(new ClassPathResource(TEST_DIR + FIRST_SCHEMA_FILE));
-        net.shibboleth.utilities.java.support.resource.Resource second = TestResourceConverter.of(new ClassPathResource(TEST_DIR + SECOND_SCHEMA_FILE));
+        net.shibboleth.shared.resource.Resource first = TestResourceConverter.of(new ClassPathResource(TEST_DIR + FIRST_SCHEMA_FILE));
+        net.shibboleth.shared.resource.Resource second = TestResourceConverter.of(new ClassPathResource(TEST_DIR + SECOND_SCHEMA_FILE));
 
         final SchemaBuilder builder = new SchemaBuilder();
         builder.addSchema(first);
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java b/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
index 0cafb19f..b61745d7 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
@@ -30,9 +30,9 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
 import org.springframework.core.io.Resource;
 
 /**
- * Bridging class between {@link Resource} and {@link net.shibboleth.utilities.java.support.resource.Resource}.
+ * Bridging class between {@link Resource} and {@link net.shibboleth.shared.resource.Resource}.
  */
-public final class TestResourceConverter implements net.shibboleth.utilities.java.support.resource.Resource {
+public final class TestResourceConverter implements net.shibboleth.shared.resource.Resource {
 
     /** The cached Spring {@link Resource}. */
     private Resource springResource;
@@ -58,9 +58,9 @@ public final class TestResourceConverter implements net.shibboleth.utilities.jav
      * @param springResource the input
      * @return a {@link Resource} which reflects what the Spring one does
      */
-    public static net.shibboleth.utilities.java.support.resource.Resource of(Resource springResource) {
-        if (springResource instanceof net.shibboleth.utilities.java.support.resource.Resource) {
-            return (net.shibboleth.utilities.java.support.resource.Resource) springResource;
+    public static net.shibboleth.shared.resource.Resource of(Resource springResource) {
+        if (springResource instanceof net.shibboleth.shared.resource.Resource) {
+            return (net.shibboleth.shared.resource.Resource) springResource;
         }
         return new TestResourceConverter(springResource);
     }
@@ -111,7 +111,7 @@ public final class TestResourceConverter implements net.shibboleth.utilities.jav
     }
 
     /** {@inheritDoc} */
-    @Override public net.shibboleth.utilities.java.support.resource.Resource createRelativeResource(
+    @Override public net.shibboleth.shared.resource.Resource createRelativeResource(
             String relativePath) throws IOException {
 
         return of(springResource.createRelative(relativePath));
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
index 4d2779c5..a4364739 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
@@ -30,8 +30,8 @@ import javax.script.ScriptException;
 
 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.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
diff --git a/shib-support/src/test/resources/net/shibboleth/shared/resolver/test-criterion-predicate-mappings.properties b/shib-support/src/test/resources/net/shibboleth/shared/resolver/test-criterion-predicate-mappings.properties
new file mode 100644
index 00000000..dfc59628
--- /dev/null
+++ b/shib-support/src/test/resources/net/shibboleth/shared/resolver/test-criterion-predicate-mappings.properties
@@ -0,0 +1 @@
+net.shibboleth.shared.resolver.TestCriterion = net.shibboleth.shared.resolver.FooPredicate
\ No newline at end of file
diff --git a/shib-support/src/test/resources/net/shibboleth/utilities/java/support/resolver/test-criterion-predicate-mappings.properties b/shib-support/src/test/resources/net/shibboleth/utilities/java/support/resolver/test-criterion-predicate-mappings.properties
deleted file mode 100644
index 341de223..00000000
--- a/shib-support/src/test/resources/net/shibboleth/utilities/java/support/resolver/test-criterion-predicate-mappings.properties
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.utilities.java.support.resolver.TestCriterion = net.shibboleth.utilities.java.support.resolver.FooPredicate
\ No newline at end of file

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


More information about the commits mailing list