Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -r02b7745104a10404abfeea41af4de53017b6475d
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 02b7745104a10404abfeea41af4de53017b6475d)
@@ -190,11 +190,6 @@
 			type="org.lamsfoundation.lams.tool.assessment.web.action.LearningAction"
 			parameter="submitAll" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
-		</action>		
-		<action path="/learning/finishTest"
-			type="org.lamsfoundation.lams.tool.assessment.web.action.LearningAction"
-			parameter="finishTest" >
-			<forward name="success" path="/pages/learning/learning.jsp" />
 		</action>
 		<action path="/learning/resubmit"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.LearningAction"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r56a5f8af58bd37b41623b4613fed7b494f76a891 -r02b7745104a10404abfeea41af4de53017b6475d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 56a5f8af58bd37b41623b4613fed7b494f76a891)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 02b7745104a10404abfeea41af4de53017b6475d)
@@ -91,9 +91,6 @@
 	if (param.equals("submitAll")) {
 	    return submitAll(mapping, form, request, response);
 	}
-	if (param.equals("finishTest")) {
-	    return finishTest(mapping, form, request, response);
-	}
 	if (param.equals("resubmit")) {
 	    return resubmit(mapping, form, request, response);
 	}	
@@ -323,41 +320,6 @@
 	sessionMap.put(AssessmentConstants.ATTR_FINISHED_LOCK, true);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
-    }    
-    
-    /**
-     * Display same entire authoring page content from HttpSession variable.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws ServletException
-     */
-    private ActionForward finishTest(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ServletException {
-	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	preserveUserAnswers(request);
-	processUserAnswers(sessionMap);
-	loadupResultMarks(sessionMap);
-	
-	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-	IAssessmentService service = getAssessmentService();
-	try {
-	    HttpSession ss = SessionManager.getSession();
-	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	    Long userID = new Long(user.getUserID().longValue());
-	    service.finishToolSession(sessionId, userID);
-	} catch (AssessmentApplicationException e) {
-	    LearningAction.log.error("Failed finishing tool session:" + e.getMessage());
-	}
-	
-	sessionMap.put(AssessmentConstants.ATTR_IS_RESUBMIT_ALLOWED, false);
-	sessionMap.put(AssessmentConstants.ATTR_FINISHED_LOCK, true);
-	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(AssessmentConstants.SUCCESS);
     }   
     
     /**
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r3d1f93045d6b547df27e59a090cfbe618ae273fe -r02b7745104a10404abfeea41af4de53017b6475d
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3d1f93045d6b547df27e59a090cfbe618ae273fe)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 02b7745104a10404abfeea41af4de53017b6475d)
@@ -103,11 +103,6 @@
         	var myForm = $("#answers");
         	myForm.attr("action", "<c:url value='/learning/nextPage.do?sessionMapID=${sessionMapID}&pageNumber='/>" + pageNumber + "&secondsLeft=" + secondsLeft);
         	myForm.submit();
-		}		
-		function finishTest(){
-        	var myForm = $("#answers");
-        	myForm.attr("action", "<c:url value='/learning/finishTest.do?sessionMapID=${sessionMapID}'/>");
-        	myForm.submit();
 		}
 		function submitAll(){
         	var myForm = $("#answers");
@@ -239,10 +234,7 @@
 		<c:if test="${mode != 'teacher'}">
 			<div class="space-bottom-top align-right">
 				<c:choose>
-					<c:when	test="${not finishedLock}">
-						<html:button property="finishTest" onclick="return finishTest();" styleClass="button">
-							<fmt:message key="label.learning.finish.test" />
-						</html:button>					
+					<c:when	test="${not finishedLock}">					
 						<html:button property="submitAll" onclick="return submitAll();" styleClass="button">
 							<fmt:message key="label.learning.submit.all" />
 						</html:button>