[java-idp-testbed COMMIT] in /trunk/src/main/config/system/conf: global-system.xml testbed-beans.xml

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec  9 11:13:46 2013
New Revision: 67

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=67&view=rev
Log:
Move in-mem test LDAP into testbed bean file.

Modified:
    trunk/src/main/config/system/conf/global-system.xml
    trunk/src/main/config/system/conf/testbed-beans.xml

Modified: trunk/src/main/config/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/conf/global-system.xml?rev=67&r1=66&r2=67&view=diff
==============================================================================
--- trunk/src/main/config/system/conf/global-system.xml (original)
+++ trunk/src/main/config/system/conf/global-system.xml Mon Dec  9 11:13:46 2013
@@ -145,8 +145,4 @@
 
     <bean id="shibboleth.AttributeResolver" factory-bean="shibboleth.AttributeResolverService" factory-method="getAttributeResolver" />
 
-    <bean id="shibboleth.DirectoryService" class="common.InMemoryDirectory" init-method="start" destroy-method="stop">
-      <constructor-arg><value>src/test/config/ldap.ldif</value></constructor-arg>
-    </bean>    
-
  </beans>

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