[java-idp-testbed] branch main updated: Updates to InMemoryDirectoryServer.

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch main
in repository java-idp-testbed.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=025af0546517f522b43c020dd2b2e1711052e813

The following commit(s) were added to refs/heads/main by this push:
     new 025af05  Updates to InMemoryDirectoryServer.
025af05 is described below

commit 025af0546517f522b43c020dd2b2e1711052e813
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Nov 23 10:44:40 2022 -0600

    Updates to InMemoryDirectoryServer.
---
 pom.xml                                         |  8 ++++++++
 src/main/resources/system/conf/testbed-ldap.xml | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index e25308a..54e2949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,6 +158,14 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- InMemoryDirectoryServer -->
+        <dependency>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-testing</artifactId>
+            <version>${shib-shared.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <!-- Don't know why we have to directly include this. -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
diff --git a/src/main/resources/system/conf/testbed-ldap.xml b/src/main/resources/system/conf/testbed-ldap.xml
index d2f76d6..d764885 100644
--- a/src/main/resources/system/conf/testbed-ldap.xml
+++ b/src/main/resources/system/conf/testbed-ldap.xml
@@ -15,11 +15,17 @@
 
     <!-- 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" />
-        <constructor-arg index="2" value="classpath:/test/test-ldap.keystore" />
-    </bean>
+	<!-- See idp-conf/src/test/resources for the ldif and keystore files -->
+	<bean id="testbed.DirectoryService" class="net.shibboleth.shared.testing.InMemoryDirectory" init-method="start" destroy-method="stop">
+		<constructor-arg name="baseDNs" value="#{{'dc=example,dc=org', 'ou=system'}}" />
+		<constructor-arg name="ldif" value="classpath:/test/test-ldap.ldif" />
+		<constructor-arg name="port" value="${test.ldap.port:10389}" />
+		<constructor-arg name="keystore" ref="testLdapKeystore" />
+		<constructor-arg name="truststore" value="#{T(java.util.Optional).of(testLdapKeystore)}" />
+	</bean>
+
+	<bean id="testLdapKeystore" class="org.springframework.core.io.ClassPathResource">
+		<constructor-arg value="/test/test-ldap.keystore" />
+	</bean>
 
 </beans>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.