[java-idp-testbed COMMIT] in /trunk/src/main: java/common/InMemoryDirectory.java resources/system/conf/testbed-beans....

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Dec 31 10:30:47 2013
New Revision: 107

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=107&view=rev
Log:
For the testbed, default to resolving attributes from the in-memory directory server, which needs to be instantiated before the attribute resolver. Add a default service account to test/ldap.ldif.

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

Modified: trunk/src/main/java/common/InMemoryDirectory.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/common/InMemoryDirectory.java?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/src/main/java/common/InMemoryDirectory.java (original)
+++ trunk/src/main/java/common/InMemoryDirectory.java Tue Dec 31 10:30:47 2013
@@ -38,7 +38,7 @@
      * @throws LDAPException if the in-memory directory server cannot be created
      */
     public InMemoryDirectory(final String path) throws LDAPException {
-        InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=example,dc=org");
+        InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=example,dc=org", "ou=system");
         config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", 10389));
         config.addAdditionalBindCredentials("cn=Directory Manager", "password");
         directoryServer = new InMemoryDirectoryServer(config);

Modified: trunk/src/main/resources/system/conf/testbed-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/testbed-beans.xml?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-beans.xml (original)
+++ trunk/src/main/resources/system/conf/testbed-beans.xml Tue Dec 31 10:30:47 2013
@@ -21,10 +21,6 @@
     
     
     <!-- Specific testbed-related beans -->
-
-    <bean id="testbed.DirectoryService" class="common.InMemoryDirectory" init-method="start" destroy-method="stop">
-        <constructor-arg value="${app.home}/test/ldap.ldif" />
-    </bean>
     
     <!-- TODO: for the file references, might be preferable to make these resolved as classpath resources,
          instead of relative filesystem references. -->

Modified: trunk/src/main/resources/test/ldap.ldif
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/test/ldap.ldif?rev=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/src/main/resources/test/ldap.ldif (original)
+++ trunk/src/main/resources/test/ldap.ldif Tue Dec 31 10:30:47 2013
@@ -22,3 +22,17 @@
 description: test user
 #businessCategory: accountStateWarning
 #businessCategory: accountStateError
+
+dn: ou=system
+ou: system
+description: System accounts
+objectclass: organizationalunit
+
+dn: uid=myservice,ou=system
+ou: system
+description: Service account
+objectclass: inetOrgPerson
+cn: myservice
+sn: myservice
+uid: myservice
+userpassword: myServicePassword

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=107&r1=106&r2=107&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/src/main/webapp/WEB-INF/web.xml Tue Dec 31 10:30:47 2013
@@ -5,7 +5,7 @@
     <!-- Context config params -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>file://${idp.home}/system/conf/global-system.xml file://${idp.home}/conf/global-user.xml file://${app.home}/system/conf/testbed-beans.xml</param-value>
+        <param-value>file://${app.home}/system/conf/testbed-ldap.xml file://${idp.home}/system/conf/global-system.xml file://${idp.home}/conf/global-user.xml file://${app.home}/system/conf/testbed-beans.xml</param-value>
     </context-param>
 
     <!-- Listeners -->