[java-identity-provider] branch main updated: Rename Spring resource package, add parent beans and relocation rules.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 18:37:04 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1fc3300f89f24c16d24be8b602dc2574bd6e291f
The following commit(s) were added to refs/heads/main by this push:
new 1fc3300f8 Rename Spring resource package, add parent beans and relocation rules.
1fc3300f8 is described below
commit 1fc3300f89f24c16d24be8b602dc2574bd6e291f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 14:37:01 2022 -0400
Rename Spring resource package, add parent beans and relocation rules.
---
.../authn/impl/DefaultAuthenticationResultSerializerTest.java | 2 +-
.../idp/authn/impl/KeystoreResourceCredentialConfigTest.java | 2 +-
.../idp/authn/impl/X509ResourceCredentialConfigTest.java | 2 +-
.../idp/cas/service/impl/MetadataServiceRegistryTest.java | 2 +-
.../idp/cas/ticket/impl/EncodingTicketServiceTest.java | 2 +-
.../src/main/resources/net/shibboleth/idp/conf/global-system.xml | 5 +++++
.../src/main/resources/net/shibboleth/idp/conf/primitives.xml | 9 +++++++++
.../main/resources/net/shibboleth/idp/conf/services-system.xml | 2 +-
.../resources/net/shibboleth/idp/flows/admin/hello-beans.xml | 2 +-
.../idp/test/PreferFileSystemApplicationContextInitializer.java | 4 ++--
.../net/shibboleth/idp/test/PreferFileSystemContextLoader.java | 6 +++---
.../idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java | 2 +-
.../nameid/impl/CryptoTransientNameIdentifierDecoderTest.java | 2 +-
.../impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java | 2 +-
.../nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java | 2 +-
.../idp/profile/spring/factory/FlowRelativeResourceLoader.java | 2 +-
idp-spring/src/test/resources/logback-test.xml | 2 +-
17 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
index 38bb372bd..5b6cbc003 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
@@ -29,7 +29,6 @@ import java.util.List;
import javax.security.auth.Subject;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -52,6 +51,7 @@ import net.shibboleth.idp.authn.principal.impl.IdPAttributePrincipalSerializer;
import net.shibboleth.idp.authn.principal.impl.LDAPPrincipalSerializer;
import net.shibboleth.idp.authn.principal.impl.ProxyAuthenticationPrincipalSerializer;
import net.shibboleth.idp.authn.testing.TestPrincipal;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
index 8282fd299..e86d70541 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
@@ -20,7 +20,7 @@ package net.shibboleth.idp.authn.impl;
import java.io.File;
import java.net.URISyntaxException;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.resource.Resource;
import org.ldaptive.ssl.SSLContextInitializer;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
index 704d25801..1d8c77a3c 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
@@ -20,7 +20,7 @@ package net.shibboleth.idp.authn.impl;
import java.io.File;
import java.net.URISyntaxException;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.resource.Resource;
import org.ldaptive.ssl.SSLContextInitializer;
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java
index 992ff46b9..9db368603 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java
@@ -21,8 +21,8 @@ import java.time.Duration;
import java.util.Collections;
import java.util.Timer;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.cas.service.Service;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.resource.Resource;
import org.opensaml.core.config.InitializationException;
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java
index d27defe80..e3f2f633e 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java
@@ -22,12 +22,12 @@ import java.security.SecureRandom;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.cas.ticket.ProxyGrantingTicket;
import net.shibboleth.idp.cas.ticket.ProxyTicket;
import net.shibboleth.idp.cas.ticket.ServiceTicket;
import net.shibboleth.idp.cas.ticket.TicketIdentifierGenerationStrategy;
import net.shibboleth.idp.cas.ticket.TicketState;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 873d071e7..a3e2646f0 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -85,6 +85,11 @@
value="net.shibboleth.shared.spring.factory.EvaluableScriptFactoryBean" />
<entry key="net.shibboleth.ext.spring.factory.PatternFactoryBean"
value="net.shibboleth.shared.spring.factory.PatternFactoryBean" />
+
+ <entry key="net.shibboleth.ext.spring.resource.ConditionalResource"
+ value="net.shibboleth.shared.spring.resource.ConditionalResource" />
+ <entry key="net.shibboleth.ext.spring.resource.RunnableFileSystemResource"
+ value="net.shibboleth.shared.spring.resource.RunnableFileSystemResource" />
</map>
</property>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
index 8ab0ecb01..8e9928a5e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
@@ -26,9 +26,18 @@
c:service-ref="shibboleth.ManagedBeanService" />
<!-- List combiner factory bean. -->
+
<bean id="shibboleth.ListCombiner" abstract="true"
class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean" />
+ <!-- Resource beans. -->
+
+ <bean id="shibboleth.ConditionalReesource" abstract="true"
+ class="net.shibboleth.shared.spring.resource.ConditionalResource" />
+
+ <bean id="shibboleth.RunnableFileSystemResource" abstract="true"
+ class="net.shibboleth.shared.spring.resource.RunnableFileSystemResource" />
+
<!-- TrustEngine helpers. -->
<bean id="shibboleth.StaticExplicitTrustEngine" abstract="true"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
index 1f25b217b..5349fd22d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
@@ -203,7 +203,7 @@
<!-- This default populates the service with an empty CAS registry as a substitute for a real config. -->
<util:list id="shibboleth.DefaultCASServiceRegistryResources">
- <bean class="net.shibboleth.ext.spring.resource.ConditionalResource" c:wrapped="%{idp.home}/conf/cas-protocol.xml">
+ <bean parent="shibboleth.ConditionalReesource" c:wrapped="%{idp.home}/conf/cas-protocol.xml">
<property name="defaultContent">
<value>
<![CDATA[
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
index 596a495b2..bddabeccd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
@@ -38,7 +38,7 @@
<bean id="ScriptedAction" class="net.shibboleth.idp.profile.ScriptedAction" factory-method="resourceScript" scope="prototype">
<constructor-arg>
- <bean class="net.shibboleth.ext.spring.resource.ConditionalResource"
+ <bean parent="shibboleth.ConditionalReesource"
c:_0="%{idp.home}/conf/admin/hello-world.js"
p:defaultContent="null;" />
</constructor-arg>
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java b/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java
index 133f78cce..7b5c743f1 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java
@@ -19,9 +19,9 @@ package net.shibboleth.idp.test;
import javax.annotation.Nonnull;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
-import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
+import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java b/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
index fd09856c6..b285738c1 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
@@ -17,13 +17,13 @@
package net.shibboleth.idp.test;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
-import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
-
import org.springframework.test.context.web.GenericXmlWebContextLoader;
import org.springframework.test.context.web.WebMergedContextConfiguration;
import org.springframework.web.context.support.GenericWebApplicationContext;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
+import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
+
/**
* An extension of {@link GenericXmlWebContextLoader} which sets the resource loader used by the application context to
* {@link PreferFileSystemResourceLoader}.
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
index 2f9ff7721..18eb65119 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import javax.security.auth.Subject;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.authn.SubjectCanonicalizationException;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
import net.shibboleth.idp.authn.context.SubjectContext;
@@ -33,6 +32,7 @@ import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
import net.shibboleth.idp.saml.impl.testing.TestSources;
import net.shibboleth.idp.saml.nameid.NameDecoderException;
import net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.DataSealerException;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
index 51f1565ba..4e341fb54 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
@@ -22,13 +22,13 @@ import java.util.Collections;
import javax.security.auth.Subject;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
import net.shibboleth.idp.saml.impl.testing.TestSources;
import net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
index a3fea15f3..de4639c59 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
@@ -20,10 +20,10 @@ package net.shibboleth.idp.saml.nameid.impl;
import java.io.IOException;
import java.time.Duration;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
index e5c70fccb..b3dd2ca58 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
@@ -20,10 +20,10 @@ package net.shibboleth.idp.saml.nameid.impl;
import java.io.IOException;
import java.time.Duration;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
diff --git a/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowRelativeResourceLoader.java b/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowRelativeResourceLoader.java
index 41a572fab..e1012d4fa 100644
--- a/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowRelativeResourceLoader.java
+++ b/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowRelativeResourceLoader.java
@@ -25,7 +25,7 @@ import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
/**
* This code is extended from org.springframework.webflow.engine.builder.model.FlowRelativeResourceLoader
diff --git a/idp-spring/src/test/resources/logback-test.xml b/idp-spring/src/test/resources/logback-test.xml
index 3c4e74ab0..e23dbbb37 100644
--- a/idp-spring/src/test/resources/logback-test.xml
+++ b/idp-spring/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
<configuration>
- <logger name="net.shibboleth.ext.spring.resource" level="DEBUG"/>
+ <logger name="net.shibboleth.shared.spring.resource" level="DEBUG"/>
<logger name="net.shibboleth.idp.profile.spring" level="DEBUG"/>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list