[java-identity-provider COMMIT] in /trunk/idp-authn-impl/src/main/resources/flows: jaas-basic-authn-beans.xml jaas-fo...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 10 18:38:58 2013
New Revision: 4762

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4762&view=rev
Log:
Copy over improved JAAS config handling.

Modified:
    trunk/idp-authn-impl/src/main/resources/flows/jaas-basic-authn-beans.xml
    trunk/idp-authn-impl/src/main/resources/flows/jaas-form-authn-beans.xml

Modified: trunk/idp-authn-impl/src/main/resources/flows/jaas-basic-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/resources/flows/jaas-basic-authn-beans.xml?rev=4762&r1=4761&r2=4762&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/resources/flows/jaas-basic-authn-beans.xml (original)
+++ trunk/idp-authn-impl/src/main/resources/flows/jaas-basic-authn-beans.xml Tue Sep 10 18:38:58 2013
@@ -13,15 +13,17 @@
     
     <bean id="ExtractUsernamePasswordFromBasicAuth" class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromBasicAuth" scope="prototype" />
         
+    <bean id="JAASConfig" class="org.springframework.core.io.ClassPathResource">
+        <constructor-arg type="java.lang.String" value="conf/jaas.config" />
+    </bean>
+
+    <util:property-path id="JAASConfigURI" path="JAASConfig.URI" />
+        
     <bean id="ValidateUsernamePasswordAgainstJAAS" class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
             p:loginConfigName="ShibUserPassAuth" p:loginConfigType="JavaLoginConfig">
         <property name="loginConfigParameters">
             <bean class="java.security.URIParameter">
-                <constructor-arg>
-                    <bean class="java.net.URI">
-                        <constructor-arg value="file://$IDP_HOME/conf/jaas.config" />
-                    </bean>
-                </constructor-arg>
+                <constructor-arg ref="JAASConfigURI" />
             </bean>
         </property>
     </bean>

Modified: trunk/idp-authn-impl/src/main/resources/flows/jaas-form-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/resources/flows/jaas-form-authn-beans.xml?rev=4762&r1=4761&r2=4762&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/resources/flows/jaas-form-authn-beans.xml (original)
+++ trunk/idp-authn-impl/src/main/resources/flows/jaas-form-authn-beans.xml Tue Sep 10 18:38:58 2013
@@ -13,15 +13,17 @@
     
     <bean id="ExtractUsernamePasswordFromFormRequest" class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromFormRequest" scope="prototype" />
         
+    <bean id="JAASConfig" class="org.springframework.core.io.ClassPathResource">
+        <constructor-arg type="java.lang.String" value="conf/jaas.config" />
+    </bean>
+
+    <util:property-path id="JAASConfigURI" path="JAASConfig.URI" />
+        
     <bean id="ValidateUsernamePasswordAgainstJAAS" class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
             p:loginConfigName="ShibUserPassAuth" p:loginConfigType="JavaLoginConfig">
         <property name="loginConfigParameters">
             <bean class="java.security.URIParameter">
-                <constructor-arg>
-                    <bean class="java.net.URI">
-                        <constructor-arg value="file://$IDP_HOME/conf/jaas.config" />
-                    </bean>
-                </constructor-arg>
+                <constructor-arg ref="JAASConfigURI" />
             </bean>
         </property>
     </bean>