Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.27 -r1.28
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	2 Jun 2006 04:07:48 -0000	1.27
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	5 Jun 2006 07:05:42 -0000	1.28
@@ -32,6 +32,8 @@
 				<value>org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml</value>
 				<value>org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml</value>
 				<value>org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Country.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Language.hbm.xml</value>
 				<value>org/lamsfoundation/lams/usermanagement/Role.hbm.xml</value>
 				<value>org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml</value>
 				<value>org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml</value>
@@ -81,6 +83,7 @@
 	>
 		<property name="userDAO"><ref local="userDAO"/></property>
 		<property name="roleDAO"><ref local="roleDAO"/></property>
+		<property name="localeDAO"><ref local="localeDAO"/></property>
 		<property name="organisationDAO"><ref local="organisationDAO"/></property>
 		<property name="organisationStateDAO"><ref local="organisationStateDAO"/></property>
 		<property name="organisationTypeDAO"><ref local="organisationTypeDAO"/></property>
@@ -224,6 +227,10 @@
 	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
+
+	<bean id="localeDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.LocaleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
 	
 	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/ILocaleDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/Attic/ILocaleDAO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/ILocaleDAO.java	5 Jun 2006 07:05:42 -0000	1.1
@@ -0,0 +1,44 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.usermanagement.dao;
+
+import java.util.List;
+
+/**
+ * @version
+ *
+ * <p>
+ * <a href="ILocaleDAO.java.html"><i>View Source</i></a>
+ * </p>
+ *
+ * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
+ *
+ * Created at 16:46:18 on 2006-6-5
+ */
+public interface ILocaleDAO {
+	
+	public List getAllLanguages();
+	
+	public List getAllCountries();
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/LocaleDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/LocaleDAO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/LocaleDAO.java	5 Jun 2006 07:05:42 -0000	1.1
@@ -0,0 +1,57 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.usermanagement.dao.hibernate;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.usermanagement.dao.ILocaleDAO;
+
+/**
+ * @version
+ *
+ * <p>
+ * <a href="LocaleDAO.java.html"><i>View Source</i></a>
+ * </p>
+ *
+ * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
+ *
+ * Created at 16:49:57 on 2006-6-5
+ */
+public class LocaleDAO extends BaseDAO implements ILocaleDAO {
+
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.usermanagement.dao.ILocaleDAO#getAllLanguages()
+	 */
+	public List getAllLanguages() {
+		return getHibernateTemplate().find("from Language");
+	}
+
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.usermanagement.dao.ILocaleDAO#getAllCountries()
+	 */
+	public List getAllCountries() {
+		return getHibernateTemplate().find("from Country");
+	}
+
+}