Index: lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java,v
diff -u -r1.12 -r1.13
--- lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	11 Mar 2009 01:08:31 -0000	1.12
+++ lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	1 Apr 2010 05:29:10 -0000	1.13
@@ -29,8 +29,6 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -56,13 +54,16 @@
 
     private static IUserManagementService getService() {
 	if (service == null) {
-	    ServletContext context = HttpSessionManager.getInstance().getServletContext();
 	    WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager
 		    .getInstance().getServletContext());
 	    service = (IUserManagementService) ctx.getBean("userManagementService");
 	}
 	return service;
     }
+    
+    public static void setService(IUserManagementService service) {
+	LanguageUtil.service = service;
+    }
 
     /**
      * Get the default language, country, based on entries in the server