[java-identity-provider] branch main updated: IDP-2129 Review Installer for Resource use (spring or shibboleth)

[Rod Widdowson]

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

rdw 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=b94895d79fdf8ce0985cc5c8b17a297223277f33

The following commit(s) were added to refs/heads/main by this push:
     new b94895d79 IDP-2129 Review Installer for Resource use (spring or shibboleth)
b94895d79 is described below

commit b94895d79fdf8ce0985cc5c8b17a297223277f33
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jun 17 14:56:31 2023 +0100

    IDP-2129 Review Installer for Resource use (spring or shibboleth)
    
    https://shibboleth.atlassian.net/browse/IDP-2129
    
    Make the metadata generator use a shib resource to overcome property replacement
    issues (as per IDP-1806)
---
 .../idp/installer/metadata/impl/MetadataGeneratorParameters.java    | 3 +--
 .../resources/net/shibboleth/idp/installer/metadata-generator.xml   | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorParameters.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorParameters.java
index a1405cf0a..b359e89ec 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorParameters.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorParameters.java
@@ -27,12 +27,11 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.springframework.core.io.Resource;
-
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.resource.Resource;
 
 /**
  * Parameters to metadata generation
diff --git a/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml b/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml
index b03e1ef55..d9f814fdc 100644
--- a/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml
+++ b/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml
@@ -9,12 +9,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-	<bean
-		class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-		p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
-    <context:property-placeholder />
-
 	<bean id="IdPConfiguration"
 		class="net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorParameters"
 		p:encryptionCertResource="%{idp.encryption.cert}"

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