[java-shib-shared] branch main updated: Rename service abstraction packages.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 21 19:28:40 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=85e537b6d86209e9d81353110196a4d66abbdfef
The following commit(s) were added to refs/heads/main by this push:
new 85e537b6 Rename service abstraction packages.
85e537b6 is described below
commit 85e537b6d86209e9d81353110196a4d66abbdfef
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 21 15:28:37 2022 -0400
Rename service abstraction packages.
---
.../service/AbstractReloadableService.java | 2 +-
.../shibboleth/shared/service/LoggingService.java | 1 -
.../service/ReloadableService.java | 2 +-
.../service/ReloadableServiceGaugeSet.java | 2 +-
.../service/ServiceException.java | 2 +-
.../service/ServiceableComponent.java | 2 +-
.../shared/service/impl/LogbackLoggingService.java | 6 +++---
.../service/reloadable/ProxiedFactoryBean.java | 4 ++--
.../shared/service/reloadable/ReloadableScope.java | 4 ++--
.../impl/DelegatingAccessControlService.java | 4 ++--
.../impl/ReloadingAccessControlService.java | 4 ++--
.../impl/ServiceableAccessControlService.java | 4 ++--
.../service/AbstractServiceableComponent.java | 4 ++--
.../service/ApplicationContextServiceStrategy.java | 4 ++--
.../ApplicationContextServiceableComponent.java | 2 +-
.../spring/service/ClassBasedServiceStrategy.java | 6 +++---
.../spring/service/ReloadableSpringService.java | 8 ++++----
.../spring/service/package-info.java | 6 +++---
.../java/support/service/package-info.java | 24 ----------------------
.../spring/service/ReloadableBeanServiceTest.java | 4 ++--
.../service/ReloadableSpringServiceTest.java | 3 ++-
.../spring/service/TestServiceableComponent.java | 2 ++
.../shibboleth/ext/spring/service/BrokenBean1.xml | 2 +-
.../ext/spring/service/ReloadableBeans1.xml | 8 ++++----
.../ext/spring/service/ReloadableSpringService.xml | 8 ++++----
.../ext/spring/service/ServiceableBean1.xml | 2 +-
.../ext/spring/service/ServiceableBean2.xml | 2 +-
.../shared/testing/MockReloadableService.java | 4 ++--
28 files changed, 52 insertions(+), 74 deletions(-)
diff --git a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
similarity index 99%
rename from shib-service/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
rename to shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
index ca7d3568..3dd628b0 100644
--- a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.service;
+package net.shibboleth.shared.service;
import java.time.Duration;
import java.time.Instant;
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 18584198..82184c41 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
@@ -20,7 +20,6 @@ package net.shibboleth.shared.service;
import javax.annotation.Nonnull;
import net.shibboleth.utilities.java.support.resource.Resource;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
* A logging configuration abstraction that piggybacks on the {@link ReloadableService} interface.
diff --git a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
similarity index 98%
rename from shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableService.java
rename to shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
index 59dcd1c3..4df99e4b 100644
--- a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.service;
+package net.shibboleth.shared.service;
import java.time.Instant;
diff --git a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableServiceGaugeSet.java b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
similarity index 98%
rename from shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableServiceGaugeSet.java
rename to shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
index 57ac0da9..53d56b4d 100644
--- a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableServiceGaugeSet.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.service;
+package net.shibboleth.shared.service;
import java.time.Instant;
import java.util.Collections;
diff --git a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ServiceException.java b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceException.java
similarity index 97%
rename from shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ServiceException.java
rename to shib-service/src/main/java/net/shibboleth/shared/service/ServiceException.java
index 0feffcdc..6dd22ea7 100644
--- a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ServiceException.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.service;
+package net.shibboleth.shared.service;
import javax.annotation.Nullable;
diff --git a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceableComponent.java
similarity index 98%
rename from shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ServiceableComponent.java
rename to shib-service/src/main/java/net/shibboleth/shared/service/ServiceableComponent.java
index d9b1211c..1854fb35 100644
--- a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/ServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.service;
+package net.shibboleth.shared.service;
import javax.annotation.Nonnull;
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 0ce394a4..ec95979e 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
@@ -36,16 +36,16 @@ import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.status.ErrorStatus;
import ch.qos.logback.core.status.InfoStatus;
import ch.qos.logback.core.status.StatusManager;
+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.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
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;
-import net.shibboleth.utilities.java.support.service.AbstractReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Simple {@link LoggingService} that watches for logback configuration file changes
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
index 57e671a7..326f8374 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
@@ -25,12 +25,12 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.context.ApplicationContext;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Factory bean that proxies the creation of a bean through a managed/reloadable
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
index 39aec3f0..5d641e8c 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
@@ -19,11 +19,11 @@ package net.shibboleth.shared.service.reloadable;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 549f6d10..56c3ca0a 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
@@ -24,13 +24,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.security.AccessControl;
import net.shibboleth.utilities.java.support.security.AccessControlService;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* This class uses the {@link ReloadableService} concept to implement {@link AccessControlService}
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 8d1fa3aa..901279ea 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
@@ -19,7 +19,7 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
-import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -28,7 +28,7 @@ import net.shibboleth.utilities.java.support.security.AccessControlService;
/**
* This class wraps an {@link AccessControlService} in a
- * {@link net.shibboleth.utilities.java.support.service.ServiceableComponent}.
+ * {@link net.shibboleth.shared.service.ServiceableComponent}.
*/
public class ReloadingAccessControlService extends AbstractServiceableComponent<AccessControlService>
implements AccessControlService {
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 9920a859..46849201 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
@@ -19,7 +19,7 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
-import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -28,7 +28,7 @@ import net.shibboleth.utilities.java.support.security.AccessControlService;
/**
* This class wraps an {@link AccessControlService} in a
- * {@link net.shibboleth.utilities.java.support.service.ServiceableComponent}.
+ * {@link net.shibboleth.shared.service.ServiceableComponent}.
*/
public class ServiceableAccessControlService extends AbstractServiceableComponent<AccessControlService>
implements AccessControlService {
diff --git a/shib-service/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
similarity index 97%
rename from shib-service/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
rename to shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
index e156da0f..628a1bce 100644
--- a/shib-service/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -28,9 +28,9 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* 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/ext/spring/service/ApplicationContextServiceStrategy.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
similarity index 95%
rename from shib-service/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceStrategy.java
rename to shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
index e4c20fc1..6074e186 100644
--- a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceStrategy.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
similarity index 96%
rename from shib-service/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceableComponent.java
rename to shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
index 31abdd1f..da9658db 100644
--- a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import javax.annotation.Nonnull;
diff --git a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
similarity index 93%
rename from shib-service/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
rename to shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
index 3c306472..e00f50e6 100644
--- a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import java.util.Collection;
import java.util.function.Function;
@@ -25,10 +25,10 @@ import javax.annotation.Nullable;
import org.springframework.context.ApplicationContext;
+import net.shibboleth.shared.service.ServiceException;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ServiceException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Strategy to create {@link ServiceableComponent}s from the {@link ApplicationContext}.
diff --git a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
similarity index 98%
rename from shib-service/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
rename to shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
index f83f7e83..6cea08a7 100644
--- a/shib-service/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import java.io.IOException;
import java.time.Instant;
@@ -42,15 +42,15 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.io.Resource;
+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.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
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.service.AbstractReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
diff --git a/shib-service/src/main/java/net/shibboleth/ext/spring/service/package-info.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/package-info.java
similarity index 81%
rename from shib-service/src/main/java/net/shibboleth/ext/spring/service/package-info.java
rename to shib-service/src/main/java/net/shibboleth/shared/spring/service/package-info.java
index ddf3a28a..bbfca8ff 100644
--- a/shib-service/src/main/java/net/shibboleth/ext/spring/service/package-info.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/package-info.java
@@ -17,8 +17,8 @@
/**
* Spring specific implementations of
- * {@link net.shibboleth.utilities.java.support.service.ServiceableComponent} and
- * {@link net.shibboleth.utilities.java.support.service.ReloadableService}.
+ * {@link net.shibboleth.shared.service.ServiceableComponent} and
+ * {@link net.shibboleth.shared.service.ReloadableService}.
*/
-package net.shibboleth.ext.spring.service;
\ No newline at end of file
+package net.shibboleth.shared.spring.service;
\ No newline at end of file
diff --git a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/package-info.java b/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/package-info.java
deleted file mode 100644
index 924e5dce..00000000
--- a/shib-service/src/main/java/net/shibboleth/utilities/java/support/service/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Service support for Shibboleth projects.
- *
- * <p>A service is something that reloads instances of serviceable components.</p>
- */
-
-package net.shibboleth.utilities.java.support.service;
\ No newline at end of file
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
index f504d021..392af9e9 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
@@ -20,9 +20,9 @@ package net.shibboleth.ext.spring.service;
import java.io.IOException;
import java.util.Collections;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
index 2df3f4b7..a36c456b 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
@@ -25,8 +25,9 @@ import java.time.Duration;
import java.time.Instant;
import java.util.Collections;
+import net.shibboleth.shared.service.ServiceableComponent;
+import net.shibboleth.shared.spring.service.ReloadableSpringService;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.context.support.GenericApplicationContext;
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java b/shib-service/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
index 5fccbd40..99861b6e 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
+++ b/shib-service/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
@@ -19,6 +19,8 @@ package net.shibboleth.ext.spring.service;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
+
@SuppressWarnings("javadoc")
public class TestServiceableComponent extends AbstractServiceableComponent<TestServiceableComponent> {
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml
index 0f35477c..753942f6 100644
--- a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml
+++ b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml
@@ -5,7 +5,7 @@
<bean id="RequestedAttributesMapper"
- class="net.shibboleth.ext.spring.service.TestServiceableComponent"
+ class="net.shibboleth.shared.spring.service.TestServiceableComponent"
p:theValue="One"
p:id="RequestedAttributesMapper"
</beans>
\ No newline at end of file
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
index ecf00f9c..20cd21de 100644
--- a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
+++ b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
@@ -8,14 +8,14 @@
default-destroy-method="destroy">
<!-- This bean exists in the "top" level context. -->
- <bean id="nonReloadableBean" class="net.shibboleth.ext.spring.service.NonReloadableTestBean"
+ <bean id="nonReloadableBean" class="net.shibboleth.shared.spring.service.NonReloadableTestBean"
c:_0="One">
<!-- This ensures that this singleton gets a "fresh" copy of the injected bean each call. -->
<lookup-method name="getChild" bean="reloadableBean" />
</bean>
<!-- This bean only exists in the embedded "reloadable" context because of its custom scope. -->
- <bean id="reloadableBean" class="net.shibboleth.ext.spring.service.ReloadableTestBean" scope="reloadable"
+ <bean id="reloadableBean" class="net.shibboleth.shared.spring.service.ReloadableTestBean" scope="reloadable"
c:_0="Two" c:_1="10" />
<!--
@@ -25,12 +25,12 @@
rest are ignored (via lazy-init). Most of this can be buried in parent beans.
-->
<beans profile="default">
- <bean id="reloadableBeanService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="reloadableBeanService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:beanProfiles="reloadable"
p:serviceConfigurations="classpath:/net/shibboleth/ext/spring/service/ReloadableBeans1.xml">
<constructor-arg name="claz" value="org.springframework.context.ApplicationContext" />
<constructor-arg name="strategy">
- <bean class="net.shibboleth.ext.spring.service.ApplicationContextServiceStrategy" />
+ <bean class="net.shibboleth.shared.spring.service.ApplicationContextServiceStrategy" />
</constructor-arg>
<property name="beanFactoryPostProcessors">
<bean class="net.shibboleth.shared.service.reloadable.NonReloadableExcluder" />
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml
index e9c253d8..07643e8b 100644
--- a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml
+++ b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml
@@ -8,8 +8,8 @@
default-init-method="initialize"
default-destroy-method="destroy">
- <bean id="testReloadableSpringService" class="net.shibboleth.ext.spring.service.ReloadableSpringService">
- <constructor-arg value="net.shibboleth.ext.spring.service.TestServiceableComponent" />
+ <bean id="testReloadableSpringService" class="net.shibboleth.shared.spring.service.ReloadableSpringService">
+ <constructor-arg value="net.shibboleth.shared.spring.service.TestServiceableComponent" />
<property name="serviceConfigurations">
<util:list>
<value>classpath:/net/shibboleth/ext/spring/service/ServiceableBean1.xml</value>
@@ -17,8 +17,8 @@
</property>
</bean>
- <bean id="testReloadableSpringServiceWithCustomID" class="net.shibboleth.ext.spring.service.ReloadableSpringService">
- <constructor-arg value="net.shibboleth.ext.spring.service.TestServiceableComponent" />
+ <bean id="testReloadableSpringServiceWithCustomID" class="net.shibboleth.shared.spring.service.ReloadableSpringService">
+ <constructor-arg value="net.shibboleth.shared.spring.service.TestServiceableComponent" />
<property name="id" value="CustomID" />
<property name="serviceConfigurations">
<util:list>
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml
index cf1f27a2..279da85a 100644
--- a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml
+++ b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml
@@ -7,7 +7,7 @@
<bean id="TheTestServiceableComponentOne"
- class="net.shibboleth.ext.spring.service.TestServiceableComponent"
+ class="net.shibboleth.shared.spring.service.TestServiceableComponent"
p:id="TheTestServiceableComponentOne"
p:theValue="One"/>
</beans>
\ No newline at end of file
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml
index 690584f1..7c5257f0 100644
--- a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml
+++ b/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml
@@ -7,7 +7,7 @@
<bean id="TheTestServiceableComponentTwo"
- class="net.shibboleth.ext.spring.service.TestServiceableComponent"
+ class="net.shibboleth.shared.spring.service.TestServiceableComponent"
p:id="TheTestServiceableComponentTwo"
p:theValue="Two"/>
</beans>
\ No newline at end of file
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java
index f4949af9..dfb6ca1f 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java
@@ -20,8 +20,8 @@ package net.shibboleth.shared.testing;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.service.AbstractReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
+import net.shibboleth.shared.service.AbstractReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
/**
* Utility class for wrapping a serviceable component in a dummy reloadable service.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list