Index: lams_admin/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/web.xml,v
diff -u -r1.20 -r1.20.2.1
--- lams_admin/web/WEB-INF/web.xml	9 May 2007 01:02:41 -0000	1.20
+++ lams_admin/web/WEB-INF/web.xml	20 Sep 2007 02:53:59 -0000	1.20.2.1
@@ -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>
 
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.20 -r1.20.2.1
--- lams_admin/web/WEB-INF/struts/struts-config.xml	9 May 2007 01:02:41 -0000	1.20
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	20 Sep 2007 02:53:58 -0000	1.20.2.1
@@ -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,11 @@
         path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="import"
+        path="/importexcel.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/cleanup"
@@ -298,7 +308,7 @@
       />
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
@@ -378,6 +388,11 @@
         path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="importv1"
+        path="/importv1.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/userroles"
@@ -530,6 +545,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"
@@ -589,6 +623,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_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v
diff -u -r1.6.4.1.2.1 -r1.6.4.1.2.2
--- lams_common/db/sql/insert_lams_unix_config_data.sql	18 Sep 2007 07:20:55 -0000	1.6.4.1.2.1
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	20 Sep 2007 02:53:58 -0000	1.6.4.1.2.2
@@ -44,7 +44,15 @@
 insert into lams_configuration (config_key, config_value) values ('LDAPFNameAttr','givenName');
 insert into lams_configuration (config_key, config_value) values ('LDAPLNameAttr','sn');
 insert into lams_configuration (config_key, config_value) values ('LDAPEmailAttr','mail');
-insert into lams_configuration (config_key, config_value) values ('LDAPPhoneAttr','telephoneNumber');
+insert into lams_configuration (config_key, config_value) values ('LDAPAddr1Attr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPAddr2Attr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPAddr3Attr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPCityAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPStateAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPPostcodeAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPCountryAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPDayPhoneAttr','telephoneNumber');
+insert into lams_configuration (config_key, config_value) values ('LDAPEveningPhoneAttr','');
 insert into lams_configuration (config_key, config_value) values ('LDAPFaxAttr','facsimileTelephoneNumber');
 insert into lams_configuration (config_key, config_value) values ('LDAPMobileAttr','mobile');
 insert into lams_configuration (config_key, config_value) values ('LDAPOrgAttr','deetITSchoolCode');
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v
diff -u -r1.3.4.1.2.1 -r1.3.4.1.2.2
--- lams_common/db/sql/insert_lams_windows_config_data.sql	18 Sep 2007 07:20:55 -0000	1.3.4.1.2.1
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	20 Sep 2007 02:53:58 -0000	1.3.4.1.2.2
@@ -44,7 +44,15 @@
 insert into lams_configuration (config_key, config_value) values ('LDAPFNameAttr','givenName');
 insert into lams_configuration (config_key, config_value) values ('LDAPLNameAttr','sn');
 insert into lams_configuration (config_key, config_value) values ('LDAPEmailAttr','mail');
-insert into lams_configuration (config_key, config_value) values ('LDAPPhoneAttr','telephoneNumber');
+insert into lams_configuration (config_key, config_value) values ('LDAPAddr1Attr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPAddr2Attr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPAddr3Attr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPCityAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPStateAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPPostcodeAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPCountryAttr','');
+insert into lams_configuration (config_key, config_value) values ('LDAPDayPhoneAttr','telephoneNumber');
+insert into lams_configuration (config_key, config_value) values ('LDAPEveningPhoneAttr','');
 insert into lams_configuration (config_key, config_value) values ('LDAPFaxAttr','facsimileTelephoneNumber');
 insert into lams_configuration (config_key, config_value) values ('LDAPMobileAttr','mobile');
 insert into lams_configuration (config_key, config_value) values ('LDAPOrgAttr','deetITSchoolCode');
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/db/sql/updatescripts/alter_205_ldap.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_common/db/sql/updatescripts/alter_2_0_5_ldap.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	18 Sep 2007 07:20:54 -0000	1.3.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	20 Sep 2007 02:53:58 -0000	1.3.2.2
@@ -76,7 +76,15 @@
 		user.setFirstName(map.get("fname"));
 		user.setLastName(map.get("lname"));
 		user.setEmail(map.get("email"));
-		user.setDayPhone(map.get("phone"));
+		user.setAddressLine1(map.get("address1"));
+		user.setAddressLine2(map.get("address2"));
+		user.setAddressLine3(map.get("address3"));
+		user.setCity(map.get("city"));
+		user.setState(map.get("state"));
+		user.setPostcode(map.get("postcode"));
+		user.setCountry(map.get("country"));
+		user.setDayPhone(map.get("dayphone"));
+		user.setEveningPhone(map.get("eveningphone"));
 		user.setFax(map.get("fax"));
 		user.setMobilePhone(map.get("mobile"));
 		getService().save(user);
@@ -98,7 +106,15 @@
 				user.setFirstName(map.get("fname"));
 				user.setLastName(map.get("lname"));
 				user.setEmail(map.get("email"));
-				user.setDayPhone(map.get("phone"));
+				user.setAddressLine1(map.get("address1"));
+				user.setAddressLine2(map.get("address2"));
+				user.setAddressLine3(map.get("address3"));
+				user.setCity(map.get("city"));
+				user.setState(map.get("state"));
+				user.setPostcode(map.get("postcode"));
+				user.setCountry(map.get("country"));
+				user.setDayPhone(map.get("dayphone"));
+				user.setEveningPhone(map.get("eveningphone"));
 				user.setFax(map.get("fax"));
 				user.setMobilePhone(map.get("mobile"));
 				user.setAuthenticationMethod((AuthenticationMethod)service
@@ -127,7 +143,15 @@
 			map.put("fname", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_FIRST_NAME_ATTR))));
 			map.put("lname", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_LAST_NAME_ATTR))));
 			map.put("email", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_EMAIL_ATTR))));
-			map.put("phone", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_PHONE_ATTR))));
+			map.put("address1", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_ADDR1_ATTR))));
+			map.put("address2", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_ADDR2_ATTR))));
+			map.put("address3", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_ADDR3_ATTR))));
+			map.put("city", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_CITY_ATTR))));
+			map.put("state", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_STATE_ATTR))));
+			map.put("postcode", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_POSTCODE_ATTR))));
+			map.put("country", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_COUNTRY_ATTR))));
+			map.put("dayphone", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_DAY_PHONE_ATTR))));
+			map.put("eveningphone", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_EVENING_PHONE_ATTR))));
 			map.put("fax", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_FAX_ATTR))));
 			map.put("mobile", getSingleAttributeString(attrs.get(Configuration.get(ConfigurationKeys.LDAP_MOBILE_ATTR))));
 		} catch (Exception e) {
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v
diff -u -r1.24.4.1 -r1.24.4.2
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	18 Sep 2007 07:20:50 -0000	1.24.4.1
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	20 Sep 2007 02:53:58 -0000	1.24.4.2
@@ -159,8 +159,24 @@
 	
 	public static String LDAP_EMAIL_ATTR = "LDAPEmailAttr";
 	
-	public static String LDAP_PHONE_ATTR = "LDAPPhoneAttr";
+	public static String LDAP_ADDR1_ATTR = "LDAPAddr1Attr";
 	
+	public static String LDAP_ADDR2_ATTR = "LDAPAddr2Attr";
+	
+	public static String LDAP_ADDR3_ATTR = "LDAPAddr3Attr";
+	
+	public static String LDAP_CITY_ATTR = "LDAPCityAttr";
+	
+	public static String LDAP_STATE_ATTR = "LDAPStateAttr";
+	
+	public static String LDAP_POSTCODE_ATTR = "LDAPPostcodeAttr";
+	
+	public static String LDAP_COUNTRY_ATTR = "LDAPCountryAttr";
+	
+	public static String LDAP_DAY_PHONE_ATTR = "LDAPDayPhoneAttr";
+	
+	public static String LDAP_EVENING_PHONE_ATTR = "LDAPEveningPhoneAttr";
+	
 	public static String LDAP_FAX_ATTR = "LDAPFaxAttr";
 	
 	public static String LDAP_MOBILE_ATTR = "LDAPMobileAttr";