[java-identity-provider] branch main updated: IDP-1830 - Installer should check for outdated web.xml content

[Scott Cantor]

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=efb5c7b6d11550db1175ef988d235cec59eb7888

The following commit(s) were added to refs/heads/main by this push:
       new  efb5c7b6d IDP-1830 - Installer should check for outdated web.xml content
efb5c7b6d is described below

commit efb5c7b6d11550db1175ef988d235cec59eb7888
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 24 09:12:00 2021 -0400

    IDP-1830 - Installer should check for outdated web.xml content
    
    https://shibboleth.atlassian.net/browse/IDP-1830
    
    Custom log warning.
---
 .../main/java/net/shibboleth/idp/installer/V4Install.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 17ee8c52b..8b301b3e6 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -48,6 +48,8 @@ import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
+import net.shibboleth.ext.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext;
+import net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext;
 import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
 import net.shibboleth.idp.Version;
 import net.shibboleth.idp.installer.impl.InstallationLogger;
@@ -61,8 +63,6 @@ import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategyTool;
 import net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator;
@@ -418,10 +418,10 @@ public class V4Install extends AbstractInitializableComponent {
             String line = in.readLine();
             while (line != null) {
                 if (pat.matcher(line).matches()) {
-                    DeprecationSupport.warn(ObjectType.CLASS,
-                            "net.shibboleth.ext.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext",
-                            "edit-webapp/WEB-INF/web.xml",
-                            "net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext");
+                    log.warn("Your copy of edit-webapp/WEB-INF/web.xml contains a reference to a replaced class, " +
+                            DeferPlaceholderFileSystemXmlWebApplicationContext.class.getCanonicalName());
+                    log.warn("You MUST update this to " + DelimiterAwareApplicationContext.class.getCanonicalName() +
+                            " and rebuild the war after installation or the IdP will refuse to start.");
                     break;
                 }
                 line = in.readLine();

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