[java-idp-testbed] branch master updated: Use StartTLS with the InMemoryDirectory.

[Daniel Fisher]

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

dfisher pushed a commit to branch master
in repository java-idp-testbed.

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

The following commit(s) were added to refs/heads/master by this push:
       new  f830810   Use StartTLS with the InMemoryDirectory.
f830810 is described below

commit f8308105bce2c6b78436906bc67ed47af3c7753d
Author: Daniel Fisher <dfisher at gmail.com>
AuthorDate: Wed Jan 18 00:37:46 2017 -0500

    Use StartTLS with the InMemoryDirectory.
---
 idp-testbed-logback.launch                      | 2 +-
 src/main/resources/system/conf/testbed-ldap.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/idp-testbed-logback.launch b/idp-testbed-logback.launch
index 6fce056..6f3842a 100644
--- a/idp-testbed-logback.launch
+++ b/idp-testbed-logback.launch
@@ -14,5 +14,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Main"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="java-idp-testbed"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Didp.authn.LDAP.useStartTLS=false -Dlogback.configurationFile=${workspace_loc:idp-conf}/src/main/resources/conf/logback.xml"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlogback.configurationFile=${workspace_loc:idp-conf}/src/main/resources/conf/logback.xml"/>
 </launchConfiguration>
diff --git a/src/main/resources/system/conf/testbed-ldap.xml b/src/main/resources/system/conf/testbed-ldap.xml
index a4eb9d4..d2f76d6 100644
--- a/src/main/resources/system/conf/testbed-ldap.xml
+++ b/src/main/resources/system/conf/testbed-ldap.xml
@@ -19,6 +19,7 @@
     <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>
 
 </beans>
\ No newline at end of file

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