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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 19 15:27:24 2014
New Revision: 7182

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7182&view=rev
Log:
Hide authn-impl class names in flow bean file.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=7182&r1=7181&r2=7182&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Fri Dec 19 15:27:24 2014
@@ -28,14 +28,14 @@
 
     <bean id="jvmTrust" class="org.ldaptive.ssl.SslConfig" />
     <bean id="certificateTrust" class="org.ldaptive.ssl.SslConfig">
-      <property name="credentialConfig">
-        <bean class="net.shibboleth.idp.authn.impl.X509ResourceCredentialConfig" p:trustCertificates="%{idp.authn.LDAP.trustCertificates}" /> 
-      </property>
+        <property name="credentialConfig">
+            <bean parent="shibboleth.X509ResourceCredentialConfig" p:trustCertificates="%{idp.authn.LDAP.trustCertificates}" /> 
+        </property>
     </bean>
     <bean id="keyStoreTrust" class="org.ldaptive.ssl.SslConfig">
-      <property name="credentialConfig">
-        <bean class="net.shibboleth.idp.authn.impl.KeystoreResourceCredentialConfig" p:trustStore="%{idp.authn.LDAP.trustStore}" /> 
-      </property>
+        <property name="credentialConfig">
+            <bean parent="shibboleth.KeystoreResourceCredentialConfig" p:trustStore="%{idp.authn.LDAP.trustStore}" /> 
+        </property>
     </bean>
 
     <!-- Authentication handler -->

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=7182&r1=7181&r2=7182&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 15:27:24 2014
@@ -64,6 +64,12 @@
             p:resultCachingPredicate="#{getObject('shibboleth.authn.Password.resultCachingPredicate')}">
     </bean>
 
+    <!-- Parent beans for custom ldaptive CredentialConfig types. -->
+    <bean id="shibboleth.X509ResourceCredentialConfig"
+        class="net.shibboleth.idp.authn.impl.X509ResourceCredentialConfig" abstract="true" /> 
+    <bean id="shibboleth.KeystoreResourceCredentialConfig"
+        class="net.shibboleth.idp.authn.impl.KeystoreResourceCredentialConfig" abstract="true" /> 
+
     <bean id="ValidateUsernamePasswordAgainstLDAP"
         class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstLDAP" scope="prototype"
         p:authenticator-ref="shibboleth.authn.LDAP.authenticator"