Index: lams_central/web/includes/javascript/dialog.js
===================================================================
diff -u -ra87fc96c97da931cd385ab998a421b5a3d2b4e90 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision a87fc96c97da931cd385ab998a421b5a3d2b4e90)
+++ lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -337,7 +337,7 @@
 			}
 			
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', url);
+			$('iframe', this).attr({'src' : url, 'id' : 'authoringModal'});
 		}
 	}, true);
 	
Index: lams_tool_assessment/.classpath
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/.classpath	(.../.classpath)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/.classpath	(.../.classpath)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -4,9 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<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/"/>
@@ -28,6 +25,5 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-1.7.7.jbossorg-1.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_gradebook"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -28,8 +28,6 @@
 
     public static final String ASSESSMENT_SERVICE = "laasseAssessmentService";
 
-    public static final String TOOL_CONTENT_HANDLER_NAME = "laasseAssessmentToolContentHandler";
-
     public static final int COMPLETED = 1;
 
     public static final int INITIAL_OPTIONS_NUMBER = 3;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -56,7 +56,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.questions.Answer;
 import org.lamsfoundation.lams.questions.Question;
@@ -76,6 +75,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;
@@ -99,11 +99,11 @@
 public class AuthoringController {
 
     private static Logger log = Logger.getLogger(AuthoringController.class);
-    
+
     @Autowired
     @Qualifier("laasseAssessmentService")
     private IAssessmentService service;
-    
+
     /**
      * Read assessment data from database and put them into HttpSession. It will redirect to init.do directly after this
      * method run successfully.
@@ -197,7 +197,8 @@
      * Display same entire authoring page content from HttpSession variable.
      */
     @RequestMapping("/init")
-    public String init(@ModelAttribute("assessmentForm") AssessmentForm assessmentForm, HttpServletRequest request) throws ServletException {
+    public String init(@ModelAttribute("assessmentForm") AssessmentForm assessmentForm, HttpServletRequest request)
+	    throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
@@ -337,7 +338,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 "pages/authoring/authoring";
     }
@@ -1397,7 +1398,7 @@
     // *************************************************************************************
     // Private methods
     // *************************************************************************************
-    
+
     /**
      * refreshes set of all available questions for adding to question list
      *
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/ClearSessionController.java
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -29,8 +29,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishController;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.web.controller.LamsAuthoringFinishController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -50,8 +50,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
-import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
+import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
@@ -99,11 +98,11 @@
 public class LearningController {
 
     private static Logger log = Logger.getLogger(LearningController.class);
-    
+
     @Autowired
     @Qualifier("laasseAssessmentService")
     private IAssessmentService service;
-    
+
     @Autowired
     private WebApplicationContext applicationContext;
 
@@ -265,8 +264,8 @@
 	boolean isTimeLimitNotLaunched = (lastResult == null) || (lastResult.getTimeLimitLaunchedDate() == null);
 	sessionMap.put(AssessmentConstants.ATTR_IS_TIME_LIMIT_NOT_LAUNCHED, isTimeLimitNotLaunched);
 
-	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(
-		toolSessionId, request, applicationContext.getServletContext());
+	ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId,
+		request, applicationContext.getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
 
 	// add define later support
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -41,7 +41,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.gradebook.util.GradebookConstants;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
@@ -60,6 +59,7 @@
 import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.ExcelCell;
 import org.lamsfoundation.lams.util.ExcelUtil;
@@ -88,8 +88,7 @@
     private IAssessmentService service;
 
     @RequestMapping("/summary")
-    public String summary(HttpServletRequest request,
-	    HttpServletResponse response) {
+    public String summary(HttpServletRequest request, HttpServletResponse response) {
 
 	// initialize Session Map
 	SessionMap<String, Object> sessionMap = new SessionMap<>();
@@ -170,8 +169,7 @@
     }
 
     @RequestMapping("/questionSummary")
-    public String questionSummary(HttpServletRequest request,
-	    HttpServletResponse response) {
+    public String questionSummary(HttpServletRequest request, HttpServletResponse response) {
 	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
@@ -292,10 +290,10 @@
 	Long sessionId = WebUtil.readLongParam(request, "sessionId");
 
 	// Getting the params passed in from the jqGrid
-	int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE);
-	int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS);
-	String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD);
-	String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true);
+	int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE);
+	int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS);
+	String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD);
+	String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true);
 	if (StringUtils.isEmpty(sortBy)) {
 	    sortBy = "userName";
 	}
@@ -381,10 +379,10 @@
 	Long questionUid = WebUtil.readLongParam(request, "questionUid");
 
 	// Getting the params passed in from the jqGrid
-	int page = WebUtil.readIntParam(request, GradebookConstants.PARAM_PAGE);
-	int rowLimit = WebUtil.readIntParam(request, GradebookConstants.PARAM_ROWS);
-	String sortOrder = WebUtil.readStrParam(request, GradebookConstants.PARAM_SORD);
-	String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true);
+	int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE);
+	int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS);
+	String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD);
+	String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true);
 	if (StringUtils.isEmpty(sortBy)) {
 	    sortBy = "userName";
 	}
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -338,6 +338,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7a37ae5049a14049cacb3d0d3423362ce92993e6
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7a37ae5049a14049cacb3d0d3423362ce92993e6)
@@ -237,6 +237,8 @@
 </iframe>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.assessment.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 <div class="checkbox">