Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/util/Attic/ExcelUserImportFileParser.java,v
diff -u -r1.7 -r1.8
--- lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java	20 Oct 2006 02:39:38 -0000	1.7
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java	26 Oct 2006 00:29:06 -0000	1.8
@@ -36,6 +36,8 @@
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.admin.AdminConstants;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
@@ -47,6 +49,7 @@
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.HashUtil;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * TODO Add description here
@@ -64,6 +67,7 @@
 	private static Logger log = Logger.getLogger(ExcelUserImportFileParser.class);
 	private static IUserManagementService service;
 	private static MessageService messageService;
+	private static IAuditService auditService;
 
 	// spreadsheet column indexes
 	private static final short LOGIN = 0;
@@ -95,9 +99,10 @@
 	private boolean emptyRow;
 	private boolean hasError;
 	
-	public ExcelUserImportFileParser(IUserManagementService service, MessageService messageService){
+	public ExcelUserImportFileParser(IUserManagementService service, MessageService messageService, IAuditService auditService){
 		this.service = service;
 		this.messageService = messageService;
+		this.auditService = auditService;
 	}
 
 	/** 
@@ -144,6 +149,7 @@
 						log.debug("org: "+org+" roles: "+roles);
 						if (org!=null && roles!=null) {
 							service.save(user);
+							writeAuditLog(user);
 							service.setRolesForUserOrganisation(user, org, roles);
 							//rowResult.add(org.getOrganisationId().toString());  // for stat summary in save action
 							log.debug("saved user: "+user.getUserId()+" with roles: "+roles);
@@ -161,6 +167,7 @@
 						}
 					} else {
 						service.save(user);
+						writeAuditLog(user);
 						//rowResult.add(String.valueOf(0));  // for stat summary in save action
 						log.debug("saved user: "+user.getUserId());
 					}
@@ -394,4 +401,12 @@
 		}
 	}
 	
+	private void writeAuditLog(User user) {
+		String[] args = new String[2];
+		args[0] = user.getLogin()+"("+user.getUserId()+")";
+		args[1] = user.getFullName();
+		String message = messageService.getMessage("audit.user.create", args);
+		auditService.log(AdminConstants.MODULE_NAME, message);
+	}
+	
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java,v
diff -u -r1.2 -r1.3
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	25 Oct 2006 01:43:56 -0000	1.2
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	26 Oct 2006 00:29:13 -0000	1.3
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.admin.util.ExcelUserImportFileParser;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * @author jliew
@@ -69,9 +70,10 @@
 		
 		IUserManagementService service = AdminServiceProxy.getService(getServlet().getServletContext());
 		MessageService messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+		IAuditService auditService = AdminServiceProxy.getAuditService(getServlet().getServletContext());
 		//Organisation org = (Organisation)service.findById(Organisation.class, orgId);
 		
-		ExcelUserImportFileParser parser = new ExcelUserImportFileParser(service, messageService);
+		ExcelUserImportFileParser parser = new ExcelUserImportFileParser(service, messageService, auditService);
 		List results = parser.parseSpreadsheet(file);
 		
 		int successful = 0;