Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v
diff -u -r1.16 -r1.17
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	2 Jun 2006 06:03:04 -0000	1.16
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	5 Jun 2006 07:06:12 -0000	1.17
@@ -37,6 +37,7 @@
 import org.lamsfoundation.lams.usermanagement.Workspace;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO;
+import org.lamsfoundation.lams.usermanagement.dao.ILocaleDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO;
@@ -85,6 +86,14 @@
 	public void setRoleDAO(IRoleDAO roleDao);
 	
     /**
+     * Set ILocaleDAO
+     *
+     * @param localeDao 
+     */
+	public void setLocaleDAO(ILocaleDAO localeDao);
+
+	
+    /**
      * Set IOrganisationDAO
      *
      * @param organisationDao 
@@ -446,5 +455,9 @@
 	 * TODO modify/remove when the index page is implemented properly
 	 */
 	public List getLearnerLessonsFromOrganisation(Integer userID, Integer organisationID);
+	
+	public List getAllCountries();
+	
+	public List getAllLanguages();
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.21 -r1.22
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	2 Jun 2006 06:57:28 -0000	1.21
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	5 Jun 2006 07:06:12 -0000	1.22
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.usermanagement.Workspace;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO;
+import org.lamsfoundation.lams.usermanagement.dao.ILocaleDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO;
@@ -77,6 +78,8 @@
 	private IUserDAO userDAO;
 
 	private IRoleDAO roleDAO;
+	
+	private ILocaleDAO localeDAO;
 
 	private IOrganisationDAO organisationDAO;
 
@@ -676,4 +679,15 @@
 	public OrganisationType getOrganisationTypeById(Integer typeId) {
 		return organisationTypeDAO.getOrganisationTypeById(typeId);
 	}
+
+	public void setLocaleDAO(ILocaleDAO localeDao) {
+	}
+
+	public List getAllCountries() {
+		return localeDAO.getAllCountries();
+	}
+
+	public List getAllLanguages() {
+		return localeDAO.getAllLanguages();
+	}
 }