Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java,v diff -u -r1.4 -r1.4.4.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java 17 Sep 2006 06:10:13 -0000 1.4 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java 29 Apr 2007 10:56:25 -0000 1.4.4.1 @@ -59,12 +59,8 @@ */ 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"; + private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + + "lams-www.war" + File.separatorChar + "news.html"; public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) @@ -78,7 +74,9 @@ private String loadNews() throws IOException { BufferedReader bReader = null; try { - InputStreamReader ir = new InputStreamReader(new FileInputStream(NEWS_PAGE_PATH),Charset.forName("UTF-8")); + InputStreamReader ir = new InputStreamReader(new FileInputStream( + Configuration.get(ConfigurationKeys.LAMS_EAR_DIR)+NEWS_PAGE_PATH_SUFFIX), + Charset.forName("UTF-8")); bReader = new BufferedReader(ir); StringBuilder news = new StringBuilder(); String line = bReader.readLine(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java,v diff -u -r1.8 -r1.8.4.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java 31 Oct 2006 04:18:11 -0000 1.8 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java 29 Apr 2007 10:56:25 -0000 1.8.4.1 @@ -75,26 +75,14 @@ private static final String ALPHABET = "ABCDEFGHIJKLMOPQRSTUWVXYZabcdefghijklmnopqrstuvwxyz_1234567890"; - private static final String IMAGE_FOLDER = Configuration - .get(ConfigurationKeys.LAMS_EAR_DIR) - + File.separatorChar - + "lams-www.war" - + File.separatorChar - + "images"; + private static final String IMAGE_FOLDER_SUFFIX = File.separatorChar + + "lams-www.war" + File.separatorChar + "images"; - private static final String LOGIN_PAGE_PATH = Configuration - .get(ConfigurationKeys.LAMS_EAR_DIR) - + File.separatorChar - + "lams-central.war" - + File.separatorChar - + "login.jsp"; + private static final String LOGIN_PAGE_PATH_SUFFIX = File.separatorChar + + "lams-central.war" + File.separatorChar + "login.jsp"; - private static final String NEWS_PAGE_PATH = Configuration - .get(ConfigurationKeys.LAMS_EAR_DIR) - + File.separatorChar - + "lams-www.war" - + File.separatorChar - + "news.html"; + private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + + "lams-www.war" + File.separatorChar + "news.html"; public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) @@ -127,7 +115,8 @@ private String fixBuggyFileName(String fileName) { fileName = generateRandomFileName() + fileName.substring(fileName.lastIndexOf('.')); int i=0; - while(new File(IMAGE_FOLDER + File.separatorChar + fileName).exists()){ + while(new File(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + + IMAGE_FOLDER_SUFFIX + File.separatorChar + fileName).exists()){ fileName = fileName.replace(".", new Integer(i).toString()); i++; } @@ -148,7 +137,9 @@ private void updateNewsPage(String news) throws IOException { BufferedWriter bWriter = null; try { - OutputStreamWriter ow = new OutputStreamWriter(new FileOutputStream(NEWS_PAGE_PATH),Charset.forName("UTF-8")); + OutputStreamWriter ow = new OutputStreamWriter(new FileOutputStream( + Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + NEWS_PAGE_PATH_SUFFIX), + Charset.forName("UTF-8")); bWriter = new BufferedWriter(ow); bWriter.write(news); bWriter.flush(); @@ -162,7 +153,8 @@ BufferedReader bReader = null; BufferedWriter bWriter = null; try { - bReader = new BufferedReader(new FileReader(LOGIN_PAGE_PATH)); + bReader = new BufferedReader(new FileReader( + Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + LOGIN_PAGE_PATH_SUFFIX)); StringBuilder source = new StringBuilder(); String line = bReader.readLine(); while (line != null) { @@ -174,7 +166,8 @@ int startIndex = index + LOGO_TAG.length(); int endIndex = source.indexOf("\"", startIndex); source.replace(startIndex, endIndex, url); - bWriter = new BufferedWriter(new FileWriter(LOGIN_PAGE_PATH)); + bWriter = new BufferedWriter(new FileWriter( + Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + LOGIN_PAGE_PATH_SUFFIX)); bWriter.write(source.toString()); bWriter.flush(); } @@ -193,11 +186,13 @@ private void createImageFile(FormFile file, String fileName) throws IOException { - File imagesFolder = new File(IMAGE_FOLDER); + File imagesFolder = new File( + Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + IMAGE_FOLDER_SUFFIX); if (!imagesFolder.exists()) { imagesFolder.mkdir(); } - String imageFilePath = IMAGE_FOLDER + File.separatorChar + fileName; + String imageFilePath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + + IMAGE_FOLDER_SUFFIX + File.separatorChar + fileName; FileOutputStream out = null; try { out = new FileOutputStream(imageFilePath); Index: lams_admin/web/loginmaintain.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/loginmaintain.jsp,v diff -u -r1.7.4.1 -r1.7.4.2 --- lams_admin/web/loginmaintain.jsp 27 Apr 2007 00:33:34 -0000 1.7.4.1 +++ lams_admin/web/loginmaintain.jsp 29 Apr 2007 10:57:53 -0000 1.7.4.2 @@ -15,18 +15,17 @@

-
+
/fckeditor/ - Index: lams_admin/web/template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/template.jsp,v diff -u -r1.18 -r1.18.4.1 --- lams_admin/web/template.jsp 15 Nov 2006 06:48:49 -0000 1.18 +++ lams_admin/web/template.jsp 29 Apr 2007 10:57:53 -0000 1.18.4.1 @@ -5,7 +5,7 @@ - LAMS :: <bean-el:message key="${title}"/> + <fmt:message key="${title}"/>