[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: system/flows/authn/password-authn-beans.xml sy...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct  9 12:49:21 2015
New Revision: 7802

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7802&view=rev
Log:
Conditional injection of various new objects to avoid dummy beans.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
    trunk/idp-conf/src/main/resources/views/login.vm

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=7802&r1=7801&r2=7802&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 Oct  9 12:49:21 2015
@@ -17,11 +17,6 @@
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
-
-    <!-- Defined for backward compatibility, overridden in user config. -->
-    <bean id="shibboleth.authn.Password.ExtendedFlows" class="java.lang.String" c:_0="" />
-    <util:list id="shibboleth.authn.Password.PrincipalOverride" />
-    <util:list id="shibboleth.authn.Password.ExtendedFlowParameters" />
 
     <import resource="../../../conf/authn/password-authn-config.xml" />
 
@@ -44,7 +39,7 @@
     <bean id="PreserveAuthenticationFlowState"
         class="net.shibboleth.idp.authn.impl.PreserveAuthenticationFlowState" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
-        p:parameterNames-ref="shibboleth.authn.Password.ExtendedFlowParameters" />
+        p:parameterNames="#{getObject('shibboleth.authn.Password.ExtendedFlowParameters')}" />
     
     <bean id="ExtractUsernamePasswordFromFormRequest"
         class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromFormRequest" scope="prototype"
@@ -61,10 +56,9 @@
             class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
             p:savePasswordToCredentialSet="#{getObject('shibboleth.authn.Password.RetainAsPrivateCredential') != null ? getObject('shibboleth.authn.Password.RetainAsPrivateCredential') : false}"
             p:loginConfigNames-ref="shibboleth.authn.JAAS.LoginConfigNames" p:loginConfigType="JavaLoginConfig"
-            p:addDefaultPrincipals="#{
-                getObject('shibboleth.authn.Password.addDefaultPrincipals') != null
-                    ? getObject('shibboleth.authn.Password.addDefaultPrincipals')
-                    : getObject('shibboleth.authn.Password.PrincipalOverride').isEmpty() }"
+            p:addDefaultPrincipals="#{getObject('shibboleth.authn.Password.addDefaultPrincipals') ?:
+                (getObject('shibboleth.authn.Password.PrincipalOverride') == null
+                    or getObject('shibboleth.authn.Password.PrincipalOverride').isEmpty())}"
             p:supportedPrincipals="#{getObject('shibboleth.authn.Password.PrincipalOverride')}"
             p:classifiedMessages-ref="shibboleth.authn.Password.ClassifiedMessageMap"
             p:resultCachingPredicate="#{getObject('shibboleth.authn.Password.resultCachingPredicate')}">
@@ -82,10 +76,9 @@
         p:preserveTicket-ref="shibboleth.authn.Krb5.PreserveTicket"
         p:servicePrincipal="#{getObject('shibboleth.authn.Krb5.ServicePrincipal')}"
         p:keytabPath="#{getObject('shibboleth.authn.Krb5.Keytab')}"
-        p:addDefaultPrincipals="#{
-            getObject('shibboleth.authn.Password.addDefaultPrincipals') != null
-                ? getObject('shibboleth.authn.Password.addDefaultPrincipals')
-                : getObject('shibboleth.authn.Password.PrincipalOverride').isEmpty() }"
+        p:addDefaultPrincipals="#{getObject('shibboleth.authn.Password.addDefaultPrincipals') ?:
+            (getObject('shibboleth.authn.Password.PrincipalOverride') == null
+                or getObject('shibboleth.authn.Password.PrincipalOverride').isEmpty())}"
         p:supportedPrincipals="#{getObject('shibboleth.authn.Password.PrincipalOverride')}"
         p:classifiedMessages-ref="shibboleth.authn.Password.ClassifiedMessageMap"
         p:resultCachingPredicate="#{getObject('shibboleth.authn.Password.resultCachingPredicate')}" />
@@ -100,10 +93,9 @@
         class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstLDAP" scope="prototype"
         p:savePasswordToCredentialSet="#{getObject('shibboleth.authn.Password.RetainAsPrivateCredential') != null ? getObject('shibboleth.authn.Password.RetainAsPrivateCredential') : false}"
         p:authenticator-ref="shibboleth.authn.LDAP.authenticator"
-        p:addDefaultPrincipals="#{
-            getObject('shibboleth.authn.Password.addDefaultPrincipals') != null
-                ? getObject('shibboleth.authn.Password.addDefaultPrincipals')

[... 40 lines stripped ...]