[java-idp-testbed COMMIT] in /trunk/src/main: java/Main.java resources/system/conf/testbed-ldap.xml webapp/WEB-INF/we...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun 23 15:24:00 2014
New Revision: 272

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=272&view=rev
Log:
Launch the in-memory LDAP server via Spring wiring in the testbed rather than in code to allow for complete use from the command line.

Added:
    trunk/src/main/resources/system/conf/testbed-ldap.xml   (with props)
Modified:
    trunk/src/main/java/Main.java
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/src/main/java/Main.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/Main.java?rev=272&r1=271&r2=272&view=diff
==============================================================================
--- trunk/src/main/java/Main.java (original)
+++ trunk/src/main/java/Main.java Mon Jun 23 15:24:00 2014
@@ -21,9 +21,6 @@
 import java.security.ProtectionDomain;
 import java.util.Properties;
 
-import net.shibboleth.idp.test.InMemoryDirectory;
-import net.shibboleth.idp.test.flows.AbstractFlowTest;
-
 import org.eclipse.jetty.jaas.JAASLoginService;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.server.Server;
@@ -31,7 +28,6 @@
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.xml.XmlConfiguration;
-import org.springframework.core.io.ClassPathResource;
 
 import common.PathPropertySupport;
 
@@ -43,11 +39,6 @@
      */
     public static void main(String[] args) {
         try {
-            // Start in-memory directory server.
-            final InMemoryDirectory directoryServer =
-                    new InMemoryDirectory(new ClassPathResource(AbstractFlowTest.LDIF_FILE));
-            directoryServer.start();
-
             // Hack. If protection domain location ends with ".war", then assume we are running from a CLI, otherwise
             // assume we are running from within Eclipse.
             final ProtectionDomain protectionDomain = Main.class.getProtectionDomain();

Modified: trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/web.xml?rev=272&r1=271&r2=272&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/src/main/webapp/WEB-INF/web.xml Mon Jun 23 15:24:00 2014
@@ -5,7 +5,7 @@
     <!-- Context config params, /test/test-beans.xml is from idp-conf/src/test/resources -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>classpath:/system/conf/testbed-opensaml.xml classpath:/test/test-beans.xml</param-value>
+        <param-value>classpath:/system/conf/testbed-ldap.xml classpath:/system/conf/testbed-opensaml.xml classpath:/test/test-beans.xml</param-value>
     </context-param>
     
     <context-param>