[java-identity-provider] branch main updated: Replace trivial/defaulted String bean with property.

[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=1c9bdd094ccebb1a04a3cf4158b0f1eb90e329a5

The following commit(s) were added to refs/heads/main by this push:
       new  1c9bdd094 Replace trivial/defaulted String bean with property.
1c9bdd094 is described below

commit 1c9bdd094ccebb1a04a3cf4158b0f1eb90e329a5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 28 20:03:38 2020 -0400

    Replace trivial/defaulted String bean with property.
---
 .../net/shibboleth/idp/flows/intercept/warning-beans.xml       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
index 60be357b4..7327b6b18 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
@@ -21,14 +21,14 @@
     <!-- Empty map to override in config file. -->
     <util:map id="shibboleth.warning.ConditionMap" />
 
-    <!-- Prefix of cookie name to track when user was last warned. -->
-    <bean id="shibboleth.warning.NotifyCookiePrefix" class="java.lang.String" c:_0="shib_idp_warn_" />
-
     <import resource="conditional:%{idp.home}/conf/intercept/warning-intercept-config.xml" />
 
+    <!-- Prefix of cookie name to track when user was last warned. -->
+    <bean id="WarningCookiePrefix" class="java.lang.String"
+        c:_0="#{'%{idp.warning.notifyCookiePrefix:shib_idp_warn_}'.trim()}" />
+
     <!-- Simplifies flow definition expressions. -->
     <alias name="shibboleth.warning.ConditionMap" alias="WarningConditionMap" />
-    <alias name="shibboleth.warning.NotifyCookiePrefix" alias="WarningCookiePrefix" />
     <alias name="shibboleth.PersistentCookieManager" alias="WarningCookieManager" />
-    
+
 </beans>

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