Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java,v diff -u -r1.1.6.1 -r1.1.6.2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 18 Sep 2007 07:20:48 -0000 1.1.6.1 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 21 Sep 2007 02:14:17 -0000 1.1.6.2 @@ -52,9 +52,8 @@ import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; +import org.lamsfoundation.lams.util.LangUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.audit.IAuditService; @@ -315,7 +314,7 @@ } else { try { service.save(user); - writeAuditLog(user); + service.auditUserCreated(user, AdminConstants.MODULE_NAME); log.debug("saved user: "+user.getUserId()); } catch (Exception e) { log.debug(e); @@ -648,9 +647,7 @@ // set CSSThemeVisualElement to default flash theme if cell is empty private CSSThemeVisualElement getFlashTheme(String flashId){ if (flashId==null || flashId=="") { - String flashName = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME); - List list = service.findByProperty(CSSThemeVisualElement.class, "name", flashName); - return (list != null && list.size() > 0) ? (CSSThemeVisualElement) list.get(0) : null; + return service.getDefaultFlashTheme(); } else { try { return (CSSThemeVisualElement)service.findById(CSSThemeVisualElement.class, new Long(flashId)); @@ -663,9 +660,7 @@ // set CSSThemeVisualElement to default html theme if cell is empty private CSSThemeVisualElement getHtmlTheme(String htmlId){ if (htmlId==null || htmlId=="") { - String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME); - List list = service.findByProperty(CSSThemeVisualElement.class, "name", htmlName); - return (list != null && list.size() > 0) ? (CSSThemeVisualElement) list.get(0) : null; + return service.getDefaultHtmlTheme(); } else { try { return (CSSThemeVisualElement)service.findById(CSSThemeVisualElement.class, new Long(htmlId)); @@ -678,8 +673,7 @@ // set locale to default system locale if cell is empty private SupportedLocale getLocale(String localeId){ if (localeId==null || localeId=="") { - String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - return service.getSupportedLocale(defaultLocale.substring(0, 2), defaultLocale.substring(3)); + return LangUtil.getDefaultLocale(); } else { try { return (SupportedLocale)service.findById(SupportedLocale.class, new Integer(localeId)); @@ -689,11 +683,4 @@ } } - 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/ServerSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java,v diff -u -r1.3 -r1.3.4.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java 3 Jan 2007 03:10:00 -0000 1.3 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java 21 Sep 2007 02:14:17 -0000 1.3.4.1 @@ -48,8 +48,7 @@ import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.LangUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -106,8 +105,7 @@ org.setParentOrganisation(userService.getRootOrganisation()); org.setOrganisationType((OrganisationType)userService.findById(OrganisationType.class,OrganisationType.COURSE_TYPE)); org.setOrganisationState((OrganisationState)userService.findById(OrganisationState.class,OrganisationState.ACTIVE)); - String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - SupportedLocale locale = userService.getSupportedLocale(defaultLocale.substring(0,2),defaultLocale.substring(3)); + SupportedLocale locale = LangUtil.getDefaultLocale(); org.setLocale(locale); userService.saveOrganisation(org, user.getUserID()); serverOrgMapForm.set("orgId", org.getOrganisationId()); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v diff -u -r1.44 -r1.44.6.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 29 Nov 2006 03:59:22 -0000 1.44 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 21 Sep 2007 02:14:17 -0000 1.44.6.1 @@ -28,7 +28,6 @@ import java.util.Collections; import java.util.List; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -50,8 +49,7 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.LangUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -140,9 +138,7 @@ request.setAttribute("globalRoles", getGlobalRoles(user)); } else { // create a user try { - String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - log.debug("using defaultLocale: "+defaultLocale); - SupportedLocale locale = service.getSupportedLocale(defaultLocale.substring(0,2),defaultLocale.substring(3)); + SupportedLocale locale = LangUtil.getDefaultLocale(); userForm.set("localeId", locale.getLocaleId()); } catch(Exception e) { log.debug(e); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/ImportV1ContentsSaveAction.java,v diff -u -r1.4.6.1 -r1.4.6.2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java 18 Sep 2007 07:20:48 -0000 1.4.6.1 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java 21 Sep 2007 02:14:17 -0000 1.4.6.2 @@ -45,7 +45,6 @@ import org.lamsfoundation.lams.admin.web.dto.V1OrganisationDTO; import org.lamsfoundation.lams.admin.web.dto.V1UserDTO; import org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm; -import org.lamsfoundation.lams.themes.CSSThemeVisualElement; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; @@ -55,9 +54,8 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; +import org.lamsfoundation.lams.util.LangUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -113,8 +111,7 @@ boolean onlyMembers = importV1ContentsForm.getOnlyMembers(); // default import options - String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - SupportedLocale locale = service.getSupportedLocale(defaultLocale.substring(0,2),defaultLocale.substring(3)); + SupportedLocale locale = LangUtil.getDefaultLocale(); final OrganisationType courseType = (OrganisationType)service.findById( OrganisationType.class, OrganisationType.COURSE_TYPE); final OrganisationState activeState = (OrganisationState)service.findById( @@ -245,18 +242,8 @@ newUser.setPassword(HashUtil.sha1(user.getLogin())); newUser.setChangePassword(true); - String flashName = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME); - List list = service.findByProperty(CSSThemeVisualElement.class, "name", flashName); - if (list!=null) { - CSSThemeVisualElement flashTheme = (CSSThemeVisualElement)list.get(0); - newUser.setFlashTheme(flashTheme); - } - String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME); - list = service.findByProperty(CSSThemeVisualElement.class, "name", htmlName); - if (list!=null) { - CSSThemeVisualElement htmlTheme = (CSSThemeVisualElement)list.get(0); - newUser.setHtmlTheme(htmlTheme); - } + newUser.setFlashTheme(service.getDefaultFlashTheme()); + newUser.setHtmlTheme(service.getDefaultHtmlTheme()); newUser.setDisabledFlag(false); newUser.setCreateDate(new Date()); newUser.setAuthenticationMethod((AuthenticationMethod)service.findByProperty(AuthenticationMethod.class, Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java,v diff -u -r1.9 -r1.9.2.1 --- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java 22 Feb 2007 01:18:01 -0000 1.9 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java 21 Sep 2007 02:14:16 -0000 1.9.2.1 @@ -9,7 +9,6 @@ import java.util.Date; import java.util.Iterator; -import java.util.List; import java.util.Set; import javax.servlet.http.HttpServlet; @@ -22,17 +21,14 @@ import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; -import org.lamsfoundation.lams.themes.CSSThemeVisualElement; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; -import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.LangUtil; import org.springframework.web.context.support.WebApplicationContextUtils; public class RegisterServiceSoapBindingImpl implements Register { @@ -80,19 +76,9 @@ AuthenticationMethod.class, AuthenticationMethod.DB)); user.setCreateDate(new Date()); user.setDisabledFlag(false); - user.setLocale(getLocale()); - String flashName = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME); - List list = service.findByProperty(CSSThemeVisualElement.class, "name", flashName); - if (list != null && list.size() > 0) { - CSSThemeVisualElement flashTheme = (CSSThemeVisualElement) list.get(0); - user.setFlashTheme(flashTheme); - } - String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME); - list = service.findByProperty(CSSThemeVisualElement.class, "name", htmlName); - if (list != null && list.size() > 0) { - CSSThemeVisualElement htmlTheme = (CSSThemeVisualElement) list.get(0); - user.setHtmlTheme(htmlTheme); - } + user.setLocale(LangUtil.getDefaultLocale()); + user.setFlashTheme(service.getDefaultFlashTheme()); + user.setHtmlTheme(service.getDefaultHtmlTheme()); service.save(user); return true; } catch (Exception e) { @@ -195,12 +181,6 @@ throw new java.rmi.RemoteException(e.getMessage()); } } - - private SupportedLocale getLocale() { - String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - return service - .getSupportedLocale(defaultLocale.substring(0, 2), defaultLocale.substring(3)); - } @SuppressWarnings("unchecked") private void addMemberships(User user, Organisation org, Boolean isTeacher) { Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v diff -u -r1.11 -r1.11.4.1 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 25 May 2007 06:02:29 -0000 1.11 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 21 Sep 2007 02:14:18 -0000 1.11.4.1 @@ -33,7 +33,6 @@ import java.net.URLConnection; import java.net.URLEncoder; import java.text.ParseException; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -45,21 +44,18 @@ import org.lamsfoundation.lams.integration.ExtUserUseridMap; import org.lamsfoundation.lams.integration.UserInfoFetchException; import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator; -import org.lamsfoundation.lams.themes.CSSThemeVisualElement; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; -import org.lamsfoundation.lams.usermanagement.SupportedLocale; +import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; -import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.CSVUtil; import org.lamsfoundation.lams.util.HashUtil; +import org.lamsfoundation.lams.util.LangUtil; /** *

@@ -142,7 +138,7 @@ org.setParentOrganisation(serverMap.getOrganisation()); org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,OrganisationType.CLASS_TYPE)); org.setOrganisationState((OrganisationState)service.findById(OrganisationState.class,OrganisationState.ACTIVE)); - org.setLocale(getLocale(countryIsoCode, langIsoCode)); + org.setLocale(LangUtil.getSupportedLocale(langIsoCode, countryIsoCode)); service.saveOrganisation(org, user.getUserId()); addMemberships(user,org); ExtCourseClassMap map = new ExtCourseClassMap(); @@ -153,30 +149,6 @@ return map; } - private SupportedLocale getLocale(String countryIsoCode, String langIsoCode) { - SupportedLocale locale = null; - if(countryIsoCode.trim().length()>0 && langIsoCode.trim().length()>0){ - locale = service.getSupportedLocale(countryIsoCode, langIsoCode); - }else if(langIsoCode.trim().length()>0){ - List list = service.findByProperty(SupportedLocale.class, "languageIsoCode", langIsoCode); - if(list!=null && list.size()>0){ - Collections.sort(list); - locale = (SupportedLocale)list.get(0); - } - }else if(countryIsoCode.trim().length()>0){ - List list = service.findByProperty(SupportedLocale.class, "countryIsoCode", countryIsoCode); - if(list!=null && list.size()>0){ - Collections.sort(list); - locale = (SupportedLocale)list.get(0); - } - } - if(locale==null){ - String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - locale = service.getSupportedLocale(defaultLocale.substring(0,2), defaultLocale.substring(3)); - } - return locale; - } - private ExtUserUseridMap createExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername) throws UserInfoFetchException { String[] userData = getUserDataFromExtServer(serverMap, extUsername); User user = new User(); @@ -197,19 +169,9 @@ user.setAuthenticationMethod((AuthenticationMethod)service.findById(AuthenticationMethod.class, AuthenticationMethod.DB)); user.setCreateDate(new Date()); user.setDisabledFlag(false); - user.setLocale(getLocale(userData[12],userData[13])); - String flashName = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME); - List list = service.findByProperty(CSSThemeVisualElement.class, "name", flashName); - if (list!=null && list.size()>0) { - CSSThemeVisualElement flashTheme = (CSSThemeVisualElement)list.get(0); - user.setFlashTheme(flashTheme); - } - String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME); - list = getService().findByProperty(CSSThemeVisualElement.class, "name", htmlName); - if (list!=null && list.size()>0) { - CSSThemeVisualElement htmlTheme = (CSSThemeVisualElement)list.get(0); - user.setHtmlTheme(htmlTheme); - } + user.setLocale(LangUtil.getSupportedLocale(userData[13], userData[12])); + user.setFlashTheme(service.getDefaultFlashTheme()); + user.setHtmlTheme(service.getDefaultHtmlTheme()); service.save(user); ExtUserUseridMap map = new ExtUserUseridMap(); map.setExtServerOrgMap(serverMap); 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.44.6.1 -r1.44.6.2 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 18 Sep 2007 07:20:54 -0000 1.44.6.1 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 21 Sep 2007 02:14:18 -0000 1.44.6.2 @@ -294,14 +294,6 @@ */ public Organisation saveOrganisation( Organisation organisation, Integer userID ); - /** - * - * @param language - * @param country - * @return SupportedLocale - */ - public SupportedLocale getSupportedLocale(String language, String country); - public List getUserManageBeans(Integer orgId); /** Remove a user from the system completely. Only able to be done if they don't have any @@ -391,12 +383,6 @@ */ public CSSThemeVisualElement getDefaultHtmlTheme(); - /** - * Get default server locale. - * @return server default supported locale object - */ - public SupportedLocale getDefaultLocale(); - public void auditPasswordChanged(User user, String moduleName); public void auditUserCreated(User user, String moduleName); 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.75.4.1 -r1.75.4.2 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 18 Sep 2007 07:20:53 -0000 1.75.4.1 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 21 Sep 2007 02:14:18 -0000 1.75.4.2 @@ -42,7 +42,6 @@ import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; -import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; @@ -59,7 +58,6 @@ import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.audit.AuditService; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -531,18 +529,8 @@ } return organisation; - } + } - public SupportedLocale getSupportedLocale(String language, String country) { - Map properties = new HashMap(); - properties.put("languageIsoCode",language); - if(country!=null){ - properties.put("countryIsoCode",country); - } - List results = findByProperties(SupportedLocale.class,properties); - return results.isEmpty() ? null : (SupportedLocale)results.get(0); - } - @SuppressWarnings("unchecked") public List getUserManageBeans(Integer orgId) { String query = "select u.userId,u.login,u.title,u.firstName,u.lastName, r " + @@ -907,11 +895,6 @@ return (list!=null ? (CSSThemeVisualElement)list.get(0) : null); } - public SupportedLocale getDefaultLocale() { - String localeName = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - return getSupportedLocale(localeName.substring(0,2),localeName.substring(3)); - } - public void auditPasswordChanged(User user, String moduleName) { String[] args = new String[1]; args[0] = user.getLogin() + "(" + user.getUserId() + ")"; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/LangUtil.java'. Fisheye: No comparison available. Pass `N' to diff?