[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 30 06:25:17 2014
New Revision: 6195

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6195&view=rev
Log:
IDP-385 Make test file schema valid

Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml?rev=6195&r1=6194&r2=6195&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml Mon Jun 30 06:25:17 2014
@@ -18,6 +18,8 @@
                 (uid=${resolutionContext.principal})
             ]]>
         </dc:FilterTemplate>
+        <dc:LDAPProperty name="name1" value="${jndi.property1}"/>
+        <dc:LDAPProperty name="name2" value="${jndi.property2}"/>
         <dc:StartTLSTrustCredential xsi:type="security:X509Inline" xmlns:security="urn:mace:shibboleth:2.0:security" id="LDAPtoIdPCredential">
             <security:Certificate>
               MIICATCCAWoCCQCZy4ovDlQTvDANBgkqhkiG9w0BAQUFADBFMRMwEQYKCZImiZPy
@@ -45,13 +47,10 @@
             validatePeriodically="${connectionPool.validatePeriodically}"
             validateTimerPeriod="${connectionPool.validatePeriod}"
             validateDN="${connectionPool.validator.baseDn}"
-            validateFilter="${connectionPool.validator.filter}">
-        </dc:ConnectionPool>
+            validateFilter="${connectionPool.validator.filter}"/>
         <dc:ResultCache
             elementTimeToLive="${cache.TTL}"
             maximumCachedElements="${cache.maxSize}"/>
-        <dc:LDAPProperty name="name1" value="${jndi.property1}"/>
-        <dc:LDAPProperty name="name2" value="${jndi.property2}"/>
     </resolver:DataConnector>
     
 </resolver:AttributeResolver>