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

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Dec 19 11:49:24 2014
New Revision: 7179

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7179&view=rev
Log:
IDP-522.
Change the default option to certificateTrust.
Renamed defaultTrust to jvmTrust.
Removed test ldap.properties.

Added:
    trunk/idp-conf/src/test/resources/credentials/ldap-server.crt
      - copied unchanged from r7176, trunk/idp-conf/src/test/resources/test/test-ldap.pem
Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/test/resources/conf/ldap.properties
    trunk/idp-conf/src/test/resources/test/test-ldap.pem

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=7179&r1=7178&r2=7179&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 11:49:24 2014
@@ -24,9 +24,9 @@
         p:connectTimeout="%{idp.authn.LDAP.connectTimeout:3000}"
         p:sslConfig-ref="sslConfig" />
 
-    <alias name="%{idp.authn.LDAP.sslConfig:defaultTrust}" alias="sslConfig" />
+    <alias name="%{idp.authn.LDAP.sslConfig:certificateTrust}" alias="sslConfig" />
 
-    <bean id="defaultTrust" class="org.ldaptive.ssl.SslConfig" />
+    <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}" /> 

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7179&r1=7178&r2=7179&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Fri Dec 19 11:49:24 2014
@@ -9,8 +9,8 @@
 #idp.authn.LDAP.useSSL                          = false
 #idp.authn.LDAP.connectTimeout                  = 3000
 
-## SSL configuration, either defaultTrust, certificateTrust, or keyStoreTrust ##
-#idp.authn.LDAP.sslConfig                       = defaultTrust
+## SSL configuration, either jvmTrust, certificateTrust, or keyStoreTrust ##
+#idp.authn.LDAP.sslConfig                       = certificateTrust
 ## If using certificateTrust above, set to the trusted certificate's path
 idp.authn.LDAP.trustCertificates                = %{idp.home}/credentials/ldap-server.crt
 ## If using keyStoreTrust above, set to the truststore path