[java-identity-provider] branch master updated: Update list of deprecated properties.

[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=1013bdfffa5cbcd5ff3c2cedfbd8a1692f8f2a99

The following commit(s) were added to refs/heads/master by this push:
       new  1013bdf   Update list of deprecated properties.
1013bdf is described below

commit 1013bdfffa5cbcd5ff3c2cedfbd8a1692f8f2a99
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 23 19:59:24 2017 -0400

    Update list of deprecated properties.
---
 idp-conf/src/main/resources/conf/idp.properties           |  8 --------
 idp-conf/src/main/resources/system/conf/global-system.xml | 12 ++++++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/idp.properties b/idp-conf/src/main/resources/conf/idp.properties
index 33ac21d..8ff8219 100644
--- a/idp-conf/src/main/resources/conf/idp.properties
+++ b/idp-conf/src/main/resources/conf/idp.properties
@@ -108,14 +108,6 @@ idp.encryption.cert = %{idp.home}/credentials/idp-encryption.crt
 # Regular expression matching login flows to enable, e.g. IPAddress|Password
 idp.authn.flows = Password
 
-# Regular expression of forced "initial" methods when no session exists,
-# usually in conjunction with the idp.authn.resolveAttribute property below.
-#idp.authn.flows.initial = Password
-
-# Set to an attribute ID to resolve prior to selecting authentication flows;
-# its values are used to filter the flows to allow.
-#idp.authn.resolveAttribute = eduPersonAssurance
-
 # Default lifetime and timeout of various authentication methods
 #idp.authn.defaultLifetime = PT60M
 #idp.authn.defaultTimeout = PT30M
diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index 153794d..10ca95c 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -59,6 +59,18 @@
         <property name="deprecatedProperties">
             <map>
                 <entry key="idp.httpclient.useTrustEngineTLSSocketFactory" value="idp.httpclient.useSecurityEnhancedTLSSocketFactory" />
+                <entry key="idp.authn.flows.initial">
+                    <null/>
+                </entry>
+                <entry key="idp.authn.resolveAttribute">
+                    <null/>
+                </entry>
+                <entry key="idp.nameid.saml2.legacyGenerator">
+                    <null/>
+                </entry>
+                <entry key="idp.nameid.saml1.legacyGenerator">
+                    <null/>
+                </entry>
             </map>
         </property>
         <property name="deadProperties">

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