[java-identity-provider] branch master updated: Legacy NameID generator properties are warned on at runtime, not fatal.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=aa751bf85374165d8af3f02164a9f065c8897a7a

The following commit(s) were added to refs/heads/master by this push:
       new  aa751bf   Legacy NameID generator properties are warned on at runtime, not fatal.
aa751bf is described below

commit aa751bf85374165d8af3f02164a9f065c8897a7a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Oct 28 11:29:49 2019 -0400

    Legacy NameID generator properties are warned on at runtime, not fatal.
---
 .../main/java/net/shibboleth/idp/installer/V4Install.java  | 14 +-------------
 1 file changed, 1 insertion(+), 13 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 b5db194..9ebc49c 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
@@ -124,24 +124,12 @@ public class V4Install extends AbstractInitializableComponent {
     protected void checkPreConditions() throws BuildException {
         final Properties props = currentState.getCurrentlyInstalledProperties();
         if (props != null) {
-            String value =StringSupport.trimOrNull(props.getProperty("idp.service.relyingparty.resources"));
+            final String value = StringSupport.trimOrNull(props.getProperty("idp.service.relyingparty.resources"));
             if ("shibboleth.LegacyRelyingPartyResolverResources".equals(value)) {
                 log.error("Install failed: system will not work after V4 upgrade");
                 log.error("idp.service.relyingparty.resources is set to shibboleth.RelyingPartyResolverResources");
                 throw new BuildException("Install failed: system will not work after V4 upgrade");
             }
-            value = StringSupport.trimOrNull(props.getProperty("idp.nameid.saml1.legacyGenerator"));
-            if ("shibboleth.LegacySAML1NameIdentifierGenerator".equals(value)) {
-                log.error("Install failed: system will not work after V4 upgrade");
-                log.error("idp.nameid.saml1.legacyGenerator is set to shibboleth.LegacySAML1NameIdentifierGenerator");
-                throw new BuildException("Install failed: system will not work after V4 upgrade");
-            }
-            value = StringSupport.trimOrNull(props.getProperty("idp.nameid.saml2.legacyGenerator"));
-            if ("shibboleth.LegacySAML2NameIDGenerator".equals(value)) {
-                log.error("Install failed: system will not work after V4 upgrade");
-                log.error("idp.nameid.saml2.legacyGenerator is set to shibboleth.LegacySAML2NameIDGenerator");
-                throw new BuildException("Install failed: system will not work after V4 upgrade");                
-            }
         }
     }
 

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