Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_admin/conf/language/lams/ApplicationResources.properties	20 Apr 2007 06:05:41 -0000	1.2.2.2
+++ lams_admin/conf/language/lams/ApplicationResources.properties	23 Apr 2007 05:53:12 -0000	1.2.2.3
@@ -232,5 +232,6 @@
 msg.importv1.5 = Note that the passwords of the imported users will be reset, since LAMS 2 does not accept md5 passwords.  They will be reset to the user's login.
 label.can.join.joint.lessons = Can join joint lessons
 label.can.offer.joint.lessons = Can offer joint lessons
+error.cant.write.login.jsp = Couldn't write value of {0} to {1}, please check your {2} configuration.
 
 #======= End labels: Exported 224 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	20 Apr 2007 06:05:41 -0000	1.2.2.2
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	23 Apr 2007 05:53:12 -0000	1.2.2.3
@@ -232,5 +232,6 @@
 msg.importv1.5 = Note that the passwords of the imported users will be reset, since LAMS 2 does not accept md5 passwords.  They will be reset to the user's login.
 label.can.join.joint.lessons = Can join joint lessons
 label.can.offer.joint.lessons = Can offer joint lessons
+error.cant.write.login.jsp = Couldn't write value of {0} to {1}, please check your {2} configuration.
 
 #======= End labels: Exported 224 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	19 Apr 2007 06:51:39 -0000	1.2.2.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	23 Apr 2007 05:53:12 -0000	1.2.2.2
@@ -37,6 +37,8 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
@@ -59,12 +61,8 @@
 public class ConfigAction extends LamsDispatchAction {
 
 	private static Configuration configurationService;
-	private 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 Logger log = Logger.getLogger(ConfigAction.class);
 
 	private Configuration getConfiguration() {
@@ -99,24 +97,42 @@
 		DynaActionForm configForm = (DynaActionForm) form;
 		String[] keys = (String[])configForm.get("cKey");
 		String[] values = (String[])configForm.get("cValue");
+		ActionMessages errors = new ActionMessages();
 		
 		for(int i=0; i<keys.length; i++) {
 			Configuration.updateItem(keys[i], values[i]);
+			// when updating configuration row for shibboleth login request header name,
+			// update login.jsp as well
 			if (StringUtils.equals(keys[i], ConfigurationKeys.SHIB_ATTR_LOGIN)) {
-				updateLoginPage(values[i]);
+				boolean updatedLoginPage = updateLoginPage(values[i]);
+				if (!updatedLoginPage) {
+					String[] args = new String[3];
+					args[0] = ConfigurationKeys.SHIB_ATTR_LOGIN;
+					args[1] = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR)+LOGIN_PAGE_PATH_SUFFIX;
+					args[2] = ConfigurationKeys.LAMS_EAR_DIR;
+					errors.add(ConfigurationKeys.LAMS_EAR_DIR, new ActionMessage("error.cant.write.login.jsp", args));
+				}
 			}
 		}
 		
 		getConfiguration().persistUpdate();
 		
-		return mapping.findForward("sysadmin");
+		if (errors.isEmpty()) {
+			return mapping.findForward("sysadmin");
+		} else {
+			saveErrors(request, errors);
+			request.setAttribute("config", Configuration.getAll());
+			return mapping.findForward("config");
+		}
 	}
 	
-	private void updateLoginPage(String shibAttrLogin) throws IOException {
+	// returns true on success, false on failure
+	private boolean updateLoginPage(String shibAttrLogin) throws IOException {
 		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) {
@@ -129,17 +145,22 @@
 				int startIndex = index + loginPageText.length();
 				int endIndex = source.indexOf("\"", startIndex);
 				source.replace(startIndex, endIndex, shibAttrLogin);
-				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();
 			}
 		} catch (IOException e) {
-			log.error("Couldn't find or open file: " + LOGIN_PAGE_PATH);
+			log.error("Couldn't find or open file: " 
+					+ Configuration.get(ConfigurationKeys.LAMS_EAR_DIR)
+					+ LOGIN_PAGE_PATH_SUFFIX);
+			return false;
 		} finally {
 			if (bReader != null)
 				bReader.close();
 			if (bWriter != null)
 				bWriter.close();
 		}
+		return true;
 	}
 }
Index: lams_admin/web/config/editconfig.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/config/editconfig.jsp,v
diff -u -r1.8 -r1.8.2.1
--- lams_admin/web/config/editconfig.jsp	24 Nov 2006 01:47:31 -0000	1.8
+++ lams_admin/web/config/editconfig.jsp	23 Apr 2007 05:53:12 -0000	1.8.2.1
@@ -9,6 +9,7 @@
 	</h2>
 	<lams:help page="<%= Configuration.CONFIGURATION_HELP_PAGE %>"/>
 	<br/>
+	<div align="center"><html:errors/></div>
 	<table class="alternative-color" width=100% cellspacing="0">
 		<tr>
 			<th><fmt:message key="admin.config.key"/></th>