[java-idp-testbed COMMIT] in /trunk/src/main/config: conf/jaas-authn-config.xml system/flows/authn/jaas-basic-authn-b...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov 20 11:19:29 2013
New Revision: 57

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=57&view=rev
Log:
Allow JAAS validator to run against multiple application names at once.

Modified:
    trunk/src/main/config/conf/jaas-authn-config.xml
    trunk/src/main/config/system/flows/authn/jaas-basic-authn-beans.xml
    trunk/src/main/config/system/flows/authn/jaas-form-authn-beans.xml

Modified: trunk/src/main/config/conf/jaas-authn-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/jaas-authn-config.xml?rev=57&r1=56&r2=57&view=diff
==============================================================================
--- trunk/src/main/config/conf/jaas-authn-config.xml (original)
+++ trunk/src/main/config/conf/jaas-authn-config.xml Wed Nov 20 11:19:29 2013
@@ -19,8 +19,10 @@
     
     <util:property-path id="shibboleth.authn.JAAS.JAASConfigURI" path="JAASConfig.URI" />
     
-    <!-- Specify the application name in the JAAS config. -->
-    <bean id="shibboleth.authn.JAAS.LoginConfigName" class="java.lang.String" c:_0="ShibUserPassAuth" />
+    <!-- Specify the application name(s) in the JAAS config. -->
+    <util:list id="shibboleth.authn.JAAS.LoginConfigNames">
+        <value>ShibUserPassAuth</value>
+    </util:list>
 
     <!-- Names of form fields to pull username and password from. -->
     <bean id="shibboleth.authn.JAAS.UsernameFieldName" class="java.lang.String" c:_0="username" />

Modified: trunk/src/main/config/system/flows/authn/jaas-basic-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/flows/authn/jaas-basic-authn-beans.xml?rev=57&r1=56&r2=57&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/authn/jaas-basic-authn-beans.xml (original)
+++ trunk/src/main/config/system/flows/authn/jaas-basic-authn-beans.xml Wed Nov 20 11:19:29 2013
@@ -24,7 +24,7 @@
         p:transforms-ref="shibboleth.authn.JAAS.Transforms" />
         
     <bean id="ValidateUsernamePasswordAgainstJAAS" class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
-            p:loginConfigName-ref="shibboleth.authn.JAAS.LoginConfigName" p:loginConfigType="JavaLoginConfig"
+            p:loginConfigNames-ref="shibboleth.authn.JAAS.LoginConfigNames" p:loginConfigType="JavaLoginConfig"
             p:classifiedMessages-ref="shibboleth.ClassifiedMessageMap"
             p:resultCachingPredicate="#{getObject('shibboleth.authn.JAAS.resultCachingPredicate')}" >
         <property name="loginConfigParameters">

Modified: trunk/src/main/config/system/flows/authn/jaas-form-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/flows/authn/jaas-form-authn-beans.xml?rev=57&r1=56&r2=57&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/authn/jaas-form-authn-beans.xml (original)
+++ trunk/src/main/config/system/flows/authn/jaas-form-authn-beans.xml Wed Nov 20 11:19:29 2013
@@ -27,7 +27,7 @@
         p:transforms-ref="shibboleth.authn.JAAS.Transforms" />
         
     <bean id="ValidateUsernamePasswordAgainstJAAS" class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
-            p:loginConfigName-ref="shibboleth.authn.JAAS.LoginConfigName" p:loginConfigType="JavaLoginConfig"
+            p:loginConfigNames-ref="shibboleth.authn.JAAS.LoginConfigNames" p:loginConfigType="JavaLoginConfig"
             p:classifiedMessages-ref="shibboleth.ClassifiedMessageMap"
             p:resultCachingPredicate="#{getObject('shibboleth.authn.JAAS.resultCachingPredicate')}">
         <property name="loginConfigParameters">