[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src: main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Apr 23 01:26:18 2013
New Revision: 4420

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4420&view=rev
Log:
Fix v2 LDAP property parsing.
Update unit test.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/TestLdapDataConnectorBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2.xml

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorBeanDefinitionParser.java?rev=4420&r1=4419&r2=4420&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorBeanDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorBeanDefinitionParser.java Tue Apr 23 01:26:18 2013
@@ -180,10 +180,10 @@
         }
 
         final Map<String, Object> props = new HashMap<String, Object>();
-        final Element propertyElement =
-                getFirstChildElement(config, new QName(DataConnectorNamespaceHandler.NAMESPACE, "LDAPProperty"));
-        final List<Element> elements = ElementSupport.getChildElements(propertyElement);
-        for (Element e : elements) {
+        final List<Element> propertyElements =
+                ElementSupport.getChildElements(config, new QName(DataConnectorNamespaceHandler.NAMESPACE,
+                        "LDAPProperty"));
+        for (Element e : propertyElements) {
             props.put(AttributeSupport.getAttributeValue(e, new QName("name")),
                     AttributeSupport.getAttributeValue(e, new QName("value")));
         }

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/TestLdapDataConnectorBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/TestLdapDataConnectorBeanDefinitionParser.java?rev=4420&r1=4419&r2=4420&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/TestLdapDataConnectorBeanDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/TestLdapDataConnectorBeanDefinitionParser.java Tue Apr 23 01:26:18 2013
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.attribute.resolver.spring.dc.ldap;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import net.shibboleth.idp.attribute.Attribute;
@@ -37,6 +38,7 @@
 import org.ldaptive.pool.PoolConfig;
 import org.ldaptive.pool.PooledConnectionFactory;
 import org.ldaptive.pool.SearchValidator;
+import org.ldaptive.provider.ProviderConfig;
 import org.springframework.context.support.GenericApplicationContext;
 import org.testng.Assert;
 import org.testng.AssertJUnit;
@@ -142,6 +144,13 @@
         AssertJUnit.assertEquals("cn=Directory Manager", connInitializer.getBindDn());
         AssertJUnit.assertEquals("password", connInitializer.getBindCredential().getString());
 
+        final Map<String, Object> providerProps = new HashMap<String, Object>();
+        providerProps.put("name1", "value1");
+        providerProps.put("name2", "value2");
+        ProviderConfig providerConfig = connPool.getConnectionFactory().getProvider().getProviderConfig();
+        AssertJUnit.assertNotNull(providerConfig);
+        AssertJUnit.assertEquals(providerProps, providerConfig.getProperties());
+
         SearchExecutor searchExecutor = dataConnector.getSearchExecutor();
         AssertJUnit.assertNotNull(searchExecutor);
         AssertJUnit.assertEquals("ou=people,dc=shibboleth,dc=net", searchExecutor.getBaseDn());

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.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-spring.xml?rev=4420&r1=4419&r2=4420&view=diff
==============================================================================

[... 39 lines stripped ...]