Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
===================================================================
diff -u -rfa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9 -r8fb34ff788990c3ae25a0661090636b38bdecec2
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision fa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8fb34ff788990c3ae25a0661090636b38bdecec2)
@@ -43,7 +43,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
@@ -58,6 +57,7 @@
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageGalleryItemForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.MultipleImagesForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -326,7 +326,7 @@
 	}
 	imageGalleryForm.setImageGallery(imageGalleryPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	return "pages/authoring/authoring";
     }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
===================================================================
diff -u -rfa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9 -r8fb34ff788990c3ae25a0661090636b38bdecec2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision fa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8fb34ff788990c3ae25a0661090636b38bdecec2)
@@ -48,7 +48,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
@@ -64,6 +63,7 @@
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceItemForm;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourcePedagogicalPlannerForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileValidatorSpringUtil;
@@ -360,7 +360,8 @@
      *
      */
     @RequestMapping(value = "/start")
-    private String start(@ModelAttribute("startForm") ResourceForm startForm, HttpServletRequest request) throws ServletException {
+    private String start(@ModelAttribute("startForm") ResourceForm startForm, HttpServletRequest request)
+	    throws ServletException {
 
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
@@ -511,8 +512,8 @@
      * @throws ServletException
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    private String updateContent(@ModelAttribute("authoringForm") ResourceForm authoringForm, HttpServletRequest request)
-	    throws Exception {
+    private String updateContent(@ModelAttribute("authoringForm") ResourceForm authoringForm,
+	    HttpServletRequest request) throws Exception {
 
 	// get back sessionMAP
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -623,7 +624,7 @@
 	}
 	authoringForm.setResource(resourcePO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	return "pages/authoring/authoring";
     }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java
===================================================================
diff -u -rfa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9 -r8fb34ff788990c3ae25a0661090636b38bdecec2
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision fa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8fb34ff788990c3ae25a0661090636b38bdecec2)
@@ -32,14 +32,14 @@
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
 import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
 import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService;
 import org.lamsfoundation.lams.tool.spreadsheet.web.form.SpreadsheetForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -204,7 +204,7 @@
 
 	spreadsheetForm.setSpreadsheet(spreadsheetPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return "pages/authoring/authoring";
     }
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
===================================================================
diff -u -rfa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9 -r8fb34ff788990c3ae25a0661090636b38bdecec2
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision fa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8fb34ff788990c3ae25a0661090636b38bdecec2)
@@ -45,7 +45,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
@@ -61,6 +60,7 @@
 import org.lamsfoundation.lams.tool.survey.web.form.QuestionForm;
 import org.lamsfoundation.lams.tool.survey.web.form.SurveyForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -591,7 +591,7 @@
 
 	authoringForm.setSurvey(surveyPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute("authoringForm", authoringForm);
 	return "pages/authoring/authoring";
     }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
===================================================================
diff -u -rfa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9 -r8fb34ff788990c3ae25a0661090636b38bdecec2
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision fa0b7dec0f74e6b8eeb7b4b2ab193ba2cadc82d9)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8fb34ff788990c3ae25a0661090636b38bdecec2)
@@ -43,7 +43,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
@@ -57,6 +56,7 @@
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListItemForm;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListPedagogicalPlannerForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -366,7 +366,7 @@
 
 	taskListForm.setTaskList(taskListPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return "pages/authoring/authoring";
     }