[java-idp-testbed COMMIT] /trunk/src/main/resources/system/conf/testbed-ldap.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Nov 17 21:31:44 2014
New Revision: 291

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=291&view=rev
Log:
Disable STARTTLS in ldap.properties for integration tests via property replacement.

Modified:
    trunk/src/main/resources/system/conf/testbed-ldap.xml

Modified: trunk/src/main/resources/system/conf/testbed-ldap.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/testbed-ldap.xml?rev=291&r1=290&r2=291&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-ldap.xml (original)
+++ trunk/src/main/resources/system/conf/testbed-ldap.xml Mon Nov 17 21:31:44 2014
@@ -16,7 +16,6 @@
     <!-- The test ldif file /test/test-ldap.ldif is from idp-conf/src/test/resources -->
     <bean id="testbed.DirectoryService" class="net.shibboleth.idp.test.InMemoryDirectory" init-method="start" destroy-method="stop">
         <constructor-arg index="0" value="classpath:/test/test-ldap.ldif" />
-        <constructor-arg index="1" value="classpath:/test/test-ldap.keystore" />
     </bean>
 
 </beans>