Index: lams_admin/.classpath
===================================================================
diff -u -r0e43e21301c93315b5e7959c30e892f93411787f -r72b80f6befe04cb189ab1e682082671d109a90b9
--- lams_admin/.classpath	(.../.classpath)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
+++ lams_admin/.classpath	(.../.classpath)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
@@ -6,5 +6,8 @@
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams.jar"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<classpathentry kind="lib" path="/usr/local/jboss-4.0.2/server/default/lib/javax.servlet.jar"/>
+	<classpathentry kind="lib" path="/usr/local/jboss-4.0.2/server/default/lib/javax.servlet.jsp.jar"/>
+	<classpathentry kind="lib" path="/usr/local/jboss-4.0.2/server/default/lib/jboss-j2ee.jar"/>
 	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r72b80f6befe04cb189ab1e682082671d109a90b9
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
@@ -116,8 +116,8 @@
 </form-bean>
 
 <form-bean name="ConfigForm" type="org.apache.struts.action.DynaActionForm">
-	<form-property name="cKey" type="java.lang.String[]" />
-	<form-property name="cValue" type="java.lang.String[]" />
+	<form-property name="key" type="java.lang.String[]" />
+	<form-property name="value" type="java.lang.String[]" />
 	<form-property name="method" type="java.lang.String" />
 </form-bean>
 
@@ -148,6 +148,11 @@
 <form-bean name="CleanupForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="numDays" type="java.lang.Integer" />
 </form-bean>
+
+<form-bean
+      name="ImportGroupsForm"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
+    />
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -282,6 +287,21 @@
         path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="import"
+        path="/importexcel.do"
+        redirect="false"
+      />
+      <forward
+        name="status"
+        path="/import/status.jsp"
+        redirect="false"
+      />
+      <forward
+        name="results"
+        path="/importuserresult.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/cleanup"
@@ -298,7 +318,7 @@
       />
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
@@ -378,6 +398,11 @@
         path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="importv1"
+        path="/importv1.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/userroles"
@@ -530,6 +555,25 @@
       />
     </action>
     <action
+      path="/importgroups"
+      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
+      name="ImportGroupsForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importGroups"
+        path=".importGroups"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/joblist"
       type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
       unknown="false"
@@ -542,6 +586,18 @@
       />
     </action>
     <action
+      path="/importuserresult"
+      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importresult"
+        path=".importresult"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/disabledmanage"
       type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
       unknown="false"
@@ -589,6 +645,23 @@
       />
     </action>
     <action
+      path="/ldap"
+      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="ldap"
+        path=".ldap"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/toolcontentlist"
       type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
       unknown="false"
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r72b80f6befe04cb189ab1e682082671d109a90b9
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
@@ -17,6 +17,7 @@
 		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/integrationContext.xml
 		classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml
+		classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
 	</param-value>
 </context-param>
 
@@ -66,10 +67,6 @@
 	<filter-name>HibernateFilter</filter-name>
 	<url-pattern>/*</url-pattern>
 </filter-mapping>
-<filter-mapping>
-	<filter-name>HibernateFilter</filter-name>
-	<url-pattern>*.jsp</url-pattern>
-</filter-mapping>
 
   <listener>
 	<listener-class>
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -rd32ad084559609b1bf57bfe096a7e8634bf0f265 -r72b80f6befe04cb189ab1e682082671d109a90b9
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision d32ad084559609b1bf57bfe096a7e8634bf0f265)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
@@ -1,11 +1,20 @@
 <%@ include file="/taglibs.jsp"%>
 
-<script language="javascript" type="text/JavaScript">
-function toggleCheckboxes(){
-	<logic:iterate id="user" name="userlist" indexId="index" >
-	document.UserOrgForm.userIds[<bean:write name="index" />].checked=document.UserOrgForm.allCheckboxes.checked;
-	</logic:iterate>
-}
+<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-1.1.4.pack.js"></script>
+<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
+<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
+<script>
+	<!--
+	jQuery(document).ready(function() {
+		jQuery("table").tablesorter({widthFixed:true, sortList:[[0,0]]}).tablesorterPager({container: jQuery("#pager")});
+	});
+	
+	function toggleCheckboxes(){
+		<logic:iterate id="user" name="userlist" indexId="index" >
+		document.UserOrgForm.userIds[<bean:write name="index" />].checked=document.UserOrgForm.allCheckboxes.checked;
+		</logic:iterate>
+	}
+	//-->
 </script>
 
 <html-el:form action="/userorgsave.do" method="post">
@@ -32,15 +41,19 @@
 </logic:equal>
 
 <div align="center"><html-el:errors/></div>
+<input type="checkbox" name="allCheckboxes" onclick="toggleCheckboxes();" onkeyup="toggleCheckboxes();" />
+check/uncheck all boxes
 <table class="alternative-color" width=100% cellspacing="0">
+<thead>
 <tr>
 	<th><fmt:message key="admin.user.login"/></th>
 	<th><fmt:message key="admin.user.title"/></th>
 	<th><fmt:message key="admin.user.first_name"/></th>
 	<th><fmt:message key="admin.user.last_name"/></th>
-	<th><input type="checkbox" name="allCheckboxes" onclick="toggleCheckboxes();" onkeyup="toggleCheckboxes();" /></th>
+	<th></th>
 </tr>
-
+</thead>
+<tbody>
 <logic:iterate id="user" name="userlist">
 	<tr>
 		<td>
@@ -60,14 +73,34 @@
 		</td>		
 	</tr>
 </logic:iterate>
+</tbody>
+</table>
 
+<table>
 <tr>
-	<td colspan=5 class="align-right">
+	<td class="align-right">
 		<html-el:submit styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
 		<html-el:reset styleClass="button"><fmt:message key="admin.reset"/></html-el:reset>
 		<html-el:cancel styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
 	</td>
 </tr>
-
 </table>
-</html-el:form>
\ No newline at end of file
+</html-el:form>
+
+<div id="pager" class="pager">
+	<form>
+		<img src="<lams:LAMSURL/>/images/first.png" class="first"/>
+		<img src="<lams:LAMSURL/>/images/prev.png" class="prev">
+		<input type="text" class="pagedisplay" disabled="disabled"/>
+		<img src="<lams:LAMSURL/>/images/next.png" class="next">
+		<img src="<lams:LAMSURL/>/images/last.png" class="last">
+		<select class="pagesize">
+			<option selected="selected"  value="10">10&nbsp;&nbsp;</option>
+			<option value="20">20</option>
+			<option value="30">30</option>
+			<option  value="40">40</option>
+			<option  value="50">50</option>
+			<option  value="100">100</option>
+		</select>
+	</form>
+</div>
\ No newline at end of file
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -rcd1b03965985c961c44761c055955914e8736525 -r72b80f6befe04cb189ab1e682082671d109a90b9
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision cd1b03965985c961c44761c055955914e8736525)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
@@ -60,10 +60,10 @@
 		<input class="button" type="button" value='<fmt:message key="admin.reset"/>' onclick="resetFields();" />
 	</td>
 </tr>
-
+<%@ page import="java.util.List" %>
 <logic:notEmpty name="userList">
 	<tr>
-		<td colspan=5><c:out value="${fullSize}"/> users found.</td>
+		<td colspan=5><c:out value="${fullSize}"/> users found.<%= ((List)request.getAttribute("userList")).size() %></td>
 	</tr>
 	<c:forEach var="user" items="${userList}" begin="${start}" end="${start+resultsSection-1}" varStatus="status">
 		<tr>
Index: lams_central/web/includes/javascript/jquery.tablesorter.pager.js
===================================================================
diff -u -rbfb15c51d80f7f35cbfd695d39f54a9799b6ea4b -r72b80f6befe04cb189ab1e682082671d109a90b9
--- lams_central/web/includes/javascript/jquery.tablesorter.pager.js	(.../jquery.tablesorter.pager.js)	(revision bfb15c51d80f7f35cbfd695d39f54a9799b6ea4b)
+++ lams_central/web/includes/javascript/jquery.tablesorter.pager.js	(.../jquery.tablesorter.pager.js)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
@@ -178,7 +178,11 @@
 					$(config.cssPageDisplay,pager).change(function() {
 						var inputPage = $(this).val();
 						inputPage = inputPage.substr(0, inputPage.indexOf(config.seperator));
-						config.page = inputPage-1;
+						if(isNaN(inputPage)) {
+							config.page = 0;
+						} else {
+							config.page = inputPage-1;
+						}
 						moveToPage(table);
 						return false;
 					});