Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r5e7a73abd66a04cf44dfac630322dcfa958a396f -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -5,7 +5,7 @@
 	<form-property name="name" type="java.lang.String" />
 	<form-property name="code" type="java.lang.String" />
 	<form-property name="description" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" initial="1"/>
+	<form-property name="localeId" type="java.lang.Integer" initial="1"/>
 	<form-property name="typeId" type="java.lang.Integer" />
 	<form-property name="stateId" type="java.lang.Integer" />
 	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
@@ -40,7 +40,7 @@
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" />
+	<form-property name="localeId" type="java.lang.Integer" />
 </form-bean>
 
 <form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/SpreadsheetService.java
===================================================================
diff -u -rc953075975816847a883924db83942f9b5cacbc1 -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/SpreadsheetService.java	(.../SpreadsheetService.java)	(revision c953075975816847a883924db83942f9b5cacbc1)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/SpreadsheetService.java	(.../SpreadsheetService.java)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -549,7 +549,7 @@
 			return service.getSupportedLocale(defaultLocale.substring(0, 2), defaultLocale.substring(3));
 		} else {
 			try {
-				return (SupportedLocale)service.findById(SupportedLocale.class, new Byte(localeId));
+				return (SupportedLocale)service.findById(SupportedLocale.class, new Integer(localeId));
 			} catch (Exception e) {
 				return null;
 			}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
===================================================================
diff -u -rb99dce44ff7b9066e9b1c0429667e44381dcf0ec -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision b99dce44ff7b9066e9b1c0429667e44381dcf0ec)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -114,7 +114,7 @@
 		if(errors.isEmpty()){
 			HttpSession ss = SessionManager.getSession();
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			SupportedLocale locale = (SupportedLocale)service.findById(SupportedLocale.class,(Byte)orgForm.get("localeId"));
+			SupportedLocale locale = (SupportedLocale)service.findById(SupportedLocale.class,(Integer)orgForm.get("localeId"));
 			OrganisationState state = (OrganisationState)service.findById(OrganisationState.class,(Integer)orgForm.get("stateId"));
 
 			if(orgId!=0){
@@ -216,7 +216,7 @@
 				message = messageService.getMessage(key, args);
 				auditService.log(AdminConstants.MODULE_NAME, message);
 			}*/
-			if(!org.getLocale().getLocaleId().equals((Byte)orgForm.get("localeId"))) {
+			if(!org.getLocale().getLocaleId().equals((Integer)orgForm.get("localeId"))) {
 				args[0] = "locale";
 				args[2] = org.getLocale().getDescription();
 				args[3] = newLocale.getDescription();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
===================================================================
diff -u -rcc4b09a8d3253fb96c75388bf5992a93322e00ff -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision cc4b09a8d3253fb96c75388bf5992a93322e00ff)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -91,7 +91,7 @@
 		log.debug("orgId: " + orgId);
 		Boolean edit = false;
 		Boolean passwordChanged = true;
-		SupportedLocale locale = (SupportedLocale)service.findById(SupportedLocale.class, (Byte)userForm.get("localeId"));
+		SupportedLocale locale = (SupportedLocale)service.findById(SupportedLocale.class, (Integer)userForm.get("localeId"));
 		log.debug("locale: " + locale);
 		
 		if (isCancelled(request)) {
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r5e7a73abd66a04cf44dfac630322dcfa958a396f -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -33,7 +33,7 @@
 	<form-property name="name" type="java.lang.String" />
 	<form-property name="code" type="java.lang.String" />
 	<form-property name="description" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" initial="1"/>
+	<form-property name="localeId" type="java.lang.Integer" initial="1"/>
 	<form-property name="typeId" type="java.lang.Integer" />
 	<form-property name="stateId" type="java.lang.Integer" />
 	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
@@ -68,7 +68,7 @@
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" />
+	<form-property name="localeId" type="java.lang.Integer" />
 </form-bean>
 
 <form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r0e71bab702f9516b24ddd4aa6f93f1ba26c18d2d -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
Binary files differ
Index: lams_central/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r377a1a547dae390df3b37784e2be3d191b094d8d -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_central/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 377a1a547dae390df3b37784e2be3d191b094d8d)
+++ lams_central/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -17,7 +17,7 @@
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" />
+	<form-property name="localeId" type="java.lang.Integer" />
 </form-bean>
 
 <!--  uncomment to use wddxPost   
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
===================================================================
diff -u -re7e68c0e5073b0ad7ff2f03a5475b27cfed9ca7a -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision e7e68c0e5073b0ad7ff2f03a5475b27cfed9ca7a)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -109,7 +109,7 @@
 		}
 		
 		BeanUtils.copyProperties(requestor,userForm);
-		SupportedLocale locale = (SupportedLocale) getService().findById(SupportedLocale.class, (Byte)userForm.get("localeId"));
+		SupportedLocale locale = (SupportedLocale) getService().findById(SupportedLocale.class, (Integer)userForm.get("localeId"));
 		requestor.setLocale(locale);
 		getService().save(requestor);
 		log.debug("profile edited: "+requestor);
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r186f3f31c5716f7805f67125e2cb7620c68f6e6a -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -41,7 +41,7 @@
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" />
+	<form-property name="localeId" type="java.lang.Integer" />
 </form-bean>
 
 <!--  uncomment to use wddxPost   
@@ -81,7 +81,7 @@
     >
       <forward
         name="okay"
-        path=".passwordChangeOk"
+        path="/index.do?state=active&amp;tab=passwordChanged"
         redirect="false"
       />
       <forward
@@ -179,6 +179,11 @@
         redirect="false"
       />
       <forward
+        name="passwordChanged"
+        path=".passwordChangeOk"
+        redirect="false"
+      />
+      <forward
         name="portrait"
         path="/portrait.do"
         redirect="false"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml
===================================================================
diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -15,7 +15,7 @@
         <id
             name="localeId"
             column="locale_id"
-            type="java.lang.Byte"
+            type="java.lang.Integer"
         >
             <generator class="native">
               <!--  
Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -r6b0a6721730f23f71d1d0eda162ae5d145ef8314 -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision 6b0a6721730f23f71d1d0eda162ae5d145ef8314)
+++ lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -5116,17 +5116,17 @@
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="1152" y="228"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="4" decimal-digits="0" default-value="" mandatory="true" name="locale_id" remarks="">
+<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="locale_id" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
+<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
+<variant type-name-pattern="INTEGER"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
+<variant type-name-pattern="INTEGER UNSIGNED"/>
+<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="2" decimal-digits="0" default-value="" mandatory="true" name="language_iso_code" remarks="ISO 639-1 Language Code (2 letter version) Java only supports 2 letter properly, not the 3 letter codes.">
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r6b0a6721730f23f71d1d0eda162ae5d145ef8314 -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 6b0a6721730f23f71d1d0eda162ae5d145ef8314)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -138,7 +138,7 @@
 )TYPE=InnoDB;
 
 CREATE TABLE lams_supported_locale (
-       locale_id TINYINT(4) NOT NULL AUTO_INCREMENT
+       locale_id INTEGER NOT NULL AUTO_INCREMENT
      , language_iso_code VARCHAR(2) NOT NULL
      , country_iso_code VARCHAR(2)
      , description VARCHAR(255) NOT NULL
@@ -227,7 +227,7 @@
      , admin_browse_all_users TINYINT(1) NOT NULL DEFAULT 0
      , admin_change_status TINYINT(1) NOT NULL DEFAULT 0
      , admin_create_guest TINYINT(1) NOT NULL DEFAULT 0
-     , locale_id TINYINT(4)
+     , locale_id INTEGER
      , archived_date DATETIME
      , PRIMARY KEY (organisation_id)
      , INDEX (organisation_type_id)
@@ -306,7 +306,7 @@
      , flash_theme_id BIGINT(20)
      , html_theme_id BIGINT(20)
      , chat_id VARCHAR(255)
-     , locale_id TINYINT(4)
+     , locale_id INTEGER
      , portrait_uuid BIGINT(20)
      , PRIMARY KEY (user_id)
      , INDEX (authentication_method_id)
Index: lams_common/db/sql/updatescripts/alter_201_locale_id.sql
===================================================================
diff -u
--- lams_common/db/sql/updatescripts/alter_201_locale_id.sql	(revision 0)
+++ lams_common/db/sql/updatescripts/alter_201_locale_id.sql	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -0,0 +1,22 @@
+-- Script to be run for LAMS 2.0.1 release, on LAMS 2.0 tables.
+-- LAMS 2.0 could have at most 127 locales due to the locale_id column
+-- type being set to TINYINT. This is changed to SMALLINT - to support
+-- not only more locales but also to make it a standard datatype
+
+ALTER TABLE lams_organisation
+CHANGE COLUMN locale_id locale_id SMALLINT;
+
+ALTER TABLE lams_user	
+DROP FOREIGN KEY FK_lams_user_6;
+
+ALTER TABLE lams_user	
+CHANGE COLUMN locale_id locale_id SMALLINT;
+
+ALTER TABLE lams_supported_locale
+CHANGE COLUMN locale_id locale_id SMALLINT NOT NULL  AUTO_INCREMENT;
+
+ALTER TABLE lams_user 
+ADD CONSTRAINT FK_lams_user_6 FOREIGN KEY (locale_id)
+REFERENCES lams_supported_locale (locale_id) ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+COMMIT;
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java
===================================================================
diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	(.../SupportedLocale.java)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	(.../SupportedLocale.java)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
@@ -18,7 +18,7 @@
 	private static final long serialVersionUID = 4096710015819299886L;
 
 	/** identifier field */
-    private Byte localeId;
+    private Integer localeId;
 
     /** persistent field */
     private String languageIsoCode;
@@ -47,15 +47,15 @@
     /** 
      *            @hibernate.id
      *             generator-class="native"
-     *             type="java.lang.Byte"
+     *             type="java.lang.Integer"
      *             column="locale_id"
      *         
      */
-    public Byte getLocaleId() {
+    public Integer getLocaleId() {
         return this.localeId;
     }
 
-    public void setLocaleId(Byte localeId) {
+    public void setLocaleId(Integer localeId) {
         this.localeId = localeId;
     }