Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java =================================================================== diff -u -ra6c0af353325aa608566b347d055d7ba0c78f2d7 -r8656feabd7a69318f154a763847ae0aa97f7f3af --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java (.../LoginMaintainAction.java) (revision a6c0af353325aa608566b347d055d7ba0c78f2d7) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java (.../LoginMaintainAction.java) (revision 8656feabd7a69318f154a763847ae0aa97f7f3af) @@ -49,41 +49,43 @@ /** * struts doclets * - * @struts:action path="/loginmaintain" - * name = "LoginMaintainForm" - * scope = "request" - * validate="false" + * @struts:action path="/loginmaintain" name = "LoginMaintainForm" scope = + * "request" validate="false" * * @struts:action-forward name="loginmaintain" path=".loginmaintain" * */ public class LoginMaintainAction extends Action { - + private static final String NEWS_PAGE_PATH = Configuration + .get(ConfigurationKeys.LAMS_EAR_DIR) + + File.separatorChar + + "lams-www.war" + + File.separatorChar + + "news.html"; + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { DynaActionForm loginMaintainForm = (DynaActionForm) form; - loginMaintainForm.set("news",loadNews()); + loginMaintainForm.set("news", loadNews()); return mapping.findForward("loginmaintain"); } private String loadNews() throws IOException { - String filePath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) - + File.separatorChar + "lams-www.war" + File.separatorChar + "news.html"; BufferedReader bReader = null; - try{ - bReader = new BufferedReader(new FileReader(filePath)); + try { + bReader = new BufferedReader(new FileReader(NEWS_PAGE_PATH)); StringBuilder news = new StringBuilder(); String line = bReader.readLine(); while (line != null) { news.append(line).append('\n'); line = bReader.readLine(); } return news.toString(); - }finally{ - if(bReader!=null){ + } finally { + if (bReader != null) { bReader.close(); } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java =================================================================== diff -u -r29229db2132796758600414673fa58379a71feef -r8656feabd7a69318f154a763847ae0aa97f7f3af --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java (.../LoginSaveAction.java) (revision 29229db2132796758600414673fa58379a71feef) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java (.../LoginSaveAction.java) (revision 8656feabd7a69318f154a763847ae0aa97f7f3af) @@ -88,7 +88,7 @@ private static final String NEWS_PAGE_PATH = Configuration .get(ConfigurationKeys.LAMS_EAR_DIR) + File.separatorChar - + "lams-central.war" + + "lams-www.war" + File.separatorChar + "news.html"; @@ -113,14 +113,7 @@ updateLoginPage(buildURL(fileName)); } updateNewsPage(loginMaintainForm.getString("news")); - String newsFilePath = Configuration - .get(ConfigurationKeys.LAMS_EAR_DIR) - + File.separatorChar - + "lams-www.war" - + File.separatorChar - + "news.html"; - BufferedWriter bWriter = new BufferedWriter(new FileWriter( - newsFilePath)); + BufferedWriter bWriter = new BufferedWriter(new FileWriter(NEWS_PAGE_PATH)); bWriter.write(loginMaintainForm.getString("news")); bWriter.flush(); bWriter.close();