[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/idp.properties idp-conf/src/main/resource...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 19 17:30:16 2014
New Revision: 7189

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7189&view=rev
Log:
Switch fallback languages to a comma-delimited list for consistency.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=7189&r1=7188&r2=7189&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Fri Dec 19 17:30:16 2014
@@ -152,6 +152,6 @@
 idp.resolvertest.accessPolicy = AccessByIPAddress
 idp.reload.accessPolicy = AccessByIPAddress
 
-# Languages to use if not match can be found with the browser supported languages.
-# List is semicolon-delimited, defaults to an empty list.
-idp.ui.fallbackLanguages=en;fr;de
+# Comma-delimited languages to use if not match can be found with the
+# browser-supported languages, defaults to an empty list.
+idp.ui.fallbackLanguages=en,fr,de

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml?rev=7189&r1=7188&r2=7189&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml Fri Dec 19 17:30:16 2014
@@ -21,10 +21,13 @@
     <import resource="../../../conf/authn/external-authn-config.xml" />
 
     <bean id="SetRPUIInformation"
-        class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
-        p:activationCondition-ref="shibboleth.authn.External.populateUIInfo"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest"
-        p:fallbackLanguages="%{idp.ui.fallbackLanguages:null}" />
+            class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
+            p:activationCondition-ref="shibboleth.authn.External.populateUIInfo"
+            p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+        <property name="fallbackLanguages">
+            <bean parent="shibboleth.CommaDelimStringArray" c:_0="%{idp.ui.fallbackLanguages:}" />
+        </property>
+    </bean>
 
     <bean id="ValidateExternalAuthentication"
             class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml?rev=7189&r1=7188&r2=7189&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml Fri Dec 19 17:30:16 2014
@@ -29,9 +29,12 @@
         p:transforms-ref="shibboleth.authn.Password.Transforms" />
 
     <bean id="SetRPUIInformation"
-        class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest"
-        p:fallbackLanguages="%{idp.ui.fallbackLanguages:null}"/>
+            class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
+            p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+        <property name="fallbackLanguages">
+            <bean parent="shibboleth.CommaDelimStringArray" c:_0="%{idp.ui.fallbackLanguages:}" />
+        </property>
+    </bean>
     
     <bean id="ExtractUsernamePasswordFromFormRequest"
         class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromFormRequest" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml?rev=7189&r1=7188&r2=7189&view=diff

[... 174 lines stripped ...]