[java-shib-shared] branch main updated: Rename component package.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 22 19:45:47 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=a046d0b2f5d5ab8e359f626684acae3a0b5c21a4
The following commit(s) were added to refs/heads/main by this push:
new a046d0b2 Rename component package.
a046d0b2 is described below
commit a046d0b2f5d5ab8e359f626684acae3a0b5c21a4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 22 15:45:44 2022 -0400
Rename component package.
---
.../httpclient/factory/FileCachingHttpClientFactoryBean.java | 4 ++--
.../shared/spring/httpclient/resource/HTTPResource.java | 4 ++--
.../spring/httpclient/resource/ConditionalResourceTest.java | 2 +-
.../shared/httpclient/FileCachingHttpClientBuilder.java | 12 ++++++------
.../shibboleth/shared/httpclient/IdleConnectionSweeper.java | 4 ++--
.../main/java/net/shibboleth/shared/net/CookieManager.java | 4 ++--
.../shared/httpclient/IdleConectionSweeperTest.java | 2 +-
.../java/net/shibboleth/shared/net/CookieManagerTest.java | 3 +--
.../net/shibboleth/shared/security/AccessControlService.java | 6 +++---
.../main/java/net/shibboleth/shared/security/DataSealer.java | 4 ++--
.../shared/security/impl/BasicAccessControlService.java | 2 +-
.../shared/security/impl/BasicKeystoreKeyStrategy.java | 4 ++--
.../shared/security/impl/IPRangeAccessControl.java | 2 +-
.../shibboleth/shared/security/impl/ScriptedKeyStrategy.java | 4 ++--
.../java/net/shibboleth/shared/security/DataSealerTest.java | 2 +-
.../shared/security/impl/ScriptedKeyStrategyTest.java | 2 +-
.../shibboleth/shared/service/AbstractReloadableService.java | 6 +++---
.../net/shibboleth/shared/service/ReloadableService.java | 2 +-
.../shibboleth/shared/service/ReloadableServiceGaugeSet.java | 4 ++--
.../shared/service/impl/LogbackLoggingService.java | 2 +-
.../security/impl/DelegatingAccessControlService.java | 2 +-
.../service/security/impl/ReloadingAccessControlService.java | 2 +-
.../security/impl/ServiceableAccessControlService.java | 2 +-
.../shared/spring/service/AbstractServiceableComponent.java | 4 ++--
.../spring/service/ApplicationContextServiceStrategy.java | 2 +-
.../shared/spring/service/ReloadableSpringService.java | 6 +++---
.../shared/spring/service/NonReloadableTestBean.java | 4 ++--
.../shibboleth/shared/spring/service/ReloadableTestBean.java | 4 ++--
.../shared/spring/config/IdentifiableBeanPostProcessor.java | 4 ++--
.../shared/spring/config/IdentifiedComponentManager.java | 2 +-
.../spring/factory/AbstractComponentAwareFactoryBean.java | 4 ++--
.../shared/spring/resource/ConditionalResource.java | 2 +-
.../shared/spring/resource/ConditionalResourceResolver.java | 2 +-
.../spring/config/IdentifiableBeanPostProcessorTest.java | 10 +++++-----
.../shared/spring/config/IdentifiedComponentManagerTest.java | 2 +-
.../shared/spring/resource/RunnableResourceTest.java | 2 +-
.../shared/annotation/constraint/ThreadSafeAfterInit.java | 2 +-
.../AbstractIdentifiableInitializableComponent.java | 2 +-
.../component/AbstractIdentifiedInitializableComponent.java | 2 +-
.../component/AbstractInitializableComponent.java | 2 +-
.../java/support => shared}/component/Component.java | 2 +-
.../component/ComponentInitializationException.java | 2 +-
.../java/support => shared}/component/ComponentSupport.java | 2 +-
.../component/DestroyedComponentException.java | 2 +-
.../support => shared}/component/DestructableComponent.java | 2 +-
.../support => shared}/component/IdentifiableComponent.java | 2 +-
.../support => shared}/component/IdentifiedComponent.java | 2 +-
.../support => shared}/component/InitializableComponent.java | 2 +-
.../component/UninitializedComponentException.java | 2 +-
.../support => shared}/component/UnmodifiableComponent.java | 2 +-
.../component/UnmodifiableComponentException.java | 2 +-
.../java/support => shared}/component/package-info.java | 2 +-
.../utilities/java/support/primitive/TimerSupport.java | 2 +-
.../utilities/java/support/scripting/EvaluableScript.java | 4 ++--
.../utilities/java/support/scripting/ScriptedRunnable.java | 6 +++---
.../utilities/java/support/xml/BasicParserPool.java | 4 ++--
.../AbstractIdentifiedInitializableComponentTest.java | 2 +-
.../component/AbstractInitializableComponentTest.java | 2 +-
.../support => shared}/component/ComponentSupportTest.java | 2 +-
.../logic/ComponentInitializationExceptionFunction.java | 4 ++--
.../logic/ComponentInitializationExceptionPredicate.java | 4 ++--
.../utilities/java/support/primitive/TimerSupportTest.java | 2 +-
.../java/support/scripting/EvaluableScriptTest.java | 2 +-
.../utilities/java/support/xml/AttributeSupportTest.java | 2 +-
.../utilities/java/support/xml/BasicParserPoolTest.java | 8 ++++----
.../utilities/java/support/xml/DOMTypeSupportTest.java | 4 ++--
.../utilities/java/support/xml/ElementSupportTest.java | 2 +-
.../utilities/java/support/xml/NamespaceSupportTest.java | 4 ++--
.../utilities/java/support/xml/QNameSupportTest.java | 2 +-
.../utilities/java/support/xml/SchemaBuilderTest.java | 4 ++--
.../utilities/java/support/xml/SerializeSupportTest.java | 2 +-
71 files changed, 111 insertions(+), 112 deletions(-)
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
index a1fa40ae..c74705f0 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
@@ -23,9 +23,9 @@ import org.apache.http.client.HttpClient;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
+import net.shibboleth.shared.component.DestructableComponent;
+import net.shibboleth.shared.component.InitializableComponent;
import net.shibboleth.shared.httpclient.FileCachingHttpClientBuilder;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
/**
* Factory bean version of {@link FileCachingHttpClientBuilder}.
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 83a05f46..8476274f 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
@@ -49,9 +49,9 @@ import org.springframework.core.io.Resource;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.httpclient.HttpClientContextHandler;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
index a95eed65..1e672668 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
@@ -19,12 +19,12 @@ package net.shibboleth.shared.spring.httpclient.resource;
import java.io.IOException;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.httpclient.HttpClientContextHandler;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.spring.resource.ConditionalResource;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpUriRequest;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
index 047f3599..6d26b49f 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
@@ -40,12 +40,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.DestroyedComponentException;
+import net.shibboleth.shared.component.DestructableComponent;
+import net.shibboleth.shared.component.InitializableComponent;
+import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
index b3d0ec8e..fb521167 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
+import net.shibboleth.shared.component.DestroyedComponentException;
+import net.shibboleth.shared.component.DestructableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
index 3216fc26..6e08730b 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
@@ -27,8 +27,8 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/IdleConectionSweeperTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/IdleConectionSweeperTest.java
index 596bb86d..4a7fdd0b 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/IdleConectionSweeperTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/IdleConectionSweeperTest.java
@@ -25,7 +25,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
+import net.shibboleth.shared.component.DestroyedComponentException;
/** {@link IdleConnectionSweeper} unit test. */
@SuppressWarnings("javadoc")
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
index a07a16b8..2641a6de 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
@@ -19,8 +19,6 @@ package net.shibboleth.shared.net;
import java.util.function.Supplier;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
@@ -29,6 +27,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.component.ComponentInitializationException;
/** {@link CookieManager} unit test. */
public class CookieManagerTest {
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
index 8a6383e9..648187c5 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
@@ -20,9 +20,9 @@ package net.shibboleth.shared.security;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
+import net.shibboleth.shared.component.IdentifiedComponent;
+import net.shibboleth.shared.component.InitializableComponent;
+import net.shibboleth.shared.component.UnmodifiableComponent;
/**
* A component that supplies {@link AccessControl} instances identified by a policy name.
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
index d00ccf15..76692d15 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
@@ -46,9 +46,9 @@ import org.slf4j.LoggerFactory;
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.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
index ad262d4b..370d0615 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
@@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Simple implementation that uses an in-memory map of policies. */
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 3910196d..7b090465 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
@@ -42,11 +42,11 @@ import org.slf4j.LoggerFactory;
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.security.DataSealerKeyStrategy;
import net.shibboleth.shared.security.KeyNotFoundException;
import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
index df614dc6..2994f6d7 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
@@ -31,10 +31,10 @@ import com.google.common.net.InetAddresses;
import jakarta.servlet.ServletRequest;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.net.HttpServletSupport;
import net.shibboleth.shared.net.IPRange;
import net.shibboleth.shared.security.AccessControl;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
index 0f275566..62c2857e 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
@@ -37,10 +37,10 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NonNegative;
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.security.DataSealerKeyStrategy;
import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
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 4d5270f8..229c852f 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
@@ -18,8 +18,8 @@
package net.shibboleth.shared.security;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resource.Resource;
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
index f1a86e61..52a785bf 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
@@ -29,7 +29,7 @@ import java.util.Map;
import javax.crypto.KeyGenerator;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
import org.testng.Assert;
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
index 93b50bc2..7f4f5bf8 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
@@ -29,9 +29,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.UnmodifiableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
index 4df99e4b..11fb6e81 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
@@ -21,7 +21,7 @@ import java.time.Instant;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
+import net.shibboleth.shared.component.InitializableComponent;
/**
* A service that supports reloading its configuration.
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
index 9f7a6b5f..3b622ac2 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
@@ -34,8 +34,8 @@ import net.shibboleth.shared.annotation.constraint.Live;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
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 c4366fd1..ce88a34e 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
@@ -38,11 +38,11 @@ import ch.qos.logback.core.status.InfoStatus;
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.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.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resource.Resource;
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
index f1ffa501..8b08ac84 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
@@ -25,11 +25,11 @@ import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
index 855793c8..5d51eb45 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
@@ -20,10 +20,10 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
index a9943090..79fef80c 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
@@ -20,10 +20,10 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
index 628a1bce..c7f5d380 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
@@ -28,9 +28,9 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
* Implementation of {@link ServiceableComponent} that does most of the work required. It leverages the spring
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
index 6074e186..bb163169 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
@@ -22,8 +22,8 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
index 57389177..547cecd7 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
@@ -44,11 +44,11 @@ import org.springframework.core.io.Resource;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.service.AbstractReloadableService;
import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -57,8 +57,8 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
* This class provides a reloading interface to a {@link ServiceableComponent} via Spring.
* This class extends {@link org.springframework.context.Lifecycle}. and thus
* it acts as the bridge between this interface and
- * {@link net.shibboleth.utilities.java.support.component.InitializableComponent} and
- * {@link net.shibboleth.utilities.java.support.component.DestructableComponent}
+ * {@link net.shibboleth.shared.component.InitializableComponent} and
+ * {@link net.shibboleth.shared.component.DestructableComponent}
*
* @param <T> The precise service being implemented.
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
index d3807d39..8c7c6110 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
@@ -24,8 +24,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
/**
* Test bean to canary out behavior of reloadable bean service.
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
index fd59e62e..0e2a34ad 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
@@ -23,8 +23,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
/**
* Test bean to canary out behavior of reloadable bean service.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java
index 9322f2a2..9ce258a7 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java
@@ -19,12 +19,12 @@ package net.shibboleth.shared.spring.config;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
+import net.shibboleth.shared.component.IdentifiableComponent;
+
/**
* Pre-processes {@link IdentifiableComponent} beans by setting the bean ID to the bean name.
*/
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
index 36efc20c..16d534ba 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
+import net.shibboleth.shared.component.IdentifiedComponent;
/**
* Class used for auto-wiring free-standing identified objects along with explicitly declared
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
index a3d0372b..8cb0c407 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
@@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.AbstractFactoryBean;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
+import net.shibboleth.shared.component.DestructableComponent;
+import net.shibboleth.shared.component.InitializableComponent;
/**
* A Factory bean which is aware of the component lifecycle interfaces.
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 474f443a..f8320031 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
@@ -35,7 +35,7 @@ import org.springframework.core.io.Resource;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.shared.component.AbstractIdentifiedInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
index b0651b5a..b62e2cfc 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
@@ -24,7 +24,7 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
/**
* Supports a "conditional:resourcepath" URL syntax for wrapping a Spring resource with a
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java
index 6dab41ce..2f699087 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java
@@ -19,17 +19,17 @@ package net.shibboleth.shared.spring.config;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.IdentifiedComponent;
+
/**
* A test for {@link IdentifiableBeanPostProcessor}.
*/
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
index 9d2c9d48..a05f49c1 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
@@ -30,8 +30,8 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
/**
* Test for {@link IdentifiedComponentManager}.
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
index 73af257d..31ec44bc 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
@@ -34,8 +34,8 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
import net.shibboleth.utilities.java.support.scripting.ScriptedRunnable;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
index c2fbf127..ab99ff28 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
* annotation after its initialization and before its destruction.
*
* <p>Primarily, but not exclusively, addresses the behavior of components based on the
- * {@link net.shibboleth.utilities.java.support.component.InitializableComponent} interface.
+ * {@link net.shibboleth.shared.component.InitializableComponent} interface.
*/
@Documented
@Target(ElementType.TYPE)
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiableInitializableComponent.java
similarity index 96%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiableInitializableComponent.java
index 93fe79e0..a84bafef 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiableInitializableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
index 7b0dff65..956091cb 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractInitializableComponent.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/AbstractInitializableComponent.java
index eb3470ca..9e015806 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractInitializableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/Component.java b/shib-support/src/main/java/net/shibboleth/shared/component/Component.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/Component.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/Component.java
index c5b01700..34ea65b4 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/Component.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/Component.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
/** A marker interface that represents something used as a discrete part of a larger system. */
public interface Component {
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/ComponentInitializationException.java b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentInitializationException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/ComponentInitializationException.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/ComponentInitializationException.java
index 456de7f7..3c44417f 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/ComponentInitializationException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentInitializationException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
index 8d232705..95f0b2c9 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/DestroyedComponentException.java b/shib-support/src/main/java/net/shibboleth/shared/component/DestroyedComponentException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/DestroyedComponentException.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/DestroyedComponentException.java
index 00187d87..78f55818 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/DestroyedComponentException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/DestroyedComponentException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
/** Exception thrown if a component has been destroyed and an attempt was made to use it. */
public class DestroyedComponentException extends RuntimeException {
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/DestructableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/DestructableComponent.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/DestructableComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/DestructableComponent.java
index 9cb6583e..733178b5 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/DestructableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/DestructableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
/** A component which can be destroyed and its resources reclaimed. */
public interface DestructableComponent extends Component {
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiableComponent.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/IdentifiableComponent.java
index 5b8b7b0e..3f2109c6 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nonnull;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiedComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiedComponent.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiedComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/IdentifiedComponent.java
index 3c6ed854..0473486c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiedComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiedComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/InitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/InitializableComponent.java
similarity index 96%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/InitializableComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/InitializableComponent.java
index 8fe5f5c9..beccafb9 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/InitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/InitializableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
/**
* A {@link Component} which needs to be initialized prior to any "real" use. Real use usually means, for example,
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UninitializedComponentException.java b/shib-support/src/main/java/net/shibboleth/shared/component/UninitializedComponentException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UninitializedComponentException.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/UninitializedComponentException.java
index 36bc224f..70803db8 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UninitializedComponentException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/UninitializedComponentException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponent.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponent.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponent.java
index 27db0fde..7452665b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
/**
* A marker interface for components that may be put in to an unmodifiable state and, if a modification is attempted
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponentException.java b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponentException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponentException.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponentException.java
index 4369f74c..d81bc69b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponentException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponentException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/component/package-info.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/component/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/component/package-info.java
index 8ce8b338..f20c6239 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/package-info.java
@@ -17,4 +17,4 @@
/** Set of interfaces used to describe basic features of "components" or "modules" within a larger system. */
-package net.shibboleth.utilities.java.support.component;
\ No newline at end of file
+package net.shibboleth.shared.component;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
index 13bb3a2b..76dde3a9 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
+import net.shibboleth.shared.component.IdentifiedComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
/** Timer utility methods. */
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 8fea6559..67f0c3a2 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
@@ -39,8 +39,8 @@ import com.google.common.io.Files;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
index 23c32c4c..a4d5aad1 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
@@ -25,9 +25,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.UnmodifiableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
index b12bba34..2bc56994 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
@@ -53,8 +53,8 @@ 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.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponentTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponentTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
index 581bada4..b225485b 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponentTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponentTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractInitializableComponentTest.java
similarity index 97%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponentTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/component/AbstractInitializableComponentTest.java
index 2dd01461..62f3b598 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponentTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractInitializableComponentTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/component/ComponentSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/component/ComponentSupportTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
index ef1add32..1ad0a0ff 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/component/ComponentSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.component;
+package net.shibboleth.shared.component;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
index a9ee836d..965fc1d6 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
@@ -19,8 +19,8 @@ package net.shibboleth.utilities.java.support.logic;
import java.util.function.Function;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.InitializableComponent;
/**
* A {@link Function} that always throws a {@link ComponentInitializationException} when {@link #initialize()} is
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
index b0b756ca..d4da19a0 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
@@ -17,8 +17,8 @@
package net.shibboleth.utilities.java.support.logic;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.InitializableComponent;
/**
* A {@link Predicate} that always throws a {@link ComponentInitializationException} when {@link #initialize()} is
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/TimerSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/TimerSupportTest.java
index c0281279..03ffabb8 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/TimerSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/TimerSupportTest.java
@@ -20,7 +20,7 @@ package net.shibboleth.utilities.java.support.primitive;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
+import net.shibboleth.shared.component.IdentifiedComponent;
public class TimerSupportTest {
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 42ecafd3..4d2779c5 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
@@ -29,7 +29,7 @@ import javax.annotation.Nonnull;
import javax.script.ScriptException;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resource.Resource;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
index b136aace..2773fa6a 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
index c9f5181a..47eaa993 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
@@ -35,10 +35,10 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.validation.Schema;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
-import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.DestroyedComponentException;
+import net.shibboleth.shared.component.UninitializedComponentException;
+import net.shibboleth.shared.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.xml.BasicParserPool.DocumentBuilderProxy;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupportTest.java
index af448873..3fe40cad 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupportTest.java
@@ -25,14 +25,14 @@ import java.time.Instant;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
+import net.shibboleth.shared.component.ComponentInitializationException;
+
/**
* Tests for {@link DOMTypeSupport};
*/
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
index 3d47d317..c122b54c 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
index f673a3bf..d4c59d7d 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
@@ -22,8 +22,6 @@ import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -32,6 +30,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
+import net.shibboleth.shared.component.ComponentInitializationException;
+
/**
* Tests for {@link NamespaceSupport}
*/
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
index e292d66d..57e11c4a 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
index 4612e8c2..b3c161b5 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
@@ -26,13 +26,13 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.Validator;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.xml.sax.SAXException;
+import net.shibboleth.shared.component.ComponentInitializationException;
+
/**
* Tests for {@link NamespaceSupport}
*/
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
index 53bcb9ca..e8078b3d 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
@@ -41,7 +41,7 @@ import org.w3c.dom.ls.LSOutput;
import org.w3c.dom.ls.LSSerializer;
import org.xml.sax.SAXException;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
/**
* Tests for {@link NamespaceSupport}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list