Index: component/src/webapp/WEB-INF/jldap-beans.xml
===================================================================
--- component/src/webapp/WEB-INF/jldap-beans.xml	(.../trunk)	(revision 132518)
+++ component/src/webapp/WEB-INF/jldap-beans.xml	(.../branches/SAK-21717)	(revision 132518)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
@@ -146,12 +147,19 @@
 			<value>10</value>
 		</property -->
 
-		<!-- Optional. Maximum number of users to search for
-		     Defaults to DEFAULT_MAX_OBJECTS_TO_QUERY = 200
-		<property name="maxObjectsToQueryFor">
+		<!-- Optional. Size of batch when loading multiple users at once.
+		     Defaults to DEFAULT_BATCH_SIZE = 200
+		<property name="batchSize">
 		  <value>200</value>
 		</property>-->
-		
+
+		<!-- Optional. Maximum number of users to search for. This allows you to limit the
+		     maximum number of results the LDAP client will process.
+		     Defaults to DEFAULT_MAX_RESULT_SIZE = 1000
+		<property name="maxResultSize">
+		  <value>1000</value>
+		</property>-->
+
 		<!-- Optional. Defaults to an instance of 
 		edu.amc.sakai.user.SimpleLdapAttributeMapper -->
 		<property name="ldapAttributeMapper">
@@ -199,25 +207,25 @@
     (the default LdapAttributeMapper implementation). -->
 	<bean id="edu.amc.sakai.user.LdapAttributeMapper"
 			class="edu.amc.sakai.user.SimpleLdapAttributeMapper"
-			init-method="init"
-			singleton="true">
-			
+		  init-method="init"
+		  singleton="true">
+
 		<!-- A typical set of attribute mappings. Keys are logical
 		names expected by the application. Values are physical LDAP
 		attribute names. If not specified or empty, defaults to
 		AttributeMappingConstants.DEFAULT_ATTR_MAPPINGS. -->
 		<!-- property name="attributeMappings">
 			<map>
-				<entry key="login"><value>cn</value></entry>         
-				<entry key="firstName"><value>givenName</value></entry> 
+				<entry key="login"><value>cn</value></entry>
+				<entry key="firstName"><value>givenName</value></entry>
 				<entry key="preferredFirstName"><value>preferredName</value></entry>
-				<entry key="lastName"><value>sn</value></entry> 
-				<entry key="email"><value>email</value></entry>  
-				<entry key="groupMembership"><value>groupMembership</value></entry>   
-				<entry key="jpegPhoto"><value>jpegPhoto</value></entry>   
+				<entry key="lastName"><value>sn</value></entry>
+				<entry key="email"><value>email</value></entry>
+				<entry key="groupMembership"><value>groupMembership</value></entry>
+				<entry key="jpegPhoto"><value>jpegPhoto</value></entry>
 			</map>
 		</property -->
-		
+
 		<!-- Several options for calculating Sakai user types based
 		on LDAP attributes. Defaults to an instance of EmptyStringUserTypeMapper -->
 		<property name="userTypeMapper">
@@ -227,7 +235,7 @@
 			<!-- ref bean="edu.amc.sakai.user.EntryContainerRdnToUserTypeMapper" /-->
 			<!-- ref bean="edu.amc.sakai.user.StringUserTypeMapper" /-->
 		</property>
-		
+
 	</bean>
 	
 	
Index: jldap/src/java/edu/amc/sakai/user/LdapConnectionManagerConfig.java
===================================================================
--- jldap/src/java/edu/amc/sakai/user/LdapConnectionManagerConfig.java	(.../trunk)	(revision 132518)
+++ jldap/src/java/edu/amc/sakai/user/LdapConnectionManagerConfig.java	(.../branches/SAK-21717)	(revision 132518)
@@ -203,13 +203,34 @@
 	public void setPoolMaxConns(int maxConns);
 	
 	/**
-	 * @return The maximum number of results that can be returned in our query
+	 * @return The maximum number of details to lookup in one query.
+	 * @deprecated {@link #getBatchSize()}
 	 */
 	public int getMaxObjectsToQueryFor();
 	
 	/**
-	 * @param maxResultsFromOneQuery The maximum number of results that can be returned in our query 
+	 * @param maxObjectsToQueryFor The maximum number deatils to lookup in one query.
+	 * @deprecated {@link #setBatchSize(int)}
 	 */
 	public void setMaxObjectsToQueryFor(int maxObjectsToQueryFor);
-	
+
+	/**
+	 * @return The maximum number of details to lookup in one query.
+	 */
+	public int getBatchSize();
+
+	/**
+	 * @param batchSize The maximum number deatils to lookup in one query.
+	 */
+	public void setBatchSize(int batchSize);
+
+	/**
+	 * @return The maximum number of results to ever get back from LDAP.
+	 */
+	public int getMaxResultSize();
+
+	/**
+	 * @param maxResultSize The maximum number of results to ever get back from LDAP.
+	 */
+	public void setMaxResultSize(int maxResultSize);
 }
Index: jldap/src/java/edu/amc/sakai/user/JLDAPDirectoryProvider.java
===================================================================
--- jldap/src/java/edu/amc/sakai/user/JLDAPDirectoryProvider.java	(.../trunk)	(revision 132518)
+++ jldap/src/java/edu/amc/sakai/user/JLDAPDirectoryProvider.java	(.../branches/SAK-21717)	(revision 132518)
@@ -85,9 +85,12 @@
 
 	/** Default LDAP maximum number of connections in the pool */
 	public static final int DEFAULT_POOL_MAX_CONNS = 10;
-	
+
+	/** Default LDAP maximum number of objects in a result */
+	public static final int DEFAULT_MAX_RESULT_SIZE = 1000;
+
 	/** Default LDAP maximum number of objects to query for */
-	public static final int DEFAULT_MAX_OBJECTS_TO_QUERY = 200;
+	public static final int DEFAULT_BATCH_SIZE = 200;
 
 	public static final boolean DEFAULT_CASE_SENSITIVE_CACHE_KEYS = false;
 	
@@ -130,10 +133,13 @@
 
 	/** Maximum number of physical connections in the pool */
 	private int poolMaxConns = DEFAULT_POOL_MAX_CONNS;
-	
+
 	/** Maximum number of results from one LDAP query */
-	private int maxObjectsToQueryFor = DEFAULT_MAX_OBJECTS_TO_QUERY;
+	private int maxResultSize = DEFAULT_MAX_RESULT_SIZE;
 
+	/** The size of each batch to load from LDAP when loading multiple users. */
+	private int batchSize = DEFAULT_BATCH_SIZE;
+
 	/** Socket factory for secure connections. Only relevant if
 	 * {@link #secureConnection} is true. Defaults to a new instance
 	 * of {@link LDAPJSSESecureSocketFactory}.
@@ -622,10 +628,11 @@
 		boolean abortiveSearch = false;
 		int maxQuerySize = getMaxObjectsToQueryFor();
 		UserEdit userEdit = null;
-		
+		// This hold batches of users to search for in LDAP.
 		HashMap<String, UserEdit> usersToSearchInLDAP = new HashMap<String, UserEdit>();
 		List<UserEdit> usersToRemove = new ArrayList<UserEdit>();
 		try {
+			// This is how many people we have in the usersToSearchInLDAP map.
 			int cnt = 0;
 			for ( Iterator<UserEdit> userEdits = users.iterator(); userEdits.hasNext(); ) {
 				userEdit = (UserEdit) userEdits.next();
@@ -654,7 +661,7 @@
 					}
 					
 					String filter = ldapAttributeMapper.getManyUsersInOneSearch(usersToSearchInLDAP.keySet());
-					List<LdapUserData> ldapUsers = searchDirectory(filter, null, null, null, null, 0);
+					List<LdapUserData> ldapUsers = searchDirectory(filter, null, null, null, null, maxQuerySize);
 				
 					for (LdapUserData ldapUserData : ldapUsers) {
 						String ldapEid = ldapUserData.getEid();
@@ -927,7 +934,7 @@
 	 * @throws LDAPException if thrown by the search
 	 * @throws RuntimeExction wrapping any non-{@link LDAPException} {@link Exception}
 	 */
-	protected List<LdapUserData> searchDirectory(String filter, 
+	protected List<LdapUserData> searchDirectory(String filter,
 			LDAPConnection conn,
 			LdapEntryMapper mapper,
 			String[] searchResultPhysicalAttributeNames,
@@ -971,10 +978,9 @@
 
 			constraints.setTimeLimit(operationTimeout);
 			constraints.setReferralFollowing(followReferrals); // TODO: Do we want to make an explicit set optional?
+			// This is because we don't process the results until they are all in.
 			constraints.setBatchSize(0);
-			if ( maxResults > 0 ) {
-				constraints.setMaxResults(maxResults);
-			}
+			constraints.setMaxResults(maxResults);
 
 			if ( M_log.isDebugEnabled() ) {
 				M_log.debug("searchDirectory(): [baseDN = " + 
@@ -1007,7 +1013,7 @@
 			return mappedResults;
 
 		} catch (LDAPException e) {
-			throw e;
+				throw e;
 		} catch ( Exception e ) {
 			throw new RuntimeException("searchDirectory(): RuntimeException while executing search [baseDN = " + 
 					searchBaseDn + "][filter = " + filter + 
@@ -1423,17 +1429,47 @@
 	 * {@inheritDoc}
 	 */
 	public int getMaxObjectsToQueryFor() {
-		return maxObjectsToQueryFor;
+		return getBatchSize();
 	}
 	
 	/**
 	 * {@inheritDoc}
 	 */
 	public void setMaxObjectsToQueryFor (int maxObjectsToQueryFor) {
-		this.maxObjectsToQueryFor = maxObjectsToQueryFor;
+		M_log.info("maxObjectToQueryFor is deprecated please use " +
+				"batchSize@org.sakaiproject.user.api.UserDirectoryProvider instead");
+		setBatchSize(maxObjectsToQueryFor);
 	}
 
 	/**
+	 * {@inheritDoc}
+	 */
+	public int getBatchSize() {
+		return batchSize;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void setBatchSize(int batchSize) {
+		this.batchSize = batchSize;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public int getMaxResultSize() {
+		return maxResultSize;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void setMaxResultSize(int maxResultSize) {
+		this.maxResultSize = maxResultSize;
+	}
+
+	/**
 	 * Access the currently assigned {@link LdapConnectionManager} delegate. 
 	 * This delegate handles LDAPConnection allocation.
 	 * 
@@ -1603,7 +1639,7 @@
 	
 	/**
 	 * Access the configured search scope for all filters executed by
-	 * {@link #searchDirectory(String, LDAPConnection, LdapEntryMapper, String[], String, int)}. 
+	 * {@link #searchDirectory(String, LDAPConnection, LdapEntryMapper, String[], String, int)}.
 	 * int value corresponds to a constant in {@link LDAPConnection}:
 	 * SCOPE_BASE = 0, SCOPE_ONE = 1, SCOPE_SUB = 2. Defaults to
 	 * {@link #DEFAULT_SEARCH_SCOPE}.
@@ -1688,7 +1724,7 @@
 		
 		try {
 			//no limit to the number of search results, use the LDAP server's settings.
-			List<LdapUserData> ldapUsers = searchDirectory(filter, null, null, null, null, 0);
+			List<LdapUserData> ldapUsers = searchDirectory(filter, null, null, null, null, maxResultSize);
 			
 			for(LdapUserData ldapUserData: ldapUsers) {
 				
@@ -1723,7 +1759,7 @@
 		String filter = ldapAttributeMapper.getFindUserByEmailFilter(email);
 		List<User> users = new ArrayList<User>();
 		try {
-			List<LdapUserData> ldapUsers = searchDirectory(filter, null, null, null, null, 0);
+			List<LdapUserData> ldapUsers = searchDirectory(filter, null, null, null, null, maxResultSize);
 
 			for(LdapUserData ldapUserData: ldapUsers) {