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

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun 29 14:18:20 2015
New Revision: 315

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=315&view=rev
Log:
IDP-757 - Add ability to configure the test directory server port.

https://issues.shibboleth.net/jira/browse/IDP-757

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=315&r1=314&r2=315&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-ldap.xml	(original)
+++ trunk/src/main/resources/system/conf/testbed-ldap.xml	Mon Jun 29 14:18:20 2015
@@ -10,12 +10,15 @@
 
        default-init-method="initialize"
        default-destroy-method="destroy">
-    
+
+    <context:property-placeholder />
+
     <!-- Specific testbed-related beans -->
 
     <!-- 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="${test.ldap.port:10389}" type="int" />
     </bean>
 
 </beans>