[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/java/Main.java src/main/java/common/InMemoryDirectory.java src/...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jun  4 18:27:16 2014
New Revision: 255

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=255&view=rev
Log:
Move the in-memory directory server from the testbed to idp-conf.
Launch the in-memory directory server via Main rather than web.xml in the testbed.

Modified:
    trunk/pom.xml
    trunk/src/main/java/Main.java
    trunk/src/main/java/common/InMemoryDirectory.java
    trunk/src/main/resources/system/conf/testbed-ldap.xml
    trunk/src/main/resources/test/ldap.ldif
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=255&r1=254&r2=255&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Jun  4 18:27:16 2014
@@ -49,7 +49,13 @@
             <artifactId>idp-conf</artifactId>
             <version>${idp.version}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-conf</artifactId>
+            <version>${idp.version}</version>
+            <type>test-jar</type>
+        </dependency>
+
         <dependency>
             <groupId>${idp.groupId}</groupId>
             <artifactId>idp-profile-impl</artifactId>

Modified: trunk/src/main/java/Main.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/Main.java?rev=255&r1=254&r2=255&view=diff
==============================================================================
--- trunk/src/main/java/Main.java (original)
+++ trunk/src/main/java/Main.java Wed Jun  4 18:27:16 2014
@@ -21,6 +21,9 @@
 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;
@@ -28,6 +31,7 @@
 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;
 
@@ -39,6 +43,11 @@
      */
     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=255&r1=254&r2=255&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/src/main/webapp/WEB-INF/web.xml Wed Jun  4 18:27:16 2014
@@ -5,7 +5,7 @@
     <!-- Context config params -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>file:///${testbed.home}/system/conf/testbed-opensaml.xml file:///${testbed.home}/system/conf/testbed-ldap.xml file:///${testbed.home}/system/conf/testbed-beans.xml</param-value>
+        <param-value>file:///${testbed.home}/system/conf/testbed-opensaml.xml file:///${testbed.home}/system/conf/testbed-beans.xml</param-value>
     </context-param>
 
     <!-- Listeners -->