[java-shib-metadata] branch main updated: Rename service abstraction packages.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 21 19:29:02 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=07cb46ca7c18488fa66072995ab7d78d75208d2f
The following commit(s) were added to refs/heads/main by this push:
new 07cb46ca7 Rename service abstraction packages.
07cb46ca7 is described below
commit 07cb46ca7c18488fa66072995ab7d78d75208d2f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 21 15:29:00 2022 -0400
Rename service abstraction packages.
---
.../shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java | 2 +-
.../idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java | 4 ++--
.../idp/saml/metadata/impl/MetadataResolverServiceStrategy.java | 4 ++--
.../shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java | 4 ++--
.../test/java/net/shibboleth/spring/metadata/EmptyChainService.java | 4 ++--
.../java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java | 4 ++--
.../java/net/shibboleth/spring/metadata/MetadataFailFastTest.java | 4 ++--
.../test/resources/net/shibboleth/spring/failfast/metadataBeans.xml | 2 +-
.../net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml | 2 +-
.../test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml | 2 +-
.../resources/net/shibboleth/spring/metadata/multipleResolvers.xml | 2 +-
.../test/resources/net/shibboleth/spring/metadata/serviceBeans.xml | 2 +-
.../main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
index d26431887..44fe91ce3 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
@@ -25,7 +25,7 @@ import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
index e884b9682..a2c56baea 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
@@ -39,13 +39,13 @@ import com.codahale.metrics.MetricSet;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
+import net.shibboleth.shared.service.ReloadableServiceGaugeSet;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ReloadableServiceGaugeSet;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Additional gauges for metadata resolvers.
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
index 7a4385d20..556c1b8e5 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
@@ -31,11 +31,11 @@ import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.ApplicationContext;
+import net.shibboleth.shared.service.ServiceException;
+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.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ServiceException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* Strategy for summoning up a {@link MetadataResolver} from a populated {@link ApplicationContext}.
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
index 4e636c31a..8b4b1380f 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
@@ -28,13 +28,13 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+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.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* This class uses the service interface to implement {@link MetadataResolver}.
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/EmptyChainService.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/EmptyChainService.java
index bbc173ff0..e7a97f703 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/EmptyChainService.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/EmptyChainService.java
@@ -24,8 +24,8 @@ import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
@SuppressWarnings("javadoc")
public class EmptyChainService extends AbstractMetadataParserTest {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
index 337d5a255..de48feff8 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
@@ -23,11 +23,11 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.stream.Collectors;
-import net.shibboleth.ext.spring.service.ReloadableSpringService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
+import net.shibboleth.shared.spring.service.ReloadableSpringService;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.DOMMetadataResolver;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java
index 4d2a1b030..35c61df63 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java
@@ -28,10 +28,10 @@ import org.springframework.mock.env.MockPropertySource;
import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
+import net.shibboleth.shared.service.ReloadableService;
+import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.spring.testing.AbstractFailFastTest;
import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
* This test "works" but is hanging the test process so not shutting down cleanly.
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
index df24f15c5..71c581a98 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
@@ -37,7 +37,7 @@
<bean id="shibboleth.MetadataResolverService"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:serviceConfigurations="%{ServiceConfiguration}"
p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
p:failFast="%{failFast}" p:reloadCheckDelay="0">
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
index 634e57738..c88600d6f 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
@@ -37,7 +37,7 @@
<bean id="shibboleth.MetadataResolverService"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:serviceConfigurations="%{ServiceConfiguration}"
p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
p:reloadCheckDelay="0">
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
index cf154621c..ea7aff55e 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
@@ -17,7 +17,7 @@
<bean id="shibboleth.MetadataResolverService"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:serviceConfigurations="classpath:/net/shibboleth/spring/metadata/empty-chain.xml"
p:failFast="true" p:reloadCheckDelay="0">
<constructor-arg name="claz"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml
index 1f4b8c4b7..ef76e30f6 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml
@@ -13,7 +13,7 @@
(if not already set). -->
<bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" destroy-method="" />
- <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:failFast="true"
p:reloadCheckDelay="0">
<constructor-arg name="claz"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
index cb616bc74..ad7adbd56 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
@@ -28,7 +28,7 @@
</util:set>
<bean id="shibboleth.MetadataResolverService"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:serviceConfigurations-ref="resources"
p:failFast="true" p:reloadCheckDelay="0">
<constructor-arg name="claz"
diff --git a/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java b/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
index 42bbbc79e..4780bec87 100644
--- a/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
+++ b/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
@@ -36,11 +36,11 @@ import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.shared.testing.RepositorySupport;
import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
* Base class for testing metadata providers.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list