Author: bdaw Date: 2009-09-21 11:56:43 -0400 (Mon, 21 Sep 2009) New Revision: 803 Modified: idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java idm/trunk/parent/pom.xml Log: - fix sort without LDAP control issue - add up to 4 custom test jdbc providers Modified: idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-09-21 15:15:13 UTC (rev 802) +++ idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-09-21 15:56:43 UTC (rev 803) @@ -685,6 +685,12 @@ } } + // In case sort extension is not supported + if (criteria != null && criteria.isSorted() && !configuration.isSortExtensionSupported()) + { + sortByName(objects, criteria.isAscending()); + } + if (criteria != null && criteria.isPaged()) { objects = (LinkedList)cutPageFromResults(objects, criteria); Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java 2009-09-21 15:15:13 UTC (rev 802) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java 2009-09-21 15:56:43 UTC (rev 803) @@ -22,27 +22,13 @@ package org.jboss.identity.idm.impl.api; -import junit.framework.TestCase; -import org.jboss.identity.idm.impl.HibernateTestSupport; -import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.api.IdentitySessionFactory; import org.jboss.identity.idm.impl.LDAPTestPOJO; import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -import org.jboss.identity.idm.opends.OpenDSService; import org.jboss.unit.api.pojo.annotations.Create; import org.jboss.unit.api.pojo.annotations.Destroy; import org.jboss.unit.api.pojo.annotations.Test; -import org.opends.server.tools.LDAPModify; -import javax.naming.directory.DirContext; -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.Binding; -import javax.naming.ldap.InitialLdapContext; -import java.util.Hashtable; -import java.io.File; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/parent/pom.xml =================================================================== --- idm/trunk/parent/pom.xml 2009-09-21 15:15:13 UTC (rev 802) +++ idm/trunk/parent/pom.xml 2009-09-21 15:56:43 UTC (rev 803) @@ -105,6 +105,30 @@ </dependency> </dependencies> </profile> + <profile> + <id>provided-jdbc-driver3</id> + <dependencies> + <dependency> + <groupId>privided</groupId> + <artifactId>jdbc-driver3</artifactId> + <version>NA</version> + <scope>system</scope> + <systemPath>${provided.jdbc.driver.path3}</systemPath> + </dependency> + </dependencies> + </profile> + <profile> + <id>provided-jdbc-driver4</id> + <dependencies> + <dependency> + <groupId>privided</groupId> + <artifactId>jdbc-driver4</artifactId> + <version>NA</version> + <scope>system</scope> + <systemPath>${provided.jdbc.driver.path4}</systemPath> + </dependency> + </dependencies> + </profile> </profiles> <repositories>