Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java,v diff -u -r1.4 -r1.5 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java 7 Feb 2007 00:20:04 -0000 1.4 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java 20 Aug 2007 06:16:05 -0000 1.5 @@ -48,7 +48,7 @@ public static final IUserManagementService getService(ServletContext servletContext){ if (manageService == null) { WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext); - return (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + return (IUserManagementService) ctx.getBean("userManagementService"); } else { return manageService; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java,v diff -u -r1.2 -r1.3 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java 30 Oct 2006 01:40:32 -0000 1.2 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java 20 Aug 2007 06:16:05 -0000 1.3 @@ -71,7 +71,7 @@ } WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - ILearningDesignService learningDesignService = (ILearningDesignService)ctx.getBean("learningDesignServiceTarget"); + ILearningDesignService learningDesignService = (ILearningDesignService)ctx.getBean("learningDesignService"); List learningLibraryDTOs = learningDesignService.getAllLearningLibraryDetails(); Index: lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java,v diff -u -r1.7 -r1.8 --- lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java 20 Aug 2007 04:28:21 -0000 1.7 +++ lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java 20 Aug 2007 06:15:47 -0000 1.8 @@ -64,7 +64,7 @@ if (service==null) { WebApplicationContext ctx = WebApplicationContextUtils .getWebApplicationContext(HttpSessionManager.getInstance().getServletContext()); - service = (UserManagementService) ctx.getBean("userManagementServiceTarget"); + service = (UserManagementService) ctx.getBean("userManagementService"); } return service; } Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java,v diff -u -r1.15 -r1.16 --- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java 20 Aug 2007 04:28:21 -0000 1.15 +++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java 20 Aug 2007 06:15:47 -0000 1.16 @@ -107,7 +107,7 @@ try { String username = getUsername(); WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager.getInstance().getServletContext()); - UserManagementService service = (UserManagementService) ctx.getBean("userManagementServiceTarget"); + UserManagementService service = (UserManagementService) ctx.getBean("userManagementService"); User user = service.getUserByLogin(username); log.debug("===> authenticating user: " + username); Index: lams_central/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/security/Attic/WebAuthServlet.java,v diff -u -r1.4 -r1.5 --- lams_central/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java 17 Sep 2006 06:12:05 -0000 1.4 +++ lams_central/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java 20 Aug 2007 06:15:47 -0000 1.5 @@ -63,7 +63,7 @@ else { WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); - UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget"); + UserManagementService service = (UserManagementService)ctx.getBean("userManagementService"); User webAuthUser = service.getUserByLogin(webAuthUserID); if (webAuthUser != null) Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.25 -r1.26 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 9 May 2007 01:03:36 -0000 1.25 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 20 Aug 2007 06:15:47 -0000 1.26 @@ -78,7 +78,7 @@ private IUserManagementService getService(){ if(service==null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + service = (IUserManagementService) ctx.getBean("userManagementService"); } return service; } Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v diff -u -r1.36 -r1.37 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 21 Feb 2007 05:55:16 -0000 1.36 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 20 Aug 2007 06:15:47 -0000 1.37 @@ -317,7 +317,7 @@ private IUserManagementService getService(){ if(service==null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + service = (IUserManagementService) ctx.getBean("userManagementService"); } return service; } Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java,v diff -u -r1.1 -r1.2 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java 24 May 2007 07:15:59 -0000 1.1 +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java 20 Aug 2007 06:15:47 -0000 1.2 @@ -63,7 +63,7 @@ HttpServletResponse response) throws Exception { WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - IUserManagementService service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + IUserManagementService service = (IUserManagementService) ctx.getBean("userManagementService"); MessageService messageService = (MessageService)ctx.getBean("centralMessageService"); String login = WebUtil.readStrParam(request, "login", false); Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java,v diff -u -r1.11 -r1.12 --- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 7 Feb 2007 04:30:04 -0000 1.11 +++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 20 Aug 2007 06:15:47 -0000 1.12 @@ -102,7 +102,7 @@ { //WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession(true).getServletContext()); WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(getServlet().getServletContext()); - UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget"); + UserManagementService service = (UserManagementService)ctx.getBean("userManagementService"); User user = service.getUserByLogin(login); if(!user.getPassword().equals(HashUtil.sha1(oldPassword))) Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java,v diff -u -r1.4 -r1.5 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java 6 Nov 2006 00:43:18 -0000 1.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java 20 Aug 2007 06:15:47 -0000 1.5 @@ -68,7 +68,7 @@ private IUserManagementService getService(){ if(service==null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + service = (IUserManagementService) ctx.getBean("userManagementService"); } return service; } Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java,v diff -u -r1.7 -r1.8 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java 6 Nov 2006 00:43:18 -0000 1.7 +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java 20 Aug 2007 06:15:47 -0000 1.8 @@ -133,7 +133,7 @@ private IUserManagementService getService(){ if(service==null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + service = (IUserManagementService) ctx.getBean("userManagementService"); } return service; } Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java,v diff -u -r1.8 -r1.9 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java 6 Nov 2006 00:43:18 -0000 1.8 +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java 20 Aug 2007 06:15:47 -0000 1.9 @@ -104,7 +104,7 @@ private IUserManagementService getService(){ if(service==null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + service = (IUserManagementService) ctx.getBean("userManagementService"); locales = getService().findAll(SupportedLocale.class); Collections.sort(locales); } Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java,v diff -u -r1.8 -r1.9 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java 24 May 2007 00:59:48 -0000 1.8 +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java 20 Aug 2007 06:15:47 -0000 1.9 @@ -128,7 +128,7 @@ private IUserManagementService getService(){ if(service==null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + service = (IUserManagementService) ctx.getBean("userManagementService"); } return service; }