Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r5949a49ec6308dfce3ac7c88808da019f8260c76 -r8236da64800893104429c9b88f89d500c505a9a1
Binary files differ
Index: lams_common/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_common/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="conf/hibernate/mappings"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-central.jar" sourcepath="/lams_central"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar" sourcepath="/lams_contentrepository"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
 		<attributes>
@@ -32,7 +31,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/collections/main/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/collections/main/commons-collections-3.2.1.jar" sourcepath="/Users/Andrey/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-io"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java	(.../TextSearchCondition.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java	(.../TextSearchCondition.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -32,7 +32,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.dto.TextSearchConditionDTO;
 import org.lamsfoundation.lams.tool.ToolOutput;
-import org.lamsfoundation.lams.web.TextSearchActionForm;
 
 /**
  * Condition that is based on text search. Several properties set what needs to be found in a tool output. Based on the
@@ -281,17 +280,6 @@
 	setExcludedWordsCondition(splitSentence(excludedWordsString, TextSearchCondition.NON_WORD_DELIMITER_REGEX));
     }
 
-    /**
-     * Fills the condition parameters using strings provided by an user in the form.
-     *
-     * @param textSearchActionForm
-     *            form to parse
-     */
-    public void parseConditionStrings(TextSearchActionForm textSearchActionForm) {
-	parseConditionStrings(textSearchActionForm.getAllWords(), textSearchActionForm.getPhrase(),
-		textSearchActionForm.getAnyWords(), textSearchActionForm.getExcludedWords());
-    }
-
     public void setAllWords(String allWords) {
 	this.allWords = allWords;
 	conditionsParsed = false;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
===================================================================
diff -u -rfd6ade152cf877cecaa63d3cb59d3bc53d60ca45 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	(.../ILearningDesignService.java)	(revision fd6ade152cf877cecaa63d3cb59d3bc53d60ca45)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	(.../ILearningDesignService.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -48,6 +48,15 @@
 public interface ILearningDesignService {
     static final String LD_SVG_TOP_DIR = FileUtil.getFullPath(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR),
 	    "lams-www.war\\secure\\learning-design-images");
+    
+    /**
+     * Returns a populated LearningDesign object corresponding to the given learningDesignID
+     *
+     * @param learningDesignID
+     *            The learning_design_id of the design which has to be fetched
+     * @return LearningDesign The populated LearningDesign object corresponding to the given learningDesignID
+     */
+    LearningDesign getLearningDesign(Long learningDesignID);
 
     /**
      * Get the learning design DTO
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
diff -u -rfd6ade152cf877cecaa63d3cb59d3bc53d60ca45 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision fd6ade152cf877cecaa63d3cb59d3bc53d60ca45)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -148,29 +148,19 @@
     /**********************************************
      * Service Methods
      *******************************************/
+    
+    @Override
+    public LearningDesign getLearningDesign(Long learningDesignID) {
+	return learningDesignDAO.getLearningDesignById(learningDesignID);
+    }
 
-    /**
-     * Get the learning design DTO
-     *
-     * @param learningDesignId
-     * @param languageCode
-     *            Two letter language code needed to I18N the help url
-     * @return LearningDesignDTO
-     */
     @Override
     public LearningDesignDTO getLearningDesignDTO(Long learningDesignID, String languageCode) {
 	LearningDesign design = learningDesignID != null ? learningDesignDAO.getLearningDesignById(learningDesignID)
 		: null;
 	return design != null ? new LearningDesignDTO(design, activityDAO, groupingDAO, languageCode) : null;
     }
 
-    /**
-     * This method calls other validation methods which apply the validation rules to determine whether or not the
-     * learning design is valid.
-     *
-     * @param learningDesign
-     * @return list of validation errors
-     */
     @Override
     public Vector<ValidationErrorDTO> validateLearningDesign(LearningDesign learningDesign) {
 	LearningDesignValidator validator = new LearningDesignValidator(learningDesign, messageService);
Index: lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
===================================================================
diff -u -r1afed7dc7b62a19dfd296e395eaf469d97583af5 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java	(.../QuestionExporter.java)	(revision 1afed7dc7b62a19dfd296e395eaf469d97583af5)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java	(.../QuestionExporter.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -41,7 +41,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileUtil;
@@ -99,9 +99,9 @@
 	try {
 	    String fileName = FileUtil.getFileName(packagePath);
 	    fileName = FileUtil.encodeFilenameForDownload(request, fileName);
-	    response.setContentType(CentralConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD);
-	    response.setHeader(CentralConstants.HEADER_CONTENT_DISPOSITION,
-		    CentralConstants.HEADER_CONTENT_ATTACHMENT + fileName);
+	    response.setContentType(CommonConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD);
+	    response.setHeader(CommonConstants.HEADER_CONTENT_DISPOSITION,
+		    CommonConstants.HEADER_CONTENT_ATTACHMENT + fileName);
 
 	    // write out the ZIP to respose error
 	    FileUtils.copyFile(packageFile, response.getOutputStream());
Index: lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java
===================================================================
diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(.../CommonConstants.java)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
+++ lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(.../CommonConstants.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -8,6 +8,9 @@
     public static final String PARAM_SIDX = "sidx";
     public static final String PARAM_SORD = "sord";
 
+    // default coordinate used if the entry came from Flash is 0 or less.
+    public static final Integer DEFAULT_COORD = new Integer(10);
+
     // XML Elemetns
     public static final String ELEMENT_ROWS = "rows";
     public static final String ELEMENT_PAGE = "page";
@@ -17,10 +20,31 @@
     public static final String ELEMENT_ID = "id";
     public static final String ELEMENT_CELL = "cell";
 
+    public static final String PARAM_LEARNING_DESIGN_ID = "ldId";
+    public static final String PARAM_USE_PREFIX = "usePrefix";
+    public static final String PARAM_MODE = "mode";
+
     public static int PORTRAIT_LARGEST_DIMENSION_LARGE = 200;
     public static int PORTRAIT_LARGEST_DIMENSION_MEDIUM = 80;
     public static int PORTRAIT_LARGEST_DIMENSION_SMALL = 35;
 
+    //used by all tool authoring action class to mark the success flag.
+    public static final String LAMS_AUTHORING_SUCCESS_FLAG = "LAMS_AUTHORING_SUCCESS_FLAG";
+
+    // used for tool content folder creation.
+    public static final String LAMS_WWW_FOLDER = "www/";
+
+    public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
+    public static final String RESPONSE_CONTENT_TYPE_DOWNLOAD = "application/x-download";
+    public static final String HEADER_CONTENT_ATTACHMENT = "attachment;filename=";
+    
+    public static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10";
+    public static final String TOOL_SIGNATURE_FORUM = "lafrum11";
+    public static final String TOOL_SIGNATURE_LEADERSELECTION = "lalead11";
+    public static final String TOOL_SIGNATURE_MCQ = "lamc11";
+    public static final String TOOL_SIGNATURE_SCRATCHIE = "lascrt11";
+    public static final String TOOL_SIGNATURE_PEER_REVIEW = "laprev11";
+
     public static final String[] COUNTRY_CODES = { "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ", "AR", "AS",
 	    "AT", "AU", "AI", "AL", "AM", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ", "BA", "BB", "BD", "BE",
 	    "BF", "BG", "BH", "BI", "BJ", "BL", "BM", "BN", "BO", "BQ", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA",
Index: lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
===================================================================
diff -u -r16db223ed22285c6c6edb6e3fa4ad7b1713cd6c1 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java	(.../UploadFileUtil.java)	(revision 16db223ed22285c6c6edb6e3fa4ad7b1713cd6c1)
+++ lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java	(.../UploadFileUtil.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -32,7 +32,6 @@
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 
 /**
  * Wraps up interface to the Commons FileUpload as much as possible. Reads configuration information such the maximum
@@ -220,7 +219,7 @@
      */
     public static String getUploadWebPath(String contentFolderID, String type) {
 	return "/" + Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH) + "/"
-		+ AuthoringConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + "/"
+		+ CommonConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + "/"
 		+ String.join("/", UploadFileUtil.splitContentDir(contentFolderID)) + "/" + type;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/CircularByteBuffer.java
===================================================================
diff -u -r5caa0c70153ab564c5d8e347c4af4baf53b01fd0 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/CircularByteBuffer.java	(.../CircularByteBuffer.java)	(revision 5caa0c70153ab564c5d8e347c4af4baf53b01fd0)
+++ lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/CircularByteBuffer.java	(.../CircularByteBuffer.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -21,7 +21,7 @@
  */
 
 
-package org.lamsfoundation.lams.util;
+package org.lamsfoundation.lams.util.imgscalr;
 
 /*
  * Circular Byte Buffer
@@ -45,6 +45,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.commons.collections.BufferOverflowException;
+
 /**
  * Implements the Circular Buffer producer/consumer model for bytes.
  * More information about this class is available from <a target="_top" href=
Index: lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java
===================================================================
diff -u -r081da641f026d51df01a07b5d8944f91c1cf82b5 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java	(.../ResizePictureUtil.java)	(revision 081da641f026d51df01a07b5d8944f91c1cf82b5)
+++ lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java	(.../ResizePictureUtil.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -33,7 +33,6 @@
 import javax.imageio.stream.ImageOutputStream;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.util.CircularByteBuffer;
 import org.lamsfoundation.lams.util.imgscalr.Scalr.Method;
 
 /**
Index: lams_common/src/java/org/lamsfoundation/lams/web/action/LamsAuthoringFinishAction.java
===================================================================
diff -u -r5caa0c70153ab564c5d8e347c4af4baf53b01fd0 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/web/action/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 5caa0c70153ab564c5d8e347c4af4baf53b01fd0)
+++ lams_common/src/java/org/lamsfoundation/lams/web/action/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -22,7 +22,7 @@
  */
 
 
-package org.lamsfoundation.lams.authoring.web;
+package org.lamsfoundation.lams.web.action;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -162,7 +162,7 @@
     public ILamsToolService getToolService() {
 	WebApplicationContext webContext = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(this.getServlet().getServletContext());
-	return (ILamsToolService) webContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);
+	return (ILamsToolService) webContext.getBean("lamsToolService");
     }
     
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/web/form/TextSearchActionForm.java
===================================================================
diff -u -r5caa0c70153ab564c5d8e347c4af4baf53b01fd0 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_common/src/java/org/lamsfoundation/lams/web/form/TextSearchActionForm.java	(.../TextSearchActionForm.java)	(revision 5caa0c70153ab564c5d8e347c4af4baf53b01fd0)
+++ lams_common/src/java/org/lamsfoundation/lams/web/form/TextSearchActionForm.java	(.../TextSearchActionForm.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-package org.lamsfoundation.lams.web;
+package org.lamsfoundation.lams.web.form;
 
 import org.apache.struts.action.ActionForm;
 import org.lamsfoundation.lams.learningdesign.TextSearchCondition;
Index: lams_monitoring/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_monitoring/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_monitoring/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
 		<attributes>
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -49,7 +49,7 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.authoring.IAuthoringService;
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.events.EmailNotificationArchive;
 import org.lamsfoundation.lams.events.dao.EventDAO;
@@ -365,7 +365,7 @@
 
 	securityService.isGroupMonitor(organisationId, userID, "intializeLesson", true);
 
-	LearningDesign originalLearningDesign = authoringService.getLearningDesign(new Long(learningDesignId));
+	LearningDesign originalLearningDesign = learningDesignDAO.getLearningDesignById(new Long(learningDesignId));
 	if (originalLearningDesign == null) {
 	    throw new MonitoringServiceException(
 		    "Learning design for id=" + learningDesignId + " is missing. Unable to initialize lesson.");
@@ -403,7 +403,7 @@
     public Lesson initializeLessonForPreview(String lessonName, String lessonDescription, long learningDesignId,
 	    Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
 	    Boolean liveEditEnabled) {
-	LearningDesign originalLearningDesign = authoringService.getLearningDesign(new Long(learningDesignId));
+	LearningDesign originalLearningDesign = learningDesignDAO.getLearningDesignById(new Long(learningDesignId));
 	if (originalLearningDesign == null) {
 	    throw new MonitoringServiceException(
 		    "Learning design for id=" + learningDesignId + " is missing. Unable to initialize lesson.");
@@ -421,7 +421,7 @@
 	    Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
 	    Boolean enableLessonNotifications, Boolean forceLearnerRestart, Boolean allowLearnerRestart,
 	    Boolean gradebookOnComplete, Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson) {
-	LearningDesign learningDesign = authoringService.getLearningDesign(learningDesignID);
+	LearningDesign learningDesign = learningDesignDAO.getLearningDesignById(learningDesignID);
 	if (learningDesign == null) {
 	    throw new MonitoringServiceException(
 		    "Learning design for id=" + learningDesignID + " is missing. Unable to initialize lesson.");
@@ -445,7 +445,7 @@
 	// copy the current learning design
 	LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign,
 		new Integer(copyType), user, workspaceFolder, true, null, customCSV);
-	authoringService.saveLearningDesign(copiedLearningDesign);
+	learningDesignDAO.insertOrUpdate(copiedLearningDesign);
 
 	// Make all efforts to make sure it has a title
 	String title = lessonName != null ? lessonName : copiedLearningDesign.getTitle();
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
===================================================================
diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java	(.../MonitoringServiceProxy.java)	(revision 4338c54ef39ccdab47dc95d28deec40f23059633)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java	(.../MonitoringServiceProxy.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.ServletContext;
 
-import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.authoring.IAuthoringService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -55,8 +55,7 @@
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
-import org.lamsfoundation.lams.authoring.ObjectExtractor;
-import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.authoring.IAuthoringService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.BranchingActivity;
@@ -91,7 +90,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.exception.UserException;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
@@ -1044,9 +1043,9 @@
 
 	    case "MCQ or Assessment":
 		//the second activity shall be a MCQ or Assessment
-		if (activity.isToolActivity() && (CentralConstants.TOOL_SIGNATURE_ASSESSMENT
+		if (activity.isToolActivity() && (CommonConstants.TOOL_SIGNATURE_ASSESSMENT
 			.equals(((ToolActivity) activity).getTool().getToolSignature())
-			|| CentralConstants.TOOL_SIGNATURE_MCQ
+			|| CommonConstants.TOOL_SIGNATURE_MCQ
 				.equals(((ToolActivity) activity).getTool().getToolSignature()))) {
 		    return verifyNextActivityFitsTbl(nextActivity, "Leaderselection");
 		    
@@ -1056,7 +1055,7 @@
 
 	    case "Leaderselection":
 		//the third activity shall be a Leader Selection
-		if (activity.isToolActivity() && CentralConstants.TOOL_SIGNATURE_LEADERSELECTION
+		if (activity.isToolActivity() && CommonConstants.TOOL_SIGNATURE_LEADERSELECTION
 			.equals(((ToolActivity) activity).getTool().getToolSignature())) {
 		    return verifyNextActivityFitsTbl(nextActivity, "Scratchie");
 		    
@@ -1066,7 +1065,7 @@
 		
 	    case "Scratchie":
 		//the fourth activity shall be Scratchie
-		if (activity.isToolActivity() && CentralConstants.TOOL_SIGNATURE_SCRATCHIE
+		if (activity.isToolActivity() && CommonConstants.TOOL_SIGNATURE_SCRATCHIE
 			.equals(((ToolActivity) activity).getTool().getToolSignature())) {
 		    return true;
 		    
@@ -1517,7 +1516,7 @@
 
     public ActionForward startLiveEdit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws LearningDesignException, UserException, IOException {
-	long learningDesignId = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID);
+	long learningDesignId = WebUtil.readLongParam(request, CommonConstants.PARAM_LEARNING_DESIGN_ID);
 	LearningDesign learningDesign = (LearningDesign) getUserManagementService().findById(LearningDesign.class,
 		learningDesignId);
 	if (learningDesign.getLessons().isEmpty()) {
@@ -1769,7 +1768,7 @@
     }
 
     private static int getActivityCoordinate(Integer coord) {
-	return (coord == null) || (coord < 0) ? ObjectExtractor.DEFAULT_COORD : coord;
+	return (coord == null) || (coord < 0) ? CommonConstants.DEFAULT_COORD : coord;
     }
 
     /**
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
===================================================================
diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java	(.../TblMonitoringAction.java)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java	(.../TblMonitoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -40,12 +40,11 @@
 import org.lamsfoundation.lams.monitoring.dto.TblGroupDTO;
 import org.lamsfoundation.lams.monitoring.dto.TblUserDTO;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringFullService;
-import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -366,7 +365,7 @@
 	    if (activity instanceof ToolActivity) {
 		ToolActivity toolActivity = (ToolActivity) activity;
 		String toolSignature = toolActivity.getTool().getToolSignature();
-		if (CentralConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) {
+		if (CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) {
 		    isScratchieAvailable = true;
 		    break;
 		}
@@ -386,10 +385,10 @@
 		String toolTitle = toolActivity.getTitle();
 
 		//count only the first MCQ or Assessmnet as iRA
-		if (!iraPassed && (CentralConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)
-			|| isScratchieAvailable && CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature))) {
+		if (!iraPassed && (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)
+			|| isScratchieAvailable && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature))) {
 		    iraPassed = true;
-		    if (CentralConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
+		    if (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
 			request.setAttribute("isIraMcqAvailable", true);
 
 		    } else {
@@ -402,30 +401,30 @@
 		}
 
 		//aes are counted only after Scratchie activity, or for LKC TBL monitoring
-		if ((scratchiePassed || !isScratchieAvailable) && CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
+		if ((scratchiePassed || !isScratchieAvailable) && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
 		    request.setAttribute("isAeAvailable", true);
 		    //prepare assessment details to be passed to Assessment tool
 		    assessmentToolContentIds += toolContentId + ",";
 		    assessmentActivityTitles += toolTitle + "\\,";
 
-		} else if (CentralConstants.TOOL_SIGNATURE_FORUM.equals(toolSignature)) {
+		} else if (CommonConstants.TOOL_SIGNATURE_FORUM.equals(toolSignature)) {
 		    request.setAttribute("isForumAvailable", true);
 		    request.setAttribute("forumActivityId", toolActivityId);
 
-		} else if (CentralConstants.TOOL_SIGNATURE_PEER_REVIEW.equals(toolSignature)) {
+		} else if (CommonConstants.TOOL_SIGNATURE_PEER_REVIEW.equals(toolSignature)) {
 		    request.setAttribute("isPeerreviewAvailable", true);
 		    request.setAttribute("peerreviewToolContentId", toolContentId);
 
 		    //tRA is the first scratchie activity
-		} else if (!scratchiePassed && CentralConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) {
+		} else if (!scratchiePassed && CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) {
 		    scratchiePassed = true;
 
 		    request.setAttribute("isScratchieAvailable", true);
 		    request.setAttribute("traToolContentId", toolContentId);
 		    request.setAttribute("traToolActivityId", toolActivityId);
 		}
 
-		if (CentralConstants.TOOL_SIGNATURE_LEADERSELECTION.equals(toolSignature)) {
+		if (CommonConstants.TOOL_SIGNATURE_LEADERSELECTION.equals(toolSignature)) {
 		    request.setAttribute("leaderselectionToolActivityId", toolActivityId);
 		    request.setAttribute("leaderselectionToolContentId", toolContentId);
 		}
Index: lams_monitoring/web/tblmonitor/forum.jsp
===================================================================
diff -u -rd7ed1173946998f754a2efef09d68c9e3bfe307f -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_monitoring/web/tblmonitor/forum.jsp	(.../forum.jsp)	(revision d7ed1173946998f754a2efef09d68c9e3bfe307f)
+++ lams_monitoring/web/tblmonitor/forum.jsp	(.../forum.jsp)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -1,5 +1,5 @@
 <%@ include file="/template/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.util.CentralConstants"%>
+<%@ page import="org.lamsfoundation.lams.util.CommonConstants"%>
 <script>
 	$(document).ready(function(){
 		//insert total learners number taken from the parent tblmonitor.jsp
@@ -48,7 +48,7 @@
 		
 		<div class="panel-body">
 			<div class="table-responsive">
-				<a href="/lams/tool/<%= CentralConstants.TOOL_SIGNATURE_FORUM %>/learning/viewForum.do?toolSessionID=${toolSession.toolSessionId}&mode=teacher&hideReflection=true" target="_blank" class="btn btn-default btn-sm">
+				<a href="/lams/tool/<%= CommonConstants.TOOL_SIGNATURE_FORUM %>/learning/viewForum.do?toolSessionID=${toolSession.toolSessionId}&mode=teacher&hideReflection=true" target="_blank" class="btn btn-default btn-sm">
 					<i class="fa fa-comments"></i> <fmt:message key="label.view.forum" />
 				</a>
 			</div>
Index: lams_monitoring/web/tblmonitor/peerreview.jsp
===================================================================
diff -u -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_monitoring/web/tblmonitor/peerreview.jsp	(.../peerreview.jsp)	(revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b)
+++ lams_monitoring/web/tblmonitor/peerreview.jsp	(.../peerreview.jsp)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -1,5 +1,5 @@
 <%@ include file="/template/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.util.CentralConstants"%>
+<%@ page import="org.lamsfoundation.lams.util.CommonConstants"%>
 <script>
 	$(document).ready(function(){
 		//insert total learners number taken from the parent tblmonitor.jsp
@@ -48,7 +48,7 @@
 		
 		<div class="panel-body">
 			<div class="table-responsive">
-				<a href="/lams/tool/<%= CentralConstants.TOOL_SIGNATURE_FORUM %>/learning/viewForum.do?toolSessionID=${toolSession.toolSessionId}&mode=teacher&hideReflection=true" target="_blank" class="btn btn-default btn-sm">
+				<a href="/lams/tool/<%= CommonConstants.TOOL_SIGNATURE_FORUM %>/learning/viewForum.do?toolSessionID=${toolSession.toolSessionId}&mode=teacher&hideReflection=true" target="_blank" class="btn btn-default btn-sm">
 					<i class="fa fa-comments"></i> <fmt:message key="label.view.forum" />
 				</a>
 			</div>
Index: lams_tool_assessment/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_assessment/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_assessment/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
 		<attributes>
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -rb32657226efa9a6bb90a1c12a69e82a5acde2e80 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision b32657226efa9a6bb90a1c12a69e82a5acde2e80)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -60,7 +60,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.questions.Answer;
 import org.lamsfoundation.lams.questions.Question;
@@ -81,6 +80,7 @@
 import org.lamsfoundation.lams.tool.assessment.web.form.AssessmentForm;
 import org.lamsfoundation.lams.tool.assessment.web.form.AssessmentQuestionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -436,7 +436,7 @@
 
 	assessmentForm.setAssessment(assessmentPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 	return mapping.findForward("author");
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_bbb/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_bbb/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_bbb/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -5,7 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE13_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -32,18 +32,17 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.actions.DispatchAction;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.bbb.model.Bbb;
 import org.lamsfoundation.lams.tool.bbb.service.BbbServiceProxy;
 import org.lamsfoundation.lams.tool.bbb.service.IBbbService;
 import org.lamsfoundation.lams.tool.bbb.util.Constants;
 import org.lamsfoundation.lams.tool.bbb.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -146,7 +145,7 @@
 
 	bbbService.saveOrUpdateBbb(bbb);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,8 +26,8 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 
 /**
  * This class give a chance to clear HttpSession when user save/close authoring page.
Index: lams_tool_chat/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_chat/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_chat/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -33,12 +33,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.chat.model.Chat;
@@ -47,6 +45,7 @@
 import org.lamsfoundation.lams.tool.chat.service.IChatService;
 import org.lamsfoundation.lams.tool.chat.util.ChatConstants;
 import org.lamsfoundation.lams.tool.chat.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -164,7 +163,7 @@
 
 	chatService.saveOrUpdateChat(chat);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java	(.../ChatConditionForm.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java	(.../ChatConditionForm.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -1,7 +1,7 @@
 package org.lamsfoundation.lams.tool.chat.web.forms;
 
 import org.lamsfoundation.lams.tool.chat.model.ChatCondition;
-import org.lamsfoundation.lams.web.TextSearchActionForm;
+import org.lamsfoundation.lams.web.form.TextSearchActionForm;
 
 /**
  * A text search form with additional parameters for Chat needs.
Index: lams_tool_daco/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_daco/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_daco/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -14,7 +14,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -53,7 +53,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.daco.DacoConstants;
 import org.lamsfoundation.lams.tool.daco.model.Daco;
@@ -66,6 +65,7 @@
 import org.lamsfoundation.lams.tool.daco.web.form.DacoForm;
 import org.lamsfoundation.lams.tool.daco.web.form.DacoQuestionForm;
 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;
@@ -820,7 +820,7 @@
 	}
 	dacoForm.setDaco(dacoPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	return mapping.findForward(DacoConstants.SUCCESS);
     }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java
===================================================================
diff -u -r412fe7a30d27bd7402ae872029af8dd655d4a638 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 412fe7a30d27bd7402ae872029af8dd655d4a638)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
===================================================================
diff -u -reeb8faaea5372ccf5445d7172f726931e9f26098 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision eeb8faaea5372ccf5445d7172f726931e9f26098)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -62,7 +62,7 @@
 import org.lamsfoundation.lams.tool.daco.service.IDacoService;
 import org.lamsfoundation.lams.tool.daco.util.DacoExcelUtil;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -480,9 +480,9 @@
 	// Prepare response headers
 	String fileName = DacoConstants.EXPORT_TO_SPREADSHEET_FILE_NAME;
 	fileName = FileUtil.encodeFilenameForDownload(request, fileName);
-	response.setContentType(CentralConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD);
-	response.setHeader(CentralConstants.HEADER_CONTENT_DISPOSITION,
-		CentralConstants.HEADER_CONTENT_ATTACHMENT + fileName);
+	response.setContentType(CommonConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD);
+	response.setHeader(CommonConstants.HEADER_CONTENT_DISPOSITION,
+		CommonConstants.HEADER_CONTENT_ATTACHMENT + fileName);
 	MonitoringAction.log.debug("Exporting to a spreadsheet tool content with UID: " + daco.getUid());
 	ServletOutputStream out = response.getOutputStream();
 
Index: lams_tool_doku/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_doku/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_doku/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
===================================================================
diff -u -ree6e1d2416d85cca9e842ee818489bbb94ed27ed -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision ee6e1d2416d85cca9e842ee818489bbb94ed27ed)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -32,20 +32,19 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants;
 import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran;
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
 import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
 import org.lamsfoundation.lams.tool.dokumaran.web.form.DokumaranForm;
 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;
@@ -242,7 +241,7 @@
 
 	dokumaranForm.setDokumaran(dokumaranPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 	
 	return mapping.findForward(DokumaranConstants.SUCCESS);
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_eadventure/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_eadventure/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_eadventure/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
Index: lams_tool_forum/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_forum/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_forum/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -9,7 +9,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r28c1edeb0c0a2c65e829deeeaa0ad4e8c7226a58 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 28c1edeb0c0a2c65e829deeeaa0ad4e8c7226a58)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -52,7 +52,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
@@ -65,13 +64,13 @@
 import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
 import org.lamsfoundation.lams.tool.forum.service.IForumService;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
-import org.lamsfoundation.lams.tool.forum.util.ForumWebUtils;
 import org.lamsfoundation.lams.tool.forum.util.MessageComparator;
 import org.lamsfoundation.lams.tool.forum.util.MessageDtoComparator;
 import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.ForumPedagogicalPlannerForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
 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;
@@ -402,7 +401,7 @@
 
 	forum = forumService.updateForum(forum);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward("success");
     }
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java	(.../ForumConditionForm.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java	(.../ForumConditionForm.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 import org.apache.struts.util.LabelValueBean;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
-import org.lamsfoundation.lams.web.TextSearchActionForm;
+import org.lamsfoundation.lams.web.form.TextSearchActionForm;
 
 /**
  * A text search form with additional parameters for Forum needs.
Index: lams_tool_gmap/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_gmap/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_gmap/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -16,7 +16,6 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/lams_common/src/java/org/lamsfoundation/lams/dao/hibernate"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -36,7 +36,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
 import org.lamsfoundation.lams.tool.gmap.model.GmapConfigItem;
@@ -47,6 +46,7 @@
 import org.lamsfoundation.lams.tool.gmap.util.GmapConstants;
 import org.lamsfoundation.lams.tool.gmap.web.forms.AuthoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -172,7 +172,7 @@
 
 	gmapService.saveOrUpdateGmap(gmap);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_images/.classpath
===================================================================
diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_images/.classpath	(.../.classpath)	(revision 4338c54ef39ccdab47dc95d28deec40f23059633)
+++ lams_tool_images/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
diff -u -rc0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision c0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -50,7 +50,6 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
-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;
@@ -66,6 +65,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.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -373,7 +373,7 @@
 	}
 	imageGalleryForm.setImageGallery(imageGalleryPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_imscc/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_imscc/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_imscc/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -5,7 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
 		<attributes>
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -52,7 +52,6 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants;
 import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge;
@@ -66,6 +65,7 @@
 import org.lamsfoundation.lams.tool.commonCartridge.web.form.CommonCartridgeItemForm;
 import org.lamsfoundation.lams.tool.commonCartridge.web.form.CommonCartridgePedagogicalPlannerForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -535,7 +535,7 @@
 
 	commonCartridgeForm.setCommonCartridge(commonCartridgePO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward(CommonCartridgeConstants.SUCCESS);
     }
 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	(.../LearningAction.java)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -59,7 +59,7 @@
 import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeItemComparator;
 import org.lamsfoundation.lams.tool.commonCartridge.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.CentralConstants;
+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;
@@ -229,7 +229,7 @@
 	    redirect.addParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    redirect.addParameter(CommonCartridgeConstants.ATTR_TOOL_SESSION_ID, sessionId);
 	    redirect.addParameter(CommonCartridgeConstants.ATTR_RESOURCE_ITEM_UID, runAutoItemUid);
-	    redirect.addParameter(CentralConstants.PARAM_MODE, mode.toString());
+	    redirect.addParameter(CommonConstants.PARAM_MODE, mode.toString());
 	    return redirect;
 	    
 	} else {
Index: lams_tool_kaltura/.classpath
===================================================================
diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_kaltura/.classpath	(.../.classpath)	(revision 4338c54ef39ccdab47dc95d28deec40f23059633)
+++ lams_tool_kaltura/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -45,7 +45,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.tomcat.util.json.JSONException;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem;
@@ -57,6 +56,7 @@
 import org.lamsfoundation.lams.tool.kaltura.util.KalturaItemComparator;
 import org.lamsfoundation.lams.tool.kaltura.web.forms.AuthoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -211,7 +211,7 @@
 
 	kalturaService.saveOrUpdateKaltura(kaltura);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(sessionMap.getSessionID());
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_lamc/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_lamc/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_lamc/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
===================================================================
diff -u -r4170df8bc66e658ef4dcd47e99eceddec3c2673a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 4170df8bc66e658ef4dcd47e99eceddec3c2673a)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java	(.../McAction.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java	(.../McAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -41,7 +41,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.questions.Answer;
 import org.lamsfoundation.lams.questions.Question;
 import org.lamsfoundation.lams.questions.QuestionExporter;
@@ -56,6 +55,7 @@
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
 import org.lamsfoundation.lams.tool.mc.util.AuthoringUtil;
 import org.lamsfoundation.lams.tool.mc.web.form.McAuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -145,7 +145,7 @@
 	    }
 	}
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward(McAppConstants.LOAD_AUTHORING);
     }
 
Index: lams_tool_laqa/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_laqa/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_laqa/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java
===================================================================
diff -u -r32eb376c59d7c17cfa9d51cac14c00aae8cf44ff -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 32eb376c59d7c17cfa9d51cac14c00aae8cf44ff)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java
===================================================================
diff -u -r32eb376c59d7c17cfa9d51cac14c00aae8cf44ff -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java	(.../QaAction.java)	(revision 32eb376c59d7c17cfa9d51cac14c00aae8cf44ff)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java	(.../QaAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -40,14 +40,12 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 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.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -65,6 +63,7 @@
 import org.lamsfoundation.lams.tool.qa.util.QaUtils;
 import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -182,7 +181,7 @@
 
 	    QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
 
-	    request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	    request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	} else {
 	    if (qaContent != null) {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java	(.../QaConditionForm.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java	(.../QaConditionForm.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 import org.apache.struts.util.LabelValueBean;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
-import org.lamsfoundation.lams.web.TextSearchActionForm;
+import org.lamsfoundation.lams.web.form.TextSearchActionForm;
 
 /**
  * A text search form with additional parameters for Q&A needs.
Index: lams_tool_larsrc/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_larsrc/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_larsrc/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -ra52b4696862966c0db79293bfae9bf7894e8baeb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a52b4696862966c0db79293bfae9bf7894e8baeb)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -57,7 +57,6 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
-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;
@@ -73,6 +72,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.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -617,7 +617,7 @@
 	}
 	resourceForm.setResource(resourcePO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	
 	return mapping.findForward(ResourceConstants.SUCCESS);
     }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
===================================================================
diff -u -r16ce604dcc21fbcf8b462fe28d660723ff7c925a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 16ce604dcc21fbcf8b462fe28d660723ff7c925a)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_leader/.classpath
===================================================================
diff -u -r4338c54ef39ccdab47dc95d28deec40f23059633 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_leader/.classpath	(.../.classpath)	(revision 4338c54ef39ccdab47dc95d28deec40f23059633)
+++ lams_tool_leader/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -29,18 +29,17 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.leaderselection.model.Leaderselection;
 import org.lamsfoundation.lams.tool.leaderselection.service.ILeaderselectionService;
 import org.lamsfoundation.lams.tool.leaderselection.service.LeaderselectionServiceProxy;
 import org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionConstants;
 import org.lamsfoundation.lams.tool.leaderselection.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -149,7 +148,7 @@
 
 	leaderselectionService.saveOrUpdateLeaderselection(leaderselection);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_mindmap/.classpath
===================================================================
diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_mindmap/.classpath	(.../.classpath)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
+++ lams_tool_mindmap/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
 		<attributes>
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r960e6b751430fc4832cf844b878fc470d99ad118 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 960e6b751430fc4832cf844b878fc470d99ad118)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -37,7 +37,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.mindmap.dto.RootJSON;
 import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
@@ -49,6 +48,7 @@
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel;
 import org.lamsfoundation.lams.tool.mindmap.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -198,7 +198,7 @@
 
 	mindmapService.saveOrUpdateMindmap(mindmap);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_nb/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_nb/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_nb/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java
===================================================================
diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 983160690fed1d94b51c2ea9206c58093a29040d)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java
===================================================================
diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 983160690fed1d94b51c2ea9206c58093a29040d)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -33,7 +33,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.util.MessageResources;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
@@ -43,6 +42,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil;
 import org.lamsfoundation.lams.tool.noticeboard.web.form.NbAuthoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -213,7 +213,7 @@
 	nbContent.setDefineLater(false);
 	nbService.saveNoticeboard(nbContent);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE);
 
     }
Index: lams_tool_notebook/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_notebook/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_notebook/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -34,12 +34,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
@@ -48,6 +46,7 @@
 import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy;
 import org.lamsfoundation.lams.tool.notebook.util.NotebookConstants;
 import org.lamsfoundation.lams.tool.notebook.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -173,7 +172,7 @@
 
 	notebookService.saveOrUpdateNotebook(notebook);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java	(.../NotebookConditionForm.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java	(.../NotebookConditionForm.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -1,7 +1,7 @@
 package org.lamsfoundation.lams.tool.notebook.web.forms;
 
 import org.lamsfoundation.lams.tool.notebook.model.NotebookCondition;
-import org.lamsfoundation.lams.web.TextSearchActionForm;
+import org.lamsfoundation.lams.web.form.TextSearchActionForm;
 
 /**
  * A text search form with additional parameters for Notebook needs.
Index: lams_tool_pixlr/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_pixlr/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_pixlr/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
===================================================================
diff -u -rf89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision f89d4cdd9372cf33b62ae45d3a7b9d4100f4f6b3)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -42,14 +42,14 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
 import org.lamsfoundation.lams.tool.pixlr.service.IPixlrService;
 import org.lamsfoundation.lams.tool.pixlr.service.PixlrServiceProxy;
 import org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants;
 import org.lamsfoundation.lams.tool.pixlr.util.PixlrException;
 import org.lamsfoundation.lams.tool.pixlr.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileUtil;
@@ -195,7 +195,7 @@
 
 	pixlrService.saveOrUpdatePixlr(pixlr);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_preview/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_preview/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_preview/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -5,7 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
 		<attributes>
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -33,14 +33,11 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessages;
-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.peerreview.PeerreviewConstants;
@@ -49,6 +46,7 @@
 import org.lamsfoundation.lams.tool.peerreview.service.IPeerreviewService;
 import org.lamsfoundation.lams.tool.peerreview.web.form.PeerreviewForm;
 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;
@@ -252,7 +250,7 @@
 
 	peerreviewForm.setPeerreview(peerreviewPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward(PeerreviewConstants.SUCCESS);
     }
 
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_sbmt/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_sbmt/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_sbmt/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -14,7 +14,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -39,14 +39,14 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.web.form.AuthoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -174,7 +174,7 @@
 	submitFilesService.saveOrUpdateContent(persistContent);
 
 	// to jump to common success page in lams_central
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward("success");
     }
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java
===================================================================
diff -u -ra4e51b53558198aa759795a1d5268bd99dd119c4 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision a4e51b53558198aa759795a1d5268bd99dd119c4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_scratchie/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_scratchie/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_scratchie/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -19,7 +19,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-1.7.2.jbossorg-1.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/websocket"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
diff -u -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -45,15 +45,13 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.questions.Answer;
 import org.lamsfoundation.lams.questions.Question;
@@ -71,6 +69,7 @@
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchieForm;
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchieItemForm;
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchiePedagogicalPlannerForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -377,7 +376,7 @@
 
 	scratchieForm.setScratchie(scratchiePO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
 	return mapping.findForward("author");
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_scribe/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_scribe/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_scribe/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/websocket"/>
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -35,19 +35,18 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading;
 import org.lamsfoundation.lams.tool.scribe.service.IScribeService;
 import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy;
 import org.lamsfoundation.lams.tool.scribe.util.ScribeConstants;
 import org.lamsfoundation.lams.tool.scribe.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -210,7 +209,7 @@
 
 	scribeService.saveOrUpdateScribe(scribe);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_spreadsheet/.classpath
===================================================================
diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_spreadsheet/.classpath	(.../.classpath)	(revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a)
+++ lams_tool_spreadsheet/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -32,20 +32,19 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-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;
@@ -233,7 +232,7 @@
 
 	spreadsheetForm.setSpreadsheet(spreadsheetPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward(SpreadsheetConstants.SUCCESS);
     }
 
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_survey/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_survey/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_survey/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -r0138aabe01dc8f301e7c727bd39e97424b4fa38a -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0138aabe01dc8f301e7c727bd39e97424b4fa38a)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -53,7 +53,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-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;
@@ -69,6 +68,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.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -622,7 +622,7 @@
 
 	surveyForm.setSurvey(surveyPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward(SurveyConstants.SUCCESS);
     }
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java	(.../SurveyConditionForm.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java	(.../SurveyConditionForm.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 import org.apache.struts.util.LabelValueBean;
 import org.lamsfoundation.lams.tool.survey.model.SurveyCondition;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
-import org.lamsfoundation.lams.web.TextSearchActionForm;
+import org.lamsfoundation.lams.web.form.TextSearchActionForm;
 
 /**
  * A text search form with additional parameters for Survey needs.
Index: lams_tool_task/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_task/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_task/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -14,7 +14,6 @@
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -r125488b240966768429db725f4eaa19c425d8964 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 125488b240966768429db725f4eaa19c425d8964)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -51,7 +51,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-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;
@@ -66,6 +65,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.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -412,7 +412,7 @@
 
 	taskListForm.setTaskList(taskListPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return mapping.findForward(TaskListConstants.SUCCESS);
     }
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_videorecorder/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_videorecorder/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_videorecorder/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
Index: lams_tool_vote/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_vote/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_vote/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
===================================================================
diff -u -r571d64337ed3fb6a9733a5214180fd4a5c6d6292 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 571d64337ed3fb6a9733a5214180fd4a5c6d6292)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -37,15 +37,13 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.Globals;
 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.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.DataFlowObject;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
@@ -60,6 +58,7 @@
 import org.lamsfoundation.lams.tool.vote.util.VoteUtils;
 import org.lamsfoundation.lams.tool.vote.web.form.VoteAuthoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -813,7 +812,7 @@
 	    }
 
 	    // standard authoring close
-	    request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	    request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	}
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
===================================================================
diff -u -r571d64337ed3fb6a9733a5214180fd4a5c6d6292 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 571d64337ed3fb6a9733a5214180fd4a5c6d6292)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,22 +26,22 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
+import org.lamsfoundation.lams.util.CommonConstants;
 
 /**
  * This class give a chance to clear HttpSession when user save/close authoring page.
  *
  * @author Steve.Ni, Ozgur Demirtas
  */
-public class ClearSessionAction extends LamsAuthoringFinishAction implements VoteAppConstants {
+public class ClearSessionAction extends LamsAuthoringFinishAction {
     private static Logger logger = Logger.getLogger(ClearSessionAction.class.getName());
 
     @Override
     public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
-	session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
+	session.removeAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG);
 	if (mode.isAuthor()) {
 	    ClearSessionAction.logger.debug("In Author mode");
 	    session.removeAttribute(customiseSessionID);
Index: lams_tool_wiki/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_wiki/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_wiki/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -9,7 +9,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -31,12 +31,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiPageContentDTO;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiPageDTO;
@@ -48,6 +46,7 @@
 import org.lamsfoundation.lams.tool.wiki.service.WikiServiceProxy;
 import org.lamsfoundation.lams.tool.wiki.util.WikiConstants;
 import org.lamsfoundation.lams.tool.wiki.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -248,7 +247,7 @@
 
 	wikiService.saveOrUpdateWiki(wiki);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
 	authForm.setSessionMapID(map.getSessionID());
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -26,7 +26,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 
 /**
Index: lams_tool_wookie/.classpath
===================================================================
diff -u -rf4502360cd44d86d57b095aea5aef7ce663c8b61 -r8236da64800893104429c9b88f89d500c505a9a1
--- lams_tool_wookie/.classpath	(.../.classpath)	(revision f4502360cd44d86d57b095aea5aef7ce663c8b61)
+++ lams_tool_wookie/.classpath	(.../.classpath)	(revision 8236da64800893104429c9b88f89d500c505a9a1)
@@ -15,7 +15,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">