Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rbbcfb64b7bb6d251110a5a26299604958c4bc5b2 -r65ed4da382b320542dcd88cb1375662dcfac8769
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rbbcfb64b7bb6d251110a5a26299604958c4bc5b2 -r65ed4da382b320542dcd88cb1375662dcfac8769
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bbcfb64b7bb6d251110a5a26299604958c4bc5b2)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -394,4 +394,9 @@
 label.tab.conditions.timelimit.individual =Is this time limit for each individual?
 label.tab.conditions.enable =Enable
 label.tab.conditions.dependencies.desc =Select a lesson that students will need to complete before they can see the lesson you are about to create.
+label.questions.file.title =Choose IMS QTI file
+label.questions.file.missing =Please select a ZIP file with questions in IMS QTI format.
+label.questions.choice.title =Choose questions
+label.questions.choice.select.all =Select all
+label.questions.choice.missing =Please check at least one question.
 #======= End labels: Exported 345 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -0,0 +1,72 @@
+package org.lamsfoundation.lams.web;
+
+import java.io.InputStream;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.fileupload.DiskFileUpload;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.Globals;
+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.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.questions.Question;
+import org.lamsfoundation.lams.questions.QuestionParser;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+
+/**
+ * Runs extraction of chosen IMS QTI zip file and prepares form for user to manually choose interesting question.
+ * 
+ * @struts.action path="/questions" validate="false"
+ * @struts.action-forward name="questionChoice" path="/questionChoice.jsp"
+ * @struts.action-forward name="questionFile" path="/questionFile.jsp"
+ */
+public class QuestionsAction extends Action {
+    @SuppressWarnings("unchecked")
+    @Override
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	// cumberstone way of extracting POSTed form with a file
+	DiskFileUpload formParser = new DiskFileUpload();
+	formParser.setRepositoryPath(Configuration.get(ConfigurationKeys.LAMS_TEMP_DIR));
+	List<FileItem> formFields = formParser.parseRequest(request);
+
+	String returnURL = null;
+	Boolean chooseAnswers = null;
+	InputStream packageFileStream = null;
+	for (FileItem formField : formFields) {
+	    String fieldName = formField.getFieldName();
+	    if ("returnURL".equals(fieldName)) {
+		// this can be empty; if so, another method of delivering results is used
+		returnURL = formField.getString();
+	    } else if ("chooseAnswers".equals(fieldName)) {
+		chooseAnswers = Boolean.parseBoolean(formField.getString());
+	    } else if ("file".equals(fieldName) && !StringUtils.isBlank(formField.getName())) {
+		packageFileStream = formField.getInputStream();
+	    }
+	}
+
+	request.setAttribute("returnURL", returnURL);
+	request.setAttribute("chooseAnswers", chooseAnswers);
+
+	// user did not choose a file
+	if (packageFileStream == null) {
+	    ActionMessages errors = new ActionMessages();
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("label.questions.file.missing"));
+	    request.setAttribute(Globals.ERROR_KEY, errors);
+	    return mapping.findForward("questionFile");
+	}
+
+	Question[] questions = QuestionParser.parseQTIPackage(packageFileStream);
+	request.setAttribute("questions", questions);
+
+	return mapping.findForward("questionChoice");
+    }
+}
\ No newline at end of file
Index: lams_central/web/questionChoice.jsp
===================================================================
diff -u
--- lams_central/web/questionChoice.jsp	(revision 0)
+++ lams_central/web/questionChoice.jsp	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="title.lams" /> :: <fmt:message key="label.questions.choice.title" /></title>
+	<lams:css/>	
+	<style type="text/css">
+		div.answerDiv {
+			padding-left: 20px;
+			display: none;
+		}
+		
+		input[type="checkbox"] {
+			border: none;
+			margin: 10px 10px 0px 15px;
+		}
+		
+		div.answerDiv input {
+			margin-top: 5px;
+		}
+		
+		.button {
+			float: right;
+			margin-left: 10px;
+		}
+		
+		#buttonsDiv {
+			padding: 15px 0px 15px 0px;
+		}
+		
+		div#errorArea {
+			display: none;
+		}
+	</style>
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript">
+		window.resizeTo(800, 600);
+	
+		var returnURL = '${returnURL}';
+		var chooseAnswers = '${chooseAnswers}';
+		
+		function submitForm() {
+			var anyQuestionsSelected = false;
+			$('.question').each(function(){
+				if ($(this).is(':checked')) {
+					anyQuestionsSelected = true;
+					return false;
+				}
+			});
+			
+			if (anyQuestionsSelected) {
+				if (returnURL == '') {
+					var queryString = $('#questionForm').formSerialize();
+					window.opener.saveQTI(queryString);
+				} else {
+					$('#questionForm').ajaxSubmit({
+						'success' : function(){
+							window.opener.location.reload();	
+					}});
+				}
+				window.close();
+			} else {
+				$('#errorArea').show();
+			}
+		}
+		
+		$(document).ready(function(){
+			if (chooseAnswers == 'true') {
+				$('.question').change(function(){
+					var checked = $(this).is(':checked');
+					var selector = '#' + $(this).attr('id');
+					
+					// enable/disable answers and feedback fields
+					// so they do not get posted when not needed
+					$(selector + 'answerDiv').toggle('slow')
+					    .find('input')
+					    .add(selector + 'feedback')
+					    .attr('disabled', checked ? null : 'disabled');
+					
+					if (checked) {
+						$('#errorArea').hide('slow');
+					} else {
+						// one unchecked question makes "Select all" checkbox uncheck as well
+						$('#selectAll').attr('checked', false);
+					}
+				});
+			}
+			
+			$('#selectAll').click(function(){
+				var checked = $(this).is(':checked');
+				
+				$('.question').attr('checked', checked);
+				$('.questionFeedback').attr('disabled', checked ? null : 'disabled');
+				if (checked) {
+					$('#errorArea').hide('slow');
+				}
+				
+				if (chooseAnswers == 'true') {
+					if (checked) {
+						$('.answerDiv').show('slow')
+						  .find('input').attr('disabled', null);
+					} else {
+						$('.answerDiv').hide('slow')
+						   .find('input').attr('disabled', 'disabled');
+					}
+				}
+			});
+		});
+	</script>
+</lams:head>
+
+<body class="stripes">
+<div id="content">
+	<div id="errorArea" class="warning" >
+		<fmt:message key="label.questions.choice.missing" />
+	</div>
+	
+	<h2><fmt:message key="label.questions.choice.title" /></h2>
+	
+	<input id="selectAll" type="checkbox" /><fmt:message key="label.questions.choice.select.all" /><br /><br />
+			       
+	<form id="questionForm" action="${returnURL}">
+		<input type="hidden" name="chooseAnswers" value="${chooseAnswers}" />
+		<input type="hidden" name="questionCount" value="${fn:length(questions)}" />
+		
+		<c:forEach var="question" items="${questions}" varStatus="questionStatus">
+			<!-- Question itself -->
+			<input id="question${questionStatus.index}" name="question${questionStatus.index}"
+			       value="<c:out value='${question.text}' />"
+			       class="question" type="checkbox" />${questionStatus.index + 1}. <c:out value='${question.text}' /><br />
+			<!-- Question feedback -->
+		    <input type="hidden" id="question${questionStatus.index}feedback" name="question${questionStatus.index}feedback"
+		           value="${question.feedback}"
+		           class="questionFeedback" disabled="disabled" />
+		    <!-- Answers, if required and exist -->
+			<c:if test="${chooseAnswers and fn:length(question.answers) > 0}">
+				<div id="question${questionStatus.index}answerDiv" class="answerDiv">
+					<input type="hidden" name="answerCount${questionStatus.index}" value="${fn:length(question.answers)}" />
+					<c:forEach var="answer" items="${question.answers}" varStatus="answerStatus">
+						<!-- Answers itself -->
+						<input name="question${questionStatus.index}answer${answerStatus.index}"
+			       			   value="<c:out value='${answer.text}' />"
+			       			   type="checkbox" checked="checked" disabled="disabled" /><c:out value='${answer.text}' /><br />
+			       		<!-- Answers score and feedback -->
+			       		<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}score"
+						       value="${answer.score}" disabled="disabled" />
+						<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}feedback"
+		           			   value="${answer.feedback}" disabled="disabled" />
+					</c:forEach>
+				</div>
+			</c:if>
+		</c:forEach>
+		
+		<div id="buttonsDiv">
+			<input class="button" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />
+			<input class="button" value='<fmt:message key="label.ok"/>'      type="button" onClick="javascript:submitForm()" />			
+		</div>
+	</form>
+</div>   
+<div id="footer"></div>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/questionFile.jsp
===================================================================
diff -u
--- lams_central/web/questionFile.jsp	(revision 0)
+++ lams_central/web/questionFile.jsp	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="title.lams" /> :: <fmt:message key="label.questions.file.title" /></title>
+	
+	<lams:css/>	
+	<style type="text/css">
+		.button {
+			float: right;
+			margin-left: 10px;
+		}
+		
+		#buttonsDiv {
+			padding: 15px 0px 15px 0px;
+		}
+		
+		div#errorArea {
+			display: none;
+		}
+	</style>
+	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function(){
+	  		if ($.trim($('#errorArea').html()) != "") {
+	  			window.resizeTo(600, 350);
+	  			$('#errorArea').show();
+	  		}
+		});
+	</script>
+</lams:head>
+
+<body class="stripes">
+<div id="content">
+	<div id="errorArea" class="warning" >
+		<html:messages id="error">
+		   <c:out value="${error}" escapeXml="false"/><br/>
+		</html:messages>
+	</div>
+	<h2><fmt:message key="label.questions.file.title" /></h2>
+ 
+	<form id="questionForm" action="<lams:LAMSURL/>questions.do" enctype="multipart/form-data" method="post">
+		<input type="hidden" name="returnURL" value="${empty param.returnURL ? returnURL : param.returnURL}" />
+		<input type="hidden" name="chooseAnswers" value="${empty param.chooseAnswers ? chooseAnswers : param.chooseAnswers}" />
+		
+		<input type="file" name="file" size="55"/>
+		<div id="buttonsDiv">
+			<input class="button" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />	
+			<input class="button" value='<fmt:message key="label.ok"/>' type="submit" />
+		</div>
+	</form>
+</div>   
+<div id="footer"></div>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -0,0 +1,55 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.questions;
+
+
+public class Answer {
+    private String text;
+    private String feedback;
+    private Float score;
+
+    public String getText() {
+	return text;
+    }
+
+    public void setText(String text) {
+	this.text = text;
+    }
+
+    public String getFeedback() {
+	return feedback;
+    }
+
+    public void setFeedback(String feedback) {
+	this.feedback = feedback;
+    }
+
+    public Float getScore() {
+	return score;
+    }
+
+    public void setScore(Float score) {
+	this.score = score;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/questions/Question.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -0,0 +1,56 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.questions;
+
+import java.util.List;
+
+public class Question {
+    private String text;
+    private String feedback;
+    private List<Answer> answers;
+
+    public String getText() {
+	return text;
+    }
+
+    public void setText(String text) {
+	this.text = text;
+    }
+
+    public String getFeedback() {
+	return feedback;
+    }
+
+    public void setFeedback(String feedback) {
+	this.feedback = feedback;
+    }
+
+    public List<Answer> getAnswers() {
+	return answers;
+    }
+
+    public void setAnswers(List<Answer> answers) {
+	this.answers = answers;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -0,0 +1,308 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.questions;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * Extract questions and answers from various formats. They can be later used in question-based tools. Currently it
+ * supports only IMS QTI but other methods can be added as needed.
+ * 
+ * @author Marcin Cieslak
+ * 
+ */
+public class QuestionParser {
+    private static Logger log = Logger.getLogger(QuestionParser.class);
+
+    // just for convenience when returning from methods
+    private static final Question[] QUESTION_ARRAY_TYPE = new Question[] {};
+    // can be anything
+    private static final String TEMP_PACKAGE_NAME_PREFIX = "QTI_PACKAGE_";
+
+    /**
+     * Extracts questions from IMS QTI zip file.
+     */
+    public static Question[] parseQTIPackage(InputStream packageFileStream) throws SAXParseException, IOException,
+	    SAXException, ParserConfigurationException, ZipFileUtilException {
+	List<Question> result = new ArrayList<Question>();
+
+	// unique folder name
+	String tempPackageName = QuestionParser.TEMP_PACKAGE_NAME_PREFIX + System.currentTimeMillis();
+	String tempPackageDirPath = ZipFileUtil.expandZip(packageFileStream, tempPackageName);
+	try {
+	    List<File> resourceFiles = QuestionParser.getQTIResourceFiles(tempPackageDirPath);
+	    if (resourceFiles.isEmpty()) {
+		QuestionParser.log.warn("No resource files found in QTI package");
+	    } else {
+		// extract from every XML file; usually there is just one
+		for (File resourceFile : resourceFiles) {
+		    Question[] fileQuestions = QuestionParser.parseQTIFile(resourceFile);
+		    if (fileQuestions != null) {
+			Collections.addAll(result, fileQuestions);
+		    }
+		}
+	    }
+	} finally {
+	    // clean up
+	    ZipFileUtil.deleteDirectory(tempPackageDirPath);
+	}
+
+	return result.toArray(QuestionParser.QUESTION_ARRAY_TYPE);
+    }
+
+    /**
+     * Extracts questions from IMS QTI xml file.
+     */
+    public static Question[] parseQTIFile(File xmlFile) throws ParserConfigurationException, SAXException, IOException {
+	List<Question> result = new ArrayList<Question>();
+	DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+	Document doc = docBuilder.parse(xmlFile);
+
+	NodeList questionItems = doc.getElementsByTagName("item");
+	// yes, a label here for convenience
+	questionLoop: for (int questionItemIndex = 0; questionItemIndex < questionItems.getLength(); questionItemIndex++) {
+	    Element questionItem = (Element) questionItems.item(questionItemIndex);
+	    NodeList questionItemTypes = questionItem.getElementsByTagName("qmd_itemtype");
+	    String questionItemType = questionItemTypes.getLength() > 0 ? ((Text) questionItemTypes.item(0)
+		    .getChildNodes().item(0)).getData() : null;
+	    if ("Matching".equalsIgnoreCase(questionItemType)) {
+		// do not support matching question type
+		continue;
+	    }
+
+	    Question question = new Question();
+	    Map<String, Answer> answerMap = new TreeMap<String, Answer>();
+
+	    Element presentation = (Element) questionItem.getElementsByTagName("presentation").item(0);
+	    NodeList presentationChildrenList = presentation.getChildNodes();
+	    // cumberstone parsing, but there is no other way using this API
+	    for (int presentationChildIndex = 0; presentationChildIndex < presentationChildrenList.getLength(); presentationChildIndex++) {
+		Node presentationChild = presentationChildrenList.item(presentationChildIndex);
+		// here is where question data is stored
+		if ("material".equals(presentationChild.getNodeName())) {
+		    Element questionElement = (Element) ((Element) presentationChild).getElementsByTagName("mattext")
+			    .item(0);
+		    String questionText = ((CDATASection) questionElement.getChildNodes().item(0)).getData();
+		    if (questionText.trim().startsWith("<!--")) {
+			// do not support algorithmic question type
+			continue questionLoop;
+		    }
+		    question.setText(questionText);
+		} else if ("response_lid".equals(presentationChild.getNodeName())) {
+		    // parse answers
+		    NodeList answerList = ((Element) presentationChild).getElementsByTagName("response_label");
+		    for (int answerIndex = 0; answerIndex < answerList.getLength(); answerIndex++) {
+			Element answerElement = (Element) answerList.item(answerIndex);
+			Element textElement = (Element) answerElement.getElementsByTagName("mattext").item(0);
+			String answerText = ((CDATASection) textElement.getChildNodes().item(0)).getData();
+			Answer answer = new Answer();
+			answer.setText(answerText);
+			if (question.getAnswers() == null) {
+			    question.setAnswers(new ArrayList<Answer>());
+			}
+			question.getAnswers().add(answer);
+
+			// for other metadata parts to find Answer object
+			String answerId = answerElement.getAttribute("ident");
+			answerMap.put(answerId, answer);
+		    }
+		}
+	    }
+
+	    // extract score and feedback
+	    Map<String, String> feedbackMap = new TreeMap<String, String>();
+	    if (!answerMap.isEmpty()) {
+		NodeList answerMetadatas = questionItem.getElementsByTagName("respcondition");
+		for (int answerMetadataIndex = 0; answerMetadataIndex < answerMetadatas.getLength(); answerMetadataIndex++) {
+		    Element answerMetadata = (Element) answerMetadatas.item(answerMetadataIndex);
+		    NodeList scoreReference = answerMetadata.getElementsByTagName("varequal");
+		    // find where given metadata part references to
+		    String answerId = scoreReference.getLength() > 0 ? ((Text) scoreReference.item(0).getChildNodes()
+			    .item(0)).getData() : null;
+
+		    if (answerId != null) {
+			// extract score
+			String score = ((Text) answerMetadata.getElementsByTagName("setvar").item(0).getChildNodes()
+				.item(0)).getData();
+			if (!StringUtils.isBlank(score)) {
+			    Answer answer = answerMap.get(answerId);
+			    answer.setScore(Float.parseFloat(score));
+			}
+
+			// extract question and answer feedback references
+			NodeList feedbacks = answerMetadata.getElementsByTagName("displayfeedback");
+			for (int feedbackIndex = 0; feedbackIndex < feedbacks.getLength(); feedbackIndex++) {
+			    Element feedbackElement = (Element) feedbacks.item(feedbackIndex);
+			    String feedbackId = feedbackElement.getAttribute("linkrefid");
+			    // check if it is not a question feedback
+			    if (!feedbackId.endsWith("_ALL")) {
+				feedbackMap.put(feedbackId, answerId);
+			    }
+			}
+		    }
+		}
+	    }
+
+	    // extract question and answer feedbacks
+	    NodeList feedbacks = questionItem.getElementsByTagName("itemfeedback");
+	    for (int feedbackIndex = 0; feedbackIndex < feedbacks.getLength(); feedbackIndex++) {
+		Element feedbackElement = (Element) feedbacks.item(feedbackIndex);
+		String feedbackText = ((CDATASection) feedbackElement.getElementsByTagName("mattext").item(0)
+			.getChildNodes().item(0)).getData();
+		if (!StringUtils.isBlank(feedbackText)) {
+		    String feedbackType = feedbackElement.getAttribute("view");
+		    // it is a question feedback
+		    if ("All".equalsIgnoreCase(feedbackType)) {
+			question.setFeedback(feedbackText);
+		    } else {
+			// it is an answer feedback
+			String feedbackId = feedbackElement.getAttribute("ident");
+			String answerId = feedbackMap.get(feedbackId);
+			if (answerId != null) {
+			    Answer answer = answerMap.get(answerId);
+			    answer.setFeedback(feedbackText);
+			}
+		    }
+		}
+	    }
+
+	    result.add(question);
+	}
+
+	return result.toArray(QuestionParser.QUESTION_ARRAY_TYPE);
+    }
+
+    /**
+     * Parses query string (send by form submit or extracted otherwise) from questionChoice.jsp form.
+     */
+    public static Question[] parseQuestionChoiceForm(String queryString) throws UnsupportedEncodingException {
+	List<Question> result = new ArrayList<Question>();
+
+	// are answers needed at all?
+	boolean chooseAnswers = Boolean.parseBoolean(WebUtil.extractParameterValue(queryString, "chooseAnswers"));
+	// to know where to stop searching for question entries (disabled/unchecked form fields are not sent)
+	int questionCount = Integer.parseInt(WebUtil.extractParameterValue(queryString, "questionCount"));
+	for (int questionIndex = 0; questionIndex < questionCount; questionIndex++) {
+	    String questionText = WebUtil.extractParameterValue(queryString, "question" + questionIndex);
+	    if (!StringUtils.isBlank(questionText)) {
+		Question question = new Question();
+		question.setText(URLDecoder.decode(questionText, "UTF8"));
+		String questionFeedback = WebUtil.extractParameterValue(queryString, "question" + questionIndex
+			+ "feedback");
+		// can be blank
+		question.setFeedback(URLDecoder.decode(questionFeedback, "UTF8"));
+		if (chooseAnswers) {
+		    String answerCountParam = WebUtil.extractParameterValue(queryString, "answerCount" + questionIndex);
+		    int answerCount = answerCountParam == null ? 0 : Integer.parseInt(answerCountParam);
+		    if (answerCount > 0) {
+			question.setAnswers(new ArrayList<Answer>());
+			for (int answerIndex = 0; answerIndex < answerCount; answerIndex++) {
+			    String answerId = "question" + questionIndex + "answer" + answerIndex;
+			    String answerText = WebUtil.extractParameterValue(queryString, answerId);
+			    String answerScore = WebUtil.extractParameterValue(queryString, answerId + "score");
+			    if (!StringUtils.isBlank(answerText)) {
+				Answer answer = new Answer();
+				answer.setText(URLDecoder.decode(answerText, "UTF8"));
+				if (!StringUtils.isBlank(answerScore)) {
+				    answer.setScore(Float.parseFloat(answerScore));
+				}
+				
+				String answerFeedback = WebUtil.extractParameterValue(queryString, answerId
+					+ "feedback");
+				// can be blank
+				answer.setFeedback(URLDecoder.decode(answerFeedback, "UTF8"));
+				
+				question.getAnswers().add(answer);
+			    }
+			}
+		    }
+		}
+
+		result.add(question);
+	    }
+	}
+
+	return result.toArray(QuestionParser.QUESTION_ARRAY_TYPE);
+    }
+
+    /**
+     * Find XML file list in IMS QTI package.
+     */
+    private static List<File> getQTIResourceFiles(String packageDirPath) throws IOException,
+	    ParserConfigurationException, SAXException {
+	InputStream inputStream = new FileInputStream(new File(packageDirPath, "imsmanifest.xml"));
+	DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+	Document manifest = docBuilder.parse(inputStream);
+	NodeList resourcesList = manifest.getElementsByTagName("resources");
+	List<File> resourceFiles = new LinkedList<File>();
+	if (resourcesList.getLength() > 0) {
+	    Element resources = (Element) resourcesList.item(0);
+	    NodeList resourceList = resources.getElementsByTagName("resource");
+
+	    for (int resourceIndex = 0; resourceIndex < resourceList.getLength(); resourceIndex++) {
+		Element resource = (Element) resourceList.item(resourceIndex);
+		String resourceFileName = resource.getAttribute("href");
+		if (resourceFileName.endsWith(".xml")) {
+		    File resourceFile = new File(packageDirPath, resourceFileName);
+		    if (!resourceFile.isFile() || !resourceFile.canRead()) {
+			QuestionParser.log.warn("XML resource file specified in IMS manifest can not be read: "
+				+ resourceFileName);
+		    } else {
+			resourceFiles.add(resourceFile);
+		    }
+		}
+	    }
+	}
+	return resourceFiles;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r65ed4da382b320542dcd88cb1375662dcfac8769
--- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	(.../WebUtil.java)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	(.../WebUtil.java)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -602,5 +602,20 @@
 
 	return conn.getInputStream();
     }
+    
+    public static String extractParameterValue(String url, String param) {
+	if (!StringUtils.isBlank(url) && !StringUtils.isBlank(param)) {
+	    int quotationMarkIndex = url.indexOf("?");
+	    String queryPart = quotationMarkIndex > -1 ? url.substring(quotationMarkIndex + 1) : url;
+	    String[] paramEntries = queryPart.split("&");
+	    for (String paramEntry : paramEntries) {
+		String[] paramEntrySplitted = paramEntry.split("=");
+		if (param.equalsIgnoreCase(paramEntrySplitted[0])) {
+		    return paramEntrySplitted[1];
+		}
+	    }
 
+	}
+	return null;
+    }
 }
\ No newline at end of file
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r65ed4da382b320542dcd88cb1375662dcfac8769
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -270,6 +270,5 @@
 monitor.summary.notification  =Notification
 monitor.summary.date.restriction.set  =Deadline has been set
 monitor.summary.date.restriction.removed  =Deadline has been removed
-
-
+label.authoring.import.qti =Import IMS QTI
 #======= End labels: Exported 264 labels for en AU =====
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -r3ff06f3f26058ef66d171ad6673eab70e76cd662 -r65ed4da382b320542dcd88cb1375662dcfac8769
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -48,527 +48,472 @@
 
 /**
  * 
- * Keeps all operations needed for Authoring mode. 
+ * Keeps all operations needed for Authoring mode.
+ * 
  * @author Ozgur Demirtas
- *
+ * 
  */
 public class AuthoringUtil implements McAppConstants {
-	static Logger logger = Logger.getLogger(AuthoringUtil.class.getName());
- 	
-	/**
-	 * setRadioboxes(McContent mcContent, McAuthoringForm mcAuthoringForm)
-	 * 
-	 * set values of radioboxes for an existing content
-	 * 
-	 * @param mcContent
-	 * @param mcAuthoringForm
-	 */
-	protected static void setRadioboxes(McContent mcContent, McAuthoringForm mcAuthoringForm)
-	{
-		mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
-		mcAuthoringForm.setRandomize(mcContent.isRandomize ()?"1":"0");
-		mcAuthoringForm.setDisplayAnswers(mcContent.isDisplayAnswers ()?"1":"0");
-		mcAuthoringForm.setShowMarks(mcContent.isShowMarks()?"1":"0");
-		mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
-		mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
-		mcAuthoringForm.setReflect(mcContent.isReflect()?"1":"0");
-	}
+    static Logger logger = Logger.getLogger(AuthoringUtil.class.getName());
 
-    
     /**
+     * setRadioboxes(McContent mcContent, McAuthoringForm mcAuthoringForm)
+     * 
+     * set values of radioboxes for an existing content
+     * 
+     * @param mcContent
+     * @param mcAuthoringForm
+     */
+    protected static void setRadioboxes(McContent mcContent, McAuthoringForm mcAuthoringForm) {
+	mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced() ? "1" : "0");
+	mcAuthoringForm.setRandomize(mcContent.isRandomize() ? "1" : "0");
+	mcAuthoringForm.setDisplayAnswers(mcContent.isDisplayAnswers() ? "1" : "0");
+	mcAuthoringForm.setShowMarks(mcContent.isShowMarks() ? "1" : "0");
+	mcAuthoringForm.setRetries(mcContent.isRetries() ? "1" : "0");
+	mcAuthoringForm.setSln(mcContent.isShowReport() ? "1" : "0");
+	mcAuthoringForm.setReflect(mcContent.isReflect() ? "1" : "0");
+    }
+
+    /**
      * verifyMapNoEmptyString(Map map)
      * 
      * makes sure there is data in the map
      * 
      * @param map
      * @return boolean
      */
-    public static boolean verifyMapNoEmptyString(Map map)
-	{
-    	Iterator itMap = map.entrySet().iterator();
-    	while (itMap.hasNext()) {
-        	Map.Entry pairs = (Map.Entry)itMap.next();
-            logger.debug("using the  pair: " +  pairs.getKey() + " = " + pairs.getValue());
-            
-            if ((pairs.getValue() != null) && (pairs.getValue().toString().length() == 0))
-            	return false;
-            
-		}
-    	return true;
+    public static boolean verifyMapNoEmptyString(Map map) {
+	Iterator itMap = map.entrySet().iterator();
+	while (itMap.hasNext()) {
+	    Map.Entry pairs = (Map.Entry) itMap.next();
+	    AuthoringUtil.logger.debug("using the  pair: " + pairs.getKey() + " = " + pairs.getValue());
+
+	    if ((pairs.getValue() != null) && (pairs.getValue().toString().length() == 0)) {
+		return false;
+	    }
+
 	}
-    
-	
-    
+	return true;
+    }
+
     /**
      * removes only unused question entries from the db. It keeps the valid entries since they get updated.
-     *  
-     * cleanupRedundantQuestions(HttpServletRequest request, List existingQuestions, Map mapQuestionsContent, McContent mcContent)
      * 
+     * cleanupRedundantQuestions(HttpServletRequest request, List existingQuestions, Map mapQuestionsContent, McContent
+     * mcContent)
+     * 
      * @param request
      * @param existingQuestions
      * @param mapQuestionsContent
      * @param mcContent
      */
-    public static void cleanupRedundantQuestions(HttpServletRequest request, List existingQuestions, Map mapQuestionsContent, McContent mcContent, IMcService mcService)
-    {
-    	logger.debug("doing cleanupRedundantQuestions...");
-    	logger.debug("using  existingQuestions: " + existingQuestions);
-    	logger.debug("using  mapQuestionsContent: " + mapQuestionsContent);
-    	logger.debug("using  mcContent: " + mcContent);
-    	
-        /*remove ununsed question entries from the db */
-        boolean questionFound=false;
-        Iterator itExistingQuestions = existingQuestions.iterator();
-        while (itExistingQuestions.hasNext()) 
-        {
-        	McQueContent mcQueContent=(McQueContent)itExistingQuestions.next();
-    		logger.debug("mcQueContent:" + mcQueContent);
-    		
-    		Iterator itNewQuestionsMap = mapQuestionsContent.entrySet().iterator();
-    		questionFound=false;
-            while (itNewQuestionsMap.hasNext()) 
-            {
-            	Map.Entry pairs = (Map.Entry)itNewQuestionsMap.next();
-                logger.debug("using the  pair: " +  pairs.getKey() + " = " + pairs.getValue());
-                logger.debug("mcQueContent.getQuestion(): " + mcQueContent.getQuestion() + "--" + pairs.getValue());
-	    		
-	    		if (mcQueContent.getQuestion().equals(pairs.getValue().toString()))
-				{
-	    			logger.debug("equals mcQueContent.getQuestion(): " + mcQueContent.getQuestion() + "--" + pairs.getValue());
-	    			questionFound=true;
-	            	break;
-				}
-            }
-            
-            if (questionFound == false)
-    		{
-    			String deletableQuestion=mcQueContent.getQuestion();
-    			logger.debug("found is false, delete this question " + deletableQuestion);
-    			mcQueContent=mcService.getQuestionContentByQuestionText(deletableQuestion, mcContent.getUid());
-    			
-    			logger.debug("found is false, delete this question " + mcQueContent);
-    			if (mcQueContent != null)
-    			{
-    			    logger.debug("first removing from collection " + mcQueContent);
-    			    mcContent.getMcQueContents().remove(mcQueContent);
-    			    logger.debug("removed from collection ");
-    			    
-    				mcService.removeMcQueContent(mcQueContent);
-        			logger.debug("removed mcQueContent from the db: " + mcQueContent);	
-    			}
-    		}
-        }    		
+    public static void cleanupRedundantQuestions(HttpServletRequest request, List existingQuestions,
+	    Map mapQuestionsContent, McContent mcContent, IMcService mcService) {
+	AuthoringUtil.logger.debug("doing cleanupRedundantQuestions...");
+	AuthoringUtil.logger.debug("using  existingQuestions: " + existingQuestions);
+	AuthoringUtil.logger.debug("using  mapQuestionsContent: " + mapQuestionsContent);
+	AuthoringUtil.logger.debug("using  mcContent: " + mcContent);
+
+	/*remove ununsed question entries from the db */
+	boolean questionFound = false;
+	Iterator itExistingQuestions = existingQuestions.iterator();
+	while (itExistingQuestions.hasNext()) {
+	    McQueContent mcQueContent = (McQueContent) itExistingQuestions.next();
+	    AuthoringUtil.logger.debug("mcQueContent:" + mcQueContent);
+
+	    Iterator itNewQuestionsMap = mapQuestionsContent.entrySet().iterator();
+	    questionFound = false;
+	    while (itNewQuestionsMap.hasNext()) {
+		Map.Entry pairs = (Map.Entry) itNewQuestionsMap.next();
+		AuthoringUtil.logger.debug("using the  pair: " + pairs.getKey() + " = " + pairs.getValue());
+		AuthoringUtil.logger.debug("mcQueContent.getQuestion(): " + mcQueContent.getQuestion() + "--"
+			+ pairs.getValue());
+
+		if (mcQueContent.getQuestion().equals(pairs.getValue().toString())) {
+		    AuthoringUtil.logger.debug("equals mcQueContent.getQuestion(): " + mcQueContent.getQuestion()
+			    + "--" + pairs.getValue());
+		    questionFound = true;
+		    break;
+		}
+	    }
+
+	    if (questionFound == false) {
+		String deletableQuestion = mcQueContent.getQuestion();
+		AuthoringUtil.logger.debug("found is false, delete this question " + deletableQuestion);
+		mcQueContent = mcService.getQuestionContentByQuestionText(deletableQuestion, mcContent.getUid());
+
+		AuthoringUtil.logger.debug("found is false, delete this question " + mcQueContent);
+		if (mcQueContent != null) {
+		    AuthoringUtil.logger.debug("first removing from collection " + mcQueContent);
+		    mcContent.getMcQueContents().remove(mcQueContent);
+		    AuthoringUtil.logger.debug("removed from collection ");
+
+		    mcService.removeMcQueContent(mcQueContent);
+		    AuthoringUtil.logger.debug("removed mcQueContent from the db: " + mcQueContent);
+		}
+	    }
+	}
     }
-    
 
-    
-	/**
-	 * 
-	 * rebuildStartupGeneralOptionsContentMapfromDB(HttpServletRequest request, Map mapQuestionsUidContent)
-	 * 
-	 * builds a map to hold all the candidate answers for all the questions by accessing the db
-	 *
-	 * @param request
-	 * @param mapQuestionsUidContent
-	 * @return
-	 */
-    public static Map rebuildStartupGeneralOptionsContentMapfromDB(HttpServletRequest request, Map mapQuestionsUidContent, IMcService mcService)
-	{
-		Map mapStartupGeneralOptionsContent= new TreeMap(new McComparator());
+    /**
+     * 
+     * rebuildStartupGeneralOptionsContentMapfromDB(HttpServletRequest request, Map mapQuestionsUidContent)
+     * 
+     * builds a map to hold all the candidate answers for all the questions by accessing the db
+     * 
+     * @param request
+     * @param mapQuestionsUidContent
+     * @return
+     */
+    public static Map rebuildStartupGeneralOptionsContentMapfromDB(HttpServletRequest request,
+	    Map mapQuestionsUidContent, IMcService mcService) {
+	Map mapStartupGeneralOptionsContent = new TreeMap(new McComparator());
 
-    	Iterator itMap = mapQuestionsUidContent.entrySet().iterator();
-    	Long mapIndex=new Long(1);
-		while (itMap.hasNext()) {
-        	Map.Entry pairs = (Map.Entry)itMap.next();
-            logger.debug("using the  pair: " +  pairs.getKey() + " = " + pairs.getValue());
-            String currentQuestionUid=pairs.getValue().toString();
-            logger.debug("currentQuestionUid: " +  currentQuestionUid);
-            List listQuestionOptions=mcService.findMcOptionsContentByQueId(new Long(currentQuestionUid));
-            logger.debug("listQuestionOptions: " +  listQuestionOptions);
-            Map mapQuestionOptions=generateOptionsMap(listQuestionOptions);
-            mapStartupGeneralOptionsContent.put(mapIndex.toString(),mapQuestionOptions);
-            mapIndex=new Long(mapIndex.longValue()+1);
+	Iterator itMap = mapQuestionsUidContent.entrySet().iterator();
+	Long mapIndex = new Long(1);
+	while (itMap.hasNext()) {
+	    Map.Entry pairs = (Map.Entry) itMap.next();
+	    AuthoringUtil.logger.debug("using the  pair: " + pairs.getKey() + " = " + pairs.getValue());
+	    String currentQuestionUid = pairs.getValue().toString();
+	    AuthoringUtil.logger.debug("currentQuestionUid: " + currentQuestionUid);
+	    List listQuestionOptions = mcService.findMcOptionsContentByQueId(new Long(currentQuestionUid));
+	    AuthoringUtil.logger.debug("listQuestionOptions: " + listQuestionOptions);
+	    Map mapQuestionOptions = AuthoringUtil.generateOptionsMap(listQuestionOptions);
+	    mapStartupGeneralOptionsContent.put(mapIndex.toString(), mapQuestionOptions);
+	    mapIndex = new Long(mapIndex.longValue() + 1);
+	}
+	return mapStartupGeneralOptionsContent;
+    }
+
+    protected static List removeBlankEntries(List list) {
+	List newList = new LinkedList();
+
+	Iterator listIterator = list.iterator();
+	while (listIterator.hasNext()) {
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = (McCandidateAnswersDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO: " + mcCandidateAnswersDTO);
+
+	    if (mcCandidateAnswersDTO != null) {
+		String ca = mcCandidateAnswersDTO.getCandidateAnswer();
+		AuthoringUtil.logger.debug("ca: " + ca);
+
+		if ((ca != null) && (ca.length() > 0)) {
+		    newList.add(mcCandidateAnswersDTO);
 		}
-		return mapStartupGeneralOptionsContent;
+	    }
 	}
-    
-    
-    protected static List removeBlankEntries(List list)
-    {
-        List newList= new LinkedList();
-        
-		Iterator listIterator=list.iterator();
-    	while (listIterator.hasNext())
-    	{
-    	    McCandidateAnswersDTO mcCandidateAnswersDTO=(McCandidateAnswersDTO)listIterator.next();
-    		logger.debug("mcCandidateAnswersDTO: " +  mcCandidateAnswersDTO);
-    		
-    		if (mcCandidateAnswersDTO != null)
-    		{
-    		    String ca=mcCandidateAnswersDTO.getCandidateAnswer();
-    		    logger.debug("ca: " + ca);
-    		    
-    		    if ((ca != null) && (ca.length() > 0))
-    		        newList.add(mcCandidateAnswersDTO);
-    		}
-    	}
 
-    	return newList;
+	return newList;
     }
-    
 
     /**
      * 
      * generateOptionsMap(List listQuestionOptions)
-	 * 
-	 * builds a questions map from questions list
-	 *
-	 * @param listQuestionOptions
-	 * @return Map
-	 */
-	public static Map generateOptionsMap(List listQuestionOptions)
-	{
-		Map mapOptsContent= new TreeMap(new McComparator());
+     * 
+     * builds a questions map from questions list
+     * 
+     * @param listQuestionOptions
+     * @return Map
+     */
+    public static Map generateOptionsMap(List listQuestionOptions) {
+	Map mapOptsContent = new TreeMap(new McComparator());
 
-		Iterator listIterator=listQuestionOptions.iterator();
-    	Long mapIndex=new Long(1);
-    	while (listIterator.hasNext())
-    	{
-    		McOptsContent mcOptsContent=(McOptsContent)listIterator.next();
-    		logger.debug("mcOptsContent: " +  mcOptsContent);
-    		mapOptsContent.put(mapIndex.toString(),mcOptsContent.getMcQueOptionText());
-    		mapIndex=new Long(mapIndex.longValue()+1);
-    	}
-    	return mapOptsContent;
+	Iterator listIterator = listQuestionOptions.iterator();
+	Long mapIndex = new Long(1);
+	while (listIterator.hasNext()) {
+	    McOptsContent mcOptsContent = (McOptsContent) listIterator.next();
+	    AuthoringUtil.logger.debug("mcOptsContent: " + mcOptsContent);
+	    mapOptsContent.put(mapIndex.toString(), mcOptsContent.getMcQueOptionText());
+	    mapIndex = new Long(mapIndex.longValue() + 1);
 	}
-    
-    
+	return mapOptsContent;
+    }
+
     /**
      * updates existing questions while persisting the questions
      * 
-     * updateExistingQuestionContent(HttpServletRequest request, Map mapFeedbackIncorrect, Map mapFeedbackCorrect, McQueContent mcQueContent, String displayOrder)
-     *  
+     * updateExistingQuestionContent(HttpServletRequest request, Map mapFeedbackIncorrect, Map mapFeedbackCorrect,
+     * McQueContent mcQueContent, String displayOrder)
+     * 
      * @param request
      * @param mapFeedbackIncorrect
      * @param mapFeedbackCorrect
      * @param mcQueContent
      * @param displayOrder
      */
-    public static void updateExistingQuestionContent(HttpServletRequest request, Map mapFeedbackIncorrect, Map mapFeedbackCorrect, 
-            McQueContent mcQueContent, String displayOrder, IMcService mcService)
-    {
-    	logger.debug("doing updateExistingQuestionContent...");
-    	logger.debug("using displayOrder: " + displayOrder);
-    	
-    	String incorrectFeedback=(String)mapFeedbackIncorrect.get(displayOrder);
-    	logger.debug("new  incorrectFeedback will be :" + incorrectFeedback);
-    	String correctFeedback=(String)mapFeedbackCorrect.get(displayOrder);
-    	logger.debug("new correctFeedback will be :" + correctFeedback);
-    	
-    	mcQueContent.setDisplayOrder(new Integer(displayOrder));
-    	
-    	mcService.saveOrUpdateMcQueContent(mcQueContent);
-		logger.debug("updated mcQueContent in the db: " + mcQueContent);
+    public static void updateExistingQuestionContent(HttpServletRequest request, Map mapFeedbackIncorrect,
+	    Map mapFeedbackCorrect, McQueContent mcQueContent, String displayOrder, IMcService mcService) {
+	AuthoringUtil.logger.debug("doing updateExistingQuestionContent...");
+	AuthoringUtil.logger.debug("using displayOrder: " + displayOrder);
+
+	String incorrectFeedback = (String) mapFeedbackIncorrect.get(displayOrder);
+	AuthoringUtil.logger.debug("new  incorrectFeedback will be :" + incorrectFeedback);
+	String correctFeedback = (String) mapFeedbackCorrect.get(displayOrder);
+	AuthoringUtil.logger.debug("new correctFeedback will be :" + correctFeedback);
+
+	mcQueContent.setDisplayOrder(new Integer(displayOrder));
+
+	mcService.saveOrUpdateMcQueContent(mcQueContent);
+	AuthoringUtil.logger.debug("updated mcQueContent in the db: " + mcQueContent);
     }
 
-    
-	/**
-	 * builds a map to hold question texts
-	 * rebuildQuestionMapfromDB(HttpServletRequest request, Long toolContentId)
-	 *
-	 * @param request
-	 * @param toolContentId
-	 * @return Map
-	 */
-    public static Map rebuildQuestionMapfromDB(HttpServletRequest request, Long toolContentId, IMcService mcService)
-    {
-    	Map mapQuestionsContent= new TreeMap(new McComparator());
-    	logger.debug("toolContentId:" + toolContentId);
+    /**
+     * builds a map to hold question texts rebuildQuestionMapfromDB(HttpServletRequest request, Long toolContentId)
+     * 
+     * @param request
+     * @param toolContentId
+     * @return Map
+     */
+    public static Map rebuildQuestionMapfromDB(HttpServletRequest request, Long toolContentId, IMcService mcService) {
+	Map mapQuestionsContent = new TreeMap(new McComparator());
+	AuthoringUtil.logger.debug("toolContentId:" + toolContentId);
 
-		McContent mcContent=mcService.retrieveMc(toolContentId);
-		logger.debug("mcContent:" + mcContent);
+	McContent mcContent = mcService.retrieveMc(toolContentId);
+	AuthoringUtil.logger.debug("mcContent:" + mcContent);
 
-    	List list=mcService.refreshQuestionContent(mcContent.getUid());
-		logger.debug("refreshed list:" + list);
+	List list = mcService.refreshQuestionContent(mcContent.getUid());
+	AuthoringUtil.logger.debug("refreshed list:" + list);
 
-		Iterator listIterator=list.iterator();
-    	Long mapIndex=new Long(1);
-    	while (listIterator.hasNext())
-    	{
-    		McQueContent mcQueContent=(McQueContent)listIterator.next();
-    		logger.debug("mcQueContent:" + mcQueContent);
-    		mapQuestionsContent.put(mapIndex.toString(),mcQueContent.getQuestion());
-    		mapIndex=new Long(mapIndex.longValue()+1);
-    	}
+	Iterator listIterator = list.iterator();
+	Long mapIndex = new Long(1);
+	while (listIterator.hasNext()) {
+	    McQueContent mcQueContent = (McQueContent) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQueContent:" + mcQueContent);
+	    mapQuestionsContent.put(mapIndex.toString(), mcQueContent.getQuestion());
+	    mapIndex = new Long(mapIndex.longValue() + 1);
+	}
 
-    	logger.debug("refreshed Map:" + mapQuestionsContent);
-    	return mapQuestionsContent;
+	AuthoringUtil.logger.debug("refreshed Map:" + mapQuestionsContent);
+	return mapQuestionsContent;
     }
-    
 
-    public static Map rebuildFeedbackMapfromDB(HttpServletRequest request, Long toolContentId, IMcService mcService)
-    {
-    	Map map= new TreeMap(new McComparator());
-    	logger.debug("toolContentId:" + toolContentId);
+    public static Map rebuildFeedbackMapfromDB(HttpServletRequest request, Long toolContentId, IMcService mcService) {
+	Map map = new TreeMap(new McComparator());
+	AuthoringUtil.logger.debug("toolContentId:" + toolContentId);
 
-		McContent mcContent=mcService.retrieveMc(toolContentId);
-		logger.debug("mcContent:" + mcContent);
+	McContent mcContent = mcService.retrieveMc(toolContentId);
+	AuthoringUtil.logger.debug("mcContent:" + mcContent);
 
-    	List list=mcService.refreshQuestionContent(mcContent.getUid());
-		logger.debug("refreshed list:" + list);
+	List list = mcService.refreshQuestionContent(mcContent.getUid());
+	AuthoringUtil.logger.debug("refreshed list:" + list);
 
-		Iterator listIterator=list.iterator();
-    	Long mapIndex=new Long(1);
-    	while (listIterator.hasNext())
-    	{
-    		McQueContent mcQueContent=(McQueContent)listIterator.next();
-    		logger.debug("mcQueContent:" + mcQueContent);
-    
-    		String feedback=mcQueContent.getFeedback();
-    		logger.debug("feedback:" + feedback);
-    		
-    		map.put(mapIndex.toString(),feedback);
-    		mapIndex=new Long(mapIndex.longValue()+1);
-    	}
+	Iterator listIterator = list.iterator();
+	Long mapIndex = new Long(1);
+	while (listIterator.hasNext()) {
+	    McQueContent mcQueContent = (McQueContent) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQueContent:" + mcQueContent);
 
-    	logger.debug("refreshed Map:" + map);
-    	return map;
+	    String feedback = mcQueContent.getFeedback();
+	    AuthoringUtil.logger.debug("feedback:" + feedback);
+
+	    map.put(mapIndex.toString(), feedback);
+	    mapIndex = new Long(mapIndex.longValue() + 1);
+	}
+
+	AuthoringUtil.logger.debug("refreshed Map:" + map);
+	return map;
     }
 
-    
-    
     /**
-     * builds a map to hold persisted uid values for questions
-     * rebuildQuestionUidMapfromDB(HttpServletRequest request, Long toolContentId)
-     *
+     * builds a map to hold persisted uid values for questions rebuildQuestionUidMapfromDB(HttpServletRequest request,
+     * Long toolContentId)
+     * 
      * @param request
      * @param toolContentId
      * @return Map
      */
-    public static Map rebuildQuestionUidMapfromDB(HttpServletRequest request, Long toolContentId, IMcService mcService)
-    {
-    	Map mapQuestionsContent= new TreeMap(new McComparator());
-    	logger.debug("toolContentId:" + toolContentId);
+    public static Map rebuildQuestionUidMapfromDB(HttpServletRequest request, Long toolContentId, IMcService mcService) {
+	Map mapQuestionsContent = new TreeMap(new McComparator());
+	AuthoringUtil.logger.debug("toolContentId:" + toolContentId);
 
-		McContent mcContent=mcService.retrieveMc(toolContentId);
-		logger.debug("mcContent:" + mcContent);
+	McContent mcContent = mcService.retrieveMc(toolContentId);
+	AuthoringUtil.logger.debug("mcContent:" + mcContent);
 
-		if (mcContent != null)
-		{
-			List list=mcService.refreshQuestionContent(mcContent.getUid());
-			logger.debug("refreshed list:" + list);
+	if (mcContent != null) {
+	    List list = mcService.refreshQuestionContent(mcContent.getUid());
+	    AuthoringUtil.logger.debug("refreshed list:" + list);
 
-			Iterator listIterator=list.iterator();
-	    	Long mapIndex=new Long(1);
-	    	while (listIterator.hasNext())
-	    	{
-	    		McQueContent mcQueContent=(McQueContent)listIterator.next();
-	    		logger.debug("mcQueContent:" + mcQueContent);
-	    		mapQuestionsContent.put(mapIndex.toString(),mcQueContent.getUid());
-	    		mapIndex=new Long(mapIndex.longValue()+1);
-	    	}
-		}
+	    Iterator listIterator = list.iterator();
+	    Long mapIndex = new Long(1);
+	    while (listIterator.hasNext()) {
+		McQueContent mcQueContent = (McQueContent) listIterator.next();
+		AuthoringUtil.logger.debug("mcQueContent:" + mcQueContent);
+		mapQuestionsContent.put(mapIndex.toString(), mcQueContent.getUid());
+		mapIndex = new Long(mapIndex.longValue() + 1);
+	    }
+	}
 
-		logger.debug("refreshed Map:" + mapQuestionsContent);
-    	return mapQuestionsContent;
+	AuthoringUtil.logger.debug("refreshed Map:" + mapQuestionsContent);
+	return mapQuestionsContent;
     }
 
-
-
-	/**
-	 * finds whether a candidate answer is selected or not
-	 * isOptionSelected(Map mapGeneralSelectedOptionsContent, String optionText, String questionIndex)
-	 * 
-	 * @param mapGeneralSelectedOptionsContent
-	 * @param optionText
-	 * @param questionIndex
-	 * @return boolean
-	 */
-	public static boolean isOptionSelected(Map mapGeneralSelectedOptionsContent, String optionText, String questionIndex)
-	{
-	   Iterator itGSOMap = mapGeneralSelectedOptionsContent.entrySet().iterator();
-	   logger.debug("questionIndex: " + questionIndex);
-	   logger.debug("optionText: " + optionText);
-	   while (itGSOMap.hasNext()) 
-        {
-            Map.Entry pairs = (Map.Entry)itGSOMap.next();
-            if (pairs.getKey().toString().equals(questionIndex))
-            {
-            	Map currentOptionsMap= (Map)pairs.getValue();
-            	logger.debug("currentOptionsMap: " + currentOptionsMap);
-            	boolean isOptionSelectedInMap=isOptionSelectedInMap(optionText, currentOptionsMap);
-            	logger.debug("isOptionSelectedInMap: " + isOptionSelectedInMap);
-            	return isOptionSelectedInMap;
-            }
-        }
-	   return false;
+    /**
+     * finds whether a candidate answer is selected or not isOptionSelected(Map mapGeneralSelectedOptionsContent, String
+     * optionText, String questionIndex)
+     * 
+     * @param mapGeneralSelectedOptionsContent
+     * @param optionText
+     * @param questionIndex
+     * @return boolean
+     */
+    public static boolean isOptionSelected(Map mapGeneralSelectedOptionsContent, String optionText, String questionIndex) {
+	Iterator itGSOMap = mapGeneralSelectedOptionsContent.entrySet().iterator();
+	AuthoringUtil.logger.debug("questionIndex: " + questionIndex);
+	AuthoringUtil.logger.debug("optionText: " + optionText);
+	while (itGSOMap.hasNext()) {
+	    Map.Entry pairs = (Map.Entry) itGSOMap.next();
+	    if (pairs.getKey().toString().equals(questionIndex)) {
+		Map currentOptionsMap = (Map) pairs.getValue();
+		AuthoringUtil.logger.debug("currentOptionsMap: " + currentOptionsMap);
+		boolean isOptionSelectedInMap = AuthoringUtil.isOptionSelectedInMap(optionText, currentOptionsMap);
+		AuthoringUtil.logger.debug("isOptionSelectedInMap: " + isOptionSelectedInMap);
+		return isOptionSelectedInMap;
+	    }
 	}
-	
-	
-	/**
-	 * checks the existence of a candidate answer in the options map
-	 * isOptionSelectedInMap(String optionText, Map currentOptionsMap)
-	 * 
-	 * @param optionText
-	 * @param currentOptionsMap
-	 * @return
-	 */
-	public static boolean isOptionSelectedInMap(String optionText, Map currentOptionsMap)
-	{
-		logger.debug("optionText: " + optionText);
-		Iterator itCOMap = currentOptionsMap.entrySet().iterator();
-		while (itCOMap.hasNext()) 
-	    {
-			Map.Entry pairs = (Map.Entry)itCOMap.next();
-			if (pairs.getValue().toString().equals(optionText))
-			{
-				logger.debug("option text found in the map: " + optionText);
-				return true;
-			}
+	return false;
+    }
+
+    /**
+     * checks the existence of a candidate answer in the options map isOptionSelectedInMap(String optionText, Map
+     * currentOptionsMap)
+     * 
+     * @param optionText
+     * @param currentOptionsMap
+     * @return
+     */
+    public static boolean isOptionSelectedInMap(String optionText, Map currentOptionsMap) {
+	AuthoringUtil.logger.debug("optionText: " + optionText);
+	Iterator itCOMap = currentOptionsMap.entrySet().iterator();
+	while (itCOMap.hasNext()) {
+	    Map.Entry pairs = (Map.Entry) itCOMap.next();
+	    if (pairs.getValue().toString().equals(optionText)) {
+		AuthoringUtil.logger.debug("option text found in the map: " + optionText);
+		return true;
 	    }
-		return false;
 	}
+	return false;
+    }
 
+    /**
+     * List swapNodes(List listQuestionContentDTO, String questionIndex, String direction)
+     * 
+     * swappes McQuestionContentDTO nodes in the list
+     * 
+     * @param listQuestionContentDTO
+     * @param questionIndex
+     * @param direction
+     * @return
+     */
+    protected static List swapNodes(List listQuestionContentDTO, String questionIndex, String direction) {
+	AuthoringUtil.logger.debug("swapNodes:");
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	AuthoringUtil.logger.debug("questionIndex:" + questionIndex);
+	AuthoringUtil.logger.debug("direction:" + direction);
 
-    
-    
-   /**
-    * List swapNodes(List listQuestionContentDTO, String questionIndex, String direction)
-    * 
-    * swappes McQuestionContentDTO nodes in the list
-    * 
-    * @param listQuestionContentDTO
-    * @param questionIndex
-    * @param direction
-    * @return
-    */ 
-    protected static List swapNodes(List listQuestionContentDTO, String questionIndex, String direction)
-    {
-        logger.debug("swapNodes:");
-        logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-        logger.debug("questionIndex:" + questionIndex);
-        logger.debug("direction:" + direction);
+	int intQuestionIndex = new Integer(questionIndex).intValue();
+	int intOriginalQuestionIndex = intQuestionIndex;
+	AuthoringUtil.logger.debug("intQuestionIndex:" + intQuestionIndex);
 
-        int intQuestionIndex=new Integer(questionIndex).intValue();
-        int intOriginalQuestionIndex=intQuestionIndex;
-        logger.debug("intQuestionIndex:" + intQuestionIndex);
-        
-        int replacedNodeIndex=0;
-        if (direction.equals("down"))
-        {
-            logger.debug("direction down:");
-            replacedNodeIndex=++intQuestionIndex;
-        }
-        else
-        {
-            logger.debug("direction up:");
-            replacedNodeIndex=--intQuestionIndex;
-            
-        }
-        logger.debug("replacedNodeIndex:" + replacedNodeIndex);
-        logger.debug("replacing nodes:" + intOriginalQuestionIndex + " and " + replacedNodeIndex);
-        
-        McQuestionContentDTO mainNode=extractNodeAtDisplayOrder(listQuestionContentDTO, intOriginalQuestionIndex);
-        logger.debug("mainNode:" + mainNode);
-        
+	int replacedNodeIndex = 0;
+	if (direction.equals("down")) {
+	    AuthoringUtil.logger.debug("direction down:");
+	    replacedNodeIndex = ++intQuestionIndex;
+	} else {
+	    AuthoringUtil.logger.debug("direction up:");
+	    replacedNodeIndex = --intQuestionIndex;
 
-        McQuestionContentDTO replacedNode=extractNodeAtDisplayOrder(listQuestionContentDTO, replacedNodeIndex);
-        logger.debug("replacedNode:" + replacedNode);
+	}
+	AuthoringUtil.logger.debug("replacedNodeIndex:" + replacedNodeIndex);
+	AuthoringUtil.logger.debug("replacing nodes:" + intOriginalQuestionIndex + " and " + replacedNodeIndex);
 
-        if ((mainNode == null) || (replacedNode == null))
-        {
-            logger.debug("mainNode/replacedNode is null");
-            return listQuestionContentDTO;
-        }
+	McQuestionContentDTO mainNode = AuthoringUtil.extractNodeAtDisplayOrder(listQuestionContentDTO,
+		intOriginalQuestionIndex);
+	AuthoringUtil.logger.debug("mainNode:" + mainNode);
 
-        
-        
-        List listFinalQuestionContentDTO=new LinkedList();
-        
-        listFinalQuestionContentDTO=reorderSwappedListQuestionContentDTO(listQuestionContentDTO, intOriginalQuestionIndex,
-                replacedNodeIndex, mainNode, replacedNode);
-        
-        
-	    logger.debug("listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
-        return listFinalQuestionContentDTO;
+	McQuestionContentDTO replacedNode = AuthoringUtil.extractNodeAtDisplayOrder(listQuestionContentDTO,
+		replacedNodeIndex);
+	AuthoringUtil.logger.debug("replacedNode:" + replacedNode);
+
+	if ((mainNode == null) || (replacedNode == null)) {
+	    AuthoringUtil.logger.debug("mainNode/replacedNode is null");
+	    return listQuestionContentDTO;
+	}
+
+	List listFinalQuestionContentDTO = new LinkedList();
+
+	listFinalQuestionContentDTO = AuthoringUtil.reorderSwappedListQuestionContentDTO(listQuestionContentDTO,
+		intOriginalQuestionIndex, replacedNodeIndex, mainNode, replacedNode);
+
+	AuthoringUtil.logger.debug("listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
+	return listFinalQuestionContentDTO;
     }
 
-    
-    
     /**
-     * List reorderSwappedListQuestionContentDTO(List listQuestionContentDTO, int intOriginalQuestionIndex, 
-            int replacedNodeIndex, McQuestionContentDTO mainNode, McQuestionContentDTO replacedNode)
-            
+     * List reorderSwappedListQuestionContentDTO(List listQuestionContentDTO, int intOriginalQuestionIndex, int
+     * replacedNodeIndex, McQuestionContentDTO mainNode, McQuestionContentDTO replacedNode)
+     * 
      * @param listQuestionContentDTO
      * @param intOriginalQuestionIndex
      * @param replacedNodeIndex
      * @param mainNode
      * @param replacedNode
      * @return
      */
-    protected  static List reorderSwappedListQuestionContentDTO(List listQuestionContentDTO, int intOriginalQuestionIndex, 
-            int replacedNodeIndex, McQuestionContentDTO mainNode, McQuestionContentDTO replacedNode)
-    {
-        logger.debug("reorderSwappedListQuestionContentDTO: intOriginalQuestionIndex:" + intOriginalQuestionIndex);
-        logger.debug("reorderSwappedListQuestionContentDTO: replacedNodeIndex:" + replacedNodeIndex);
-        logger.debug("mainNode: " + mainNode);
-        logger.debug("replacedNode: " + replacedNode);
-        
-        
-        List listFinalQuestionContentDTO=new LinkedList();
-    	
-	    int queIndex=0;
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-	        queIndex++;
-	        McQuestionContentDTO tempNode=new McQuestionContentDTO();
-	        
-            if ((!mcQuestionContentDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) && 
-                 !mcQuestionContentDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString()))
-            {
-            	logger.debug("normal copy ");
-            	tempNode.setQuestion(mcQuestionContentDTO.getQuestion());
-            	tempNode.setDisplayOrder(mcQuestionContentDTO.getDisplayOrder());
-            	tempNode.setFeedback(mcQuestionContentDTO.getFeedback());
-            	tempNode.setListCandidateAnswersDTO(mcQuestionContentDTO.getListCandidateAnswersDTO());
-            	tempNode.setCaCount(mcQuestionContentDTO.getCaCount());
-            	tempNode.setMark(mcQuestionContentDTO.getMark());
-            	
-            }
-            else if (mcQuestionContentDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString()))
-            {
-            	logger.debug("move type 1 ");
-            	tempNode.setQuestion(replacedNode.getQuestion());
-            	tempNode.setDisplayOrder(replacedNode.getDisplayOrder());
-            	tempNode.setFeedback(replacedNode.getFeedback());
-            	tempNode.setListCandidateAnswersDTO(replacedNode.getListCandidateAnswersDTO());
-            	tempNode.setCaCount(replacedNode.getCaCount());
-            	tempNode.setMark(replacedNode.getMark());
-            }
-            else if (mcQuestionContentDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString()))
-            {
-            	logger.debug("move type 2 ");
-            	tempNode.setQuestion(mainNode.getQuestion());
-            	tempNode.setDisplayOrder(mainNode.getDisplayOrder());
-            	tempNode.setFeedback(mainNode.getFeedback());
-            	tempNode.setListCandidateAnswersDTO(mainNode.getListCandidateAnswersDTO());
-            	tempNode.setCaCount(mainNode.getCaCount());
-            	tempNode.setMark(mainNode.getMark());
-            }
-	        
-	        listFinalQuestionContentDTO.add(tempNode);
+    protected static List reorderSwappedListQuestionContentDTO(List listQuestionContentDTO,
+	    int intOriginalQuestionIndex, int replacedNodeIndex, McQuestionContentDTO mainNode,
+	    McQuestionContentDTO replacedNode) {
+	AuthoringUtil.logger.debug("reorderSwappedListQuestionContentDTO: intOriginalQuestionIndex:"
+		+ intOriginalQuestionIndex);
+	AuthoringUtil.logger.debug("reorderSwappedListQuestionContentDTO: replacedNodeIndex:" + replacedNodeIndex);
+	AuthoringUtil.logger.debug("mainNode: " + mainNode);
+	AuthoringUtil.logger.debug("replacedNode: " + replacedNode);
+
+	List listFinalQuestionContentDTO = new LinkedList();
+
+	int queIndex = 0;
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+	    queIndex++;
+	    McQuestionContentDTO tempNode = new McQuestionContentDTO();
+
+	    if ((!mcQuestionContentDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString()))
+		    && !mcQuestionContentDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) {
+		AuthoringUtil.logger.debug("normal copy ");
+		tempNode.setQuestion(mcQuestionContentDTO.getQuestion());
+		tempNode.setDisplayOrder(mcQuestionContentDTO.getDisplayOrder());
+		tempNode.setFeedback(mcQuestionContentDTO.getFeedback());
+		tempNode.setListCandidateAnswersDTO(mcQuestionContentDTO.getListCandidateAnswersDTO());
+		tempNode.setCaCount(mcQuestionContentDTO.getCaCount());
+		tempNode.setMark(mcQuestionContentDTO.getMark());
+
+	    } else if (mcQuestionContentDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) {
+		AuthoringUtil.logger.debug("move type 1 ");
+		tempNode.setQuestion(replacedNode.getQuestion());
+		tempNode.setDisplayOrder(replacedNode.getDisplayOrder());
+		tempNode.setFeedback(replacedNode.getFeedback());
+		tempNode.setListCandidateAnswersDTO(replacedNode.getListCandidateAnswersDTO());
+		tempNode.setCaCount(replacedNode.getCaCount());
+		tempNode.setMark(replacedNode.getMark());
+	    } else if (mcQuestionContentDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) {
+		AuthoringUtil.logger.debug("move type 2 ");
+		tempNode.setQuestion(mainNode.getQuestion());
+		tempNode.setDisplayOrder(mainNode.getDisplayOrder());
+		tempNode.setFeedback(mainNode.getFeedback());
+		tempNode.setListCandidateAnswersDTO(mainNode.getListCandidateAnswersDTO());
+		tempNode.setCaCount(mainNode.getCaCount());
+		tempNode.setMark(mainNode.getMark());
 	    }
 
-	    
-        logger.debug("final listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
-        return listFinalQuestionContentDTO;
+	    listFinalQuestionContentDTO.add(tempNode);
+	}
+
+	AuthoringUtil.logger.debug("final listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
+	return listFinalQuestionContentDTO;
     }
 
-
     /**
      * List swapCandidateNodes(List listCandidates, String candidateIndex, String direction)
      * 
@@ -580,538 +525,483 @@
      * @param direction
      * @return
      */
-    protected static List swapCandidateNodes(List listCandidates, String candidateIndex, String direction)
-    {
-        logger.debug("swapCandidateNodes:");
-        logger.debug("listCandidates:" + listCandidates);
-        logger.debug("candidateIndex:" + candidateIndex);
-        logger.debug("direction:" + direction);
+    protected static List swapCandidateNodes(List listCandidates, String candidateIndex, String direction) {
+	AuthoringUtil.logger.debug("swapCandidateNodes:");
+	AuthoringUtil.logger.debug("listCandidates:" + listCandidates);
+	AuthoringUtil.logger.debug("candidateIndex:" + candidateIndex);
+	AuthoringUtil.logger.debug("direction:" + direction);
 
-        int intCandidateIndex=new Integer(candidateIndex).intValue();
-        int intOriginalCandidateIndex=intCandidateIndex;
-        logger.debug("intCandidateIndex:" + intCandidateIndex);
-        
-        int replacedNodeIndex=0;
-        if (direction.equals("down"))
-        {
-            logger.debug("direction down:");
-            replacedNodeIndex=++intCandidateIndex;
-        }
-        else
-        {
-            logger.debug("direction up:");
-            replacedNodeIndex=--intCandidateIndex;
-            
-        }
-        logger.debug("replacedNodeIndex:" + replacedNodeIndex);
-        logger.debug("replacing nodes:" + intOriginalCandidateIndex + " and " + replacedNodeIndex);
-        
-        McCandidateAnswersDTO mainNode=extractCandidateAtOrder(listCandidates, intOriginalCandidateIndex);
-        logger.debug("mainNode:" + mainNode);
-        
+	int intCandidateIndex = new Integer(candidateIndex).intValue();
+	int intOriginalCandidateIndex = intCandidateIndex;
+	AuthoringUtil.logger.debug("intCandidateIndex:" + intCandidateIndex);
 
-        McCandidateAnswersDTO replacedNode=extractCandidateAtOrder(listCandidates, replacedNodeIndex);
-        logger.debug("replacedNode:" + replacedNode);
-        
-        if ((mainNode == null) || (replacedNode == null))
-        {
-            logger.debug("mainNode/replacedNode is null");
-            return listCandidates;
-        }
-        
+	int replacedNodeIndex = 0;
+	if (direction.equals("down")) {
+	    AuthoringUtil.logger.debug("direction down:");
+	    replacedNodeIndex = ++intCandidateIndex;
+	} else {
+	    AuthoringUtil.logger.debug("direction up:");
+	    replacedNodeIndex = --intCandidateIndex;
 
-        List listFinalCandidateDTO=new LinkedList();
-        
-        listFinalCandidateDTO=reorderSwappedListCandidateDTO(listCandidates, intOriginalCandidateIndex,
-                replacedNodeIndex, mainNode, replacedNode);
-        
-        
-	    logger.debug("listFinalCandidateDTO:" + listFinalCandidateDTO);
-        return listFinalCandidateDTO;
+	}
+	AuthoringUtil.logger.debug("replacedNodeIndex:" + replacedNodeIndex);
+	AuthoringUtil.logger.debug("replacing nodes:" + intOriginalCandidateIndex + " and " + replacedNodeIndex);
+
+	McCandidateAnswersDTO mainNode = AuthoringUtil.extractCandidateAtOrder(listCandidates,
+		intOriginalCandidateIndex);
+	AuthoringUtil.logger.debug("mainNode:" + mainNode);
+
+	McCandidateAnswersDTO replacedNode = AuthoringUtil.extractCandidateAtOrder(listCandidates, replacedNodeIndex);
+	AuthoringUtil.logger.debug("replacedNode:" + replacedNode);
+
+	if ((mainNode == null) || (replacedNode == null)) {
+	    AuthoringUtil.logger.debug("mainNode/replacedNode is null");
+	    return listCandidates;
+	}
+
+	List listFinalCandidateDTO = new LinkedList();
+
+	listFinalCandidateDTO = AuthoringUtil.reorderSwappedListCandidateDTO(listCandidates, intOriginalCandidateIndex,
+		replacedNodeIndex, mainNode, replacedNode);
+
+	AuthoringUtil.logger.debug("listFinalCandidateDTO:" + listFinalCandidateDTO);
+	return listFinalCandidateDTO;
     }
 
-    
     /**
-     * reorderSwappedListCandidateDTO(List listCandidates, int intOriginalCandidateIndex, 
-            int replacedNodeIndex, McCandidateAnswersDTO mainNode, McCandidateAnswersDTO replacedNode)
-            
-            
+     * reorderSwappedListCandidateDTO(List listCandidates, int intOriginalCandidateIndex, int replacedNodeIndex,
+     * McCandidateAnswersDTO mainNode, McCandidateAnswersDTO replacedNode)
+     * 
+     * 
      * @param listCandidates
      * @param intOriginalCandidateIndex
      * @param replacedNodeIndex
      * @param mainNode
      * @param replacedNode
      * @return
      */
-    protected  static List reorderSwappedListCandidateDTO(List listCandidates, int intOriginalCandidateIndex, 
-            int replacedNodeIndex, McCandidateAnswersDTO mainNode, McCandidateAnswersDTO replacedNode)
-    {
-        logger.debug("reorderSwappedListCandidateDTO: intOriginalQuestionIndex:" + intOriginalCandidateIndex);
-        logger.debug("reorderSwappedListCandidateDTO: replacedNodeIndex:" + replacedNodeIndex);
-        logger.debug("mainNode: " + mainNode);
-        logger.debug("replacedNode: " + replacedNode);
-        
-        
-        List listFinalCandidatesDTO=new LinkedList();
-    	
-	    int queIndex=0;
-	    Iterator listIterator=listCandidates.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        McCandidateAnswersDTO mcCandidateAnswersDTO= (McCandidateAnswersDTO)listIterator.next();
-	        logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
-	        logger.debug("mcCandidateAnswersDTO candidateAnswer:" + mcCandidateAnswersDTO.getCandidateAnswer());
-	        queIndex++;
+    protected static List reorderSwappedListCandidateDTO(List listCandidates, int intOriginalCandidateIndex,
+	    int replacedNodeIndex, McCandidateAnswersDTO mainNode, McCandidateAnswersDTO replacedNode) {
+	AuthoringUtil.logger.debug("reorderSwappedListCandidateDTO: intOriginalQuestionIndex:"
+		+ intOriginalCandidateIndex);
+	AuthoringUtil.logger.debug("reorderSwappedListCandidateDTO: replacedNodeIndex:" + replacedNodeIndex);
+	AuthoringUtil.logger.debug("mainNode: " + mainNode);
+	AuthoringUtil.logger.debug("replacedNode: " + replacedNode);
 
-	        McCandidateAnswersDTO tempNode=new McCandidateAnswersDTO();
-	        
-	        
-            if ((!new Integer(queIndex).toString().equals(new Integer(intOriginalCandidateIndex).toString())) && 
-                 !new Integer(queIndex).toString().equals(new Integer(replacedNodeIndex).toString()))
-            {
-            	logger.debug("normal copy ");
-            	tempNode.setCandidateAnswer(mcCandidateAnswersDTO.getCandidateAnswer());
-            	tempNode.setCorrect(mcCandidateAnswersDTO.getCorrect());
-            }
-            else if (new Integer(queIndex).toString().equals(new Integer(intOriginalCandidateIndex).toString()))
-            {
-            	logger.debug("move type 1 ");
-            	tempNode.setCandidateAnswer(replacedNode.getCandidateAnswer());
-            	tempNode.setCorrect(replacedNode.getCorrect());
-            }
-            else if (new Integer(queIndex).toString().equals(new Integer(replacedNodeIndex).toString()))
-            {
-            	logger.debug("move type 2 ");
-            	tempNode.setCandidateAnswer(mainNode.getCandidateAnswer());
-            	tempNode.setCorrect(mainNode.getCorrect());
-            }
-	        
-            listFinalCandidatesDTO.add(tempNode);
+	List listFinalCandidatesDTO = new LinkedList();
+
+	int queIndex = 0;
+	Iterator listIterator = listCandidates.iterator();
+	while (listIterator.hasNext()) {
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = (McCandidateAnswersDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO candidateAnswer:"
+		    + mcCandidateAnswersDTO.getCandidateAnswer());
+	    queIndex++;
+
+	    McCandidateAnswersDTO tempNode = new McCandidateAnswersDTO();
+
+	    if ((!new Integer(queIndex).toString().equals(new Integer(intOriginalCandidateIndex).toString()))
+		    && !new Integer(queIndex).toString().equals(new Integer(replacedNodeIndex).toString())) {
+		AuthoringUtil.logger.debug("normal copy ");
+		tempNode.setCandidateAnswer(mcCandidateAnswersDTO.getCandidateAnswer());
+		tempNode.setCorrect(mcCandidateAnswersDTO.getCorrect());
+	    } else if (new Integer(queIndex).toString().equals(new Integer(intOriginalCandidateIndex).toString())) {
+		AuthoringUtil.logger.debug("move type 1 ");
+		tempNode.setCandidateAnswer(replacedNode.getCandidateAnswer());
+		tempNode.setCorrect(replacedNode.getCorrect());
+	    } else if (new Integer(queIndex).toString().equals(new Integer(replacedNodeIndex).toString())) {
+		AuthoringUtil.logger.debug("move type 2 ");
+		tempNode.setCandidateAnswer(mainNode.getCandidateAnswer());
+		tempNode.setCorrect(mainNode.getCorrect());
 	    }
 
-        logger.debug("final listFinalCandidatesDTO:" + listFinalCandidatesDTO);
-        return listFinalCandidatesDTO;
+	    listFinalCandidatesDTO.add(tempNode);
+	}
+
+	AuthoringUtil.logger.debug("final listFinalCandidatesDTO:" + listFinalCandidatesDTO);
+	return listFinalCandidatesDTO;
     }
-    
-    
+
     /**
      * McQuestionContentDTO extractNodeAtDisplayOrder(List listQuestionContentDTO, int intOriginalQuestionIndex)
      * 
-     * returns McQuestionContentDTO  in the specified order of the list 
+     * returns McQuestionContentDTO in the specified order of the list
      * 
      * @param listQuestionContentDTO
      * @param intOriginalQuestionIndex
      * @return
      */
-    protected static McQuestionContentDTO extractNodeAtDisplayOrder(List listQuestionContentDTO, int intOriginalQuestionIndex)
-    {
-        logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-        logger.debug("intOriginalQuestionIndex:" + intOriginalQuestionIndex);
-        
-        Iterator listIterator=listQuestionContentDTO.iterator();
-        while (listIterator.hasNext())
-        {
-            McQuestionContentDTO mcQuestionContentDTO=(McQuestionContentDTO)listIterator.next();
-            logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-            logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-            
-            logger.debug("intOriginalQuestionIndex versus displayOrder:" + new Integer(intOriginalQuestionIndex).toString() + " versus " + 
-                    mcQuestionContentDTO.getDisplayOrder());
-            if (new Integer(intOriginalQuestionIndex).toString().equals(mcQuestionContentDTO.getDisplayOrder()))
-            {
-                logger.debug("node found:" + mcQuestionContentDTO);
-                return mcQuestionContentDTO;
-            }
-        }
-        return null;
-    }
+    protected static McQuestionContentDTO extractNodeAtDisplayOrder(List listQuestionContentDTO,
+	    int intOriginalQuestionIndex) {
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	AuthoringUtil.logger.debug("intOriginalQuestionIndex:" + intOriginalQuestionIndex);
 
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
 
-    
+	    AuthoringUtil.logger.debug("intOriginalQuestionIndex versus displayOrder:"
+		    + new Integer(intOriginalQuestionIndex).toString() + " versus "
+		    + mcQuestionContentDTO.getDisplayOrder());
+	    if (new Integer(intOriginalQuestionIndex).toString().equals(mcQuestionContentDTO.getDisplayOrder())) {
+		AuthoringUtil.logger.debug("node found:" + mcQuestionContentDTO);
+		return mcQuestionContentDTO;
+	    }
+	}
+	return null;
+    }
+
     /**
      * McCandidateAnswersDTO extractCandidateAtOrder(List listCandidates, int intOriginalCandidateIndex)
      * 
      * @param listCandidates
      * @param intOriginalCandidateIndex
      * @return
      */
-    protected static McCandidateAnswersDTO extractCandidateAtOrder(List listCandidates, int intOriginalCandidateIndex)
-    {
-        logger.debug("listCandidates:" + listCandidates);
-        logger.debug("intOriginalCandidateIndex:" + intOriginalCandidateIndex);
-        
-        int counter=0;
-        Iterator listIterator=listCandidates.iterator();
-        while (listIterator.hasNext())
-        {
-            ++counter;
-            McCandidateAnswersDTO mcCandidateAnswerDTO=(McCandidateAnswersDTO)listIterator.next();
-            logger.debug("mcCandidateAnswerDTO:" + mcCandidateAnswerDTO);
-            
-            logger.debug("counter:" + counter);
-            
-            if (new Integer(intOriginalCandidateIndex).toString().equals(new Integer(counter).toString()))
-            {
-                logger.debug("node found:" + mcCandidateAnswerDTO);
-                return mcCandidateAnswerDTO;
-            }
-        }
-        return null;
+    protected static McCandidateAnswersDTO extractCandidateAtOrder(List listCandidates, int intOriginalCandidateIndex) {
+	AuthoringUtil.logger.debug("listCandidates:" + listCandidates);
+	AuthoringUtil.logger.debug("intOriginalCandidateIndex:" + intOriginalCandidateIndex);
+
+	int counter = 0;
+	Iterator listIterator = listCandidates.iterator();
+	while (listIterator.hasNext()) {
+	    ++counter;
+	    McCandidateAnswersDTO mcCandidateAnswerDTO = (McCandidateAnswersDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcCandidateAnswerDTO:" + mcCandidateAnswerDTO);
+
+	    AuthoringUtil.logger.debug("counter:" + counter);
+
+	    if (new Integer(intOriginalCandidateIndex).toString().equals(new Integer(counter).toString())) {
+		AuthoringUtil.logger.debug("node found:" + mcCandidateAnswerDTO);
+		return mcCandidateAnswerDTO;
+	    }
+	}
+	return null;
     }
-    
-    protected static String getTotalMark(List listQuestionContentDTO)
-    {
-        logger.debug("starting getTotalMark:" + listQuestionContentDTO);
-        
-        Map mapMarks = extractMapMarks(listQuestionContentDTO);
-        
-        int intTotalMark=0;
-    	Iterator itMap = mapMarks.entrySet().iterator();
-    	while (itMap.hasNext()) 
-    	{
-        	Map.Entry pairs = (Map.Entry)itMap.next();
-            logger.debug("using the pair: " +  pairs.getKey() + " = " + pairs.getValue());
-            
-            String mark= (String)pairs.getValue();
-            logger.debug("mark: " +  mark);
-            
-            if (mark != null)
-            {
-                int intMark= new Integer(mark).intValue();
-                intTotalMark+=intMark;
-                logger.debug("current intTotalMark: " +  intTotalMark);
-            }
-		}
-    	logger.debug("final  intTotalMark: " +  intTotalMark);
-    	
-    	String strFinalTotalMark= new Integer(intTotalMark).toString();
-    	logger.debug("final strFinalTotalMark: " +  strFinalTotalMark);
-    	return strFinalTotalMark;
+
+    protected static String getTotalMark(List listQuestionContentDTO) {
+	AuthoringUtil.logger.debug("starting getTotalMark:" + listQuestionContentDTO);
+
+	Map mapMarks = AuthoringUtil.extractMapMarks(listQuestionContentDTO);
+
+	int intTotalMark = 0;
+	Iterator itMap = mapMarks.entrySet().iterator();
+	while (itMap.hasNext()) {
+	    Map.Entry pairs = (Map.Entry) itMap.next();
+	    AuthoringUtil.logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue());
+
+	    String mark = (String) pairs.getValue();
+	    AuthoringUtil.logger.debug("mark: " + mark);
+
+	    if (mark != null) {
+		int intMark = new Integer(mark).intValue();
+		intTotalMark += intMark;
+		AuthoringUtil.logger.debug("current intTotalMark: " + intTotalMark);
+	    }
+	}
+	AuthoringUtil.logger.debug("final  intTotalMark: " + intTotalMark);
+
+	String strFinalTotalMark = new Integer(intTotalMark).toString();
+	AuthoringUtil.logger.debug("final strFinalTotalMark: " + strFinalTotalMark);
+	return strFinalTotalMark;
     }
-    
-    
+
     /**
      * extractMapQuestionContent(List listQuestionContentDTO)
      * 
      * @param listQuestionContentDTO
      * @return
      */
-    protected static Map extractMapQuestionContent(List listQuestionContentDTO)
-    {
-        logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-        Map mapQuestionContent= new TreeMap(new McComparator());
-        
-        Iterator listIterator=listQuestionContentDTO.iterator();
-        int queIndex=0;
-        while (listIterator.hasNext())
-        {
-            McQuestionContentDTO mcQuestionContentDTO=(McQuestionContentDTO)listIterator.next();
-            logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-            logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion()); 
-        
-            queIndex++;
-            logger.debug("queIndex:" + queIndex);
-            mapQuestionContent.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getQuestion());
-        }
-        logger.debug("mapQuestionContent:" + mapQuestionContent);
-        return mapQuestionContent;
+    protected static Map extractMapQuestionContent(List listQuestionContentDTO) {
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	Map mapQuestionContent = new TreeMap(new McComparator());
+
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	int queIndex = 0;
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+
+	    queIndex++;
+	    AuthoringUtil.logger.debug("queIndex:" + queIndex);
+	    mapQuestionContent.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getQuestion());
+	}
+	AuthoringUtil.logger.debug("mapQuestionContent:" + mapQuestionContent);
+	return mapQuestionContent;
     }
 
-    
     /**
      * List reorderListCandidatesDTO(List candidates)
      * 
      * @param candidates
      * @return
      */
-    protected  static List reorderListCandidatesDTO(List candidates)
-    {
-        logger.debug("reorderListCandidatesDTO");
-    	logger.debug("reorderListCandidatesDTO:" + candidates);
-    	
-    	List listFinalCandidatesDTO=new LinkedList();
-    	
-	    int queIndex=0;
-	    Iterator listIterator=candidates.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        McCandidateAnswersDTO mcCandidateAnswersDTO= (McCandidateAnswersDTO)listIterator.next();
-	        logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
-	        logger.debug("mcCandidateAnswersDTO answer:" + mcCandidateAnswersDTO.getCandidateAnswer());
-	        
-	        String answer=mcCandidateAnswersDTO.getCandidateAnswer();
-	        logger.debug("answer:" + answer);
-	        
-	        String correct=mcCandidateAnswersDTO.getCorrect(); 
-	        logger.debug("correct:" + correct);
+    protected static List reorderListCandidatesDTO(List candidates) {
+	AuthoringUtil.logger.debug("reorderListCandidatesDTO");
+	AuthoringUtil.logger.debug("reorderListCandidatesDTO:" + candidates);
 
-	        
-	        if ((answer != null) && (!answer.equals("")))
-    		{
-	            	mcCandidateAnswersDTO.setCandidateAnswer(answer);
-	            	mcCandidateAnswersDTO.setCorrect(correct);
+	List listFinalCandidatesDTO = new LinkedList();
 
-	            	listFinalCandidatesDTO.add(mcCandidateAnswersDTO);
+	int queIndex = 0;
+	Iterator listIterator = candidates.iterator();
+	while (listIterator.hasNext()) {
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = (McCandidateAnswersDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO answer:" + mcCandidateAnswersDTO.getCandidateAnswer());
 
-    		}
+	    String answer = mcCandidateAnswersDTO.getCandidateAnswer();
+	    AuthoringUtil.logger.debug("answer:" + answer);
+
+	    String correct = mcCandidateAnswersDTO.getCorrect();
+	    AuthoringUtil.logger.debug("correct:" + correct);
+
+	    if ((answer != null) && (!answer.equals(""))) {
+		mcCandidateAnswersDTO.setCandidateAnswer(answer);
+		mcCandidateAnswersDTO.setCorrect(correct);
+
+		listFinalCandidatesDTO.add(mcCandidateAnswersDTO);
+
 	    }
-	    
-	    
-        logger.debug("final listFinalCandidatesDTO:" + listFinalCandidatesDTO);
-        return listFinalCandidatesDTO;
+	}
+
+	AuthoringUtil.logger.debug("final listFinalCandidatesDTO:" + listFinalCandidatesDTO);
+	return listFinalCandidatesDTO;
     }
 
-    
     /**
      * reorderListQuestionContentDTO(List listQuestionContentDTO, String excludeQuestionIndex)
      * 
      * @param listQuestionContentDTO
      * @param excludeQuestionIndex
      * @return
      */
-    protected  static List reorderListQuestionContentDTO(List listQuestionContentDTO, String excludeQuestionIndex)
-    {
-        logger.debug("reorderListQuestionContentDTO");
-    	logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-    	logger.debug("excludeQuestionIndex:" + excludeQuestionIndex);
-    	
-    	List listFinalQuestionContentDTO=new LinkedList();
-    	
-	    int queIndex=0;
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-	        
-	        String question=mcQuestionContentDTO.getQuestion();
-	        logger.debug("question:" + question);
-	        
-	        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-	        logger.debug("displayOrder:" + displayOrder);
-	        
-	        String feedback=mcQuestionContentDTO.getFeedback();
-	        logger.debug("feedback:" + feedback);
-	        
-	        String caCount= mcQuestionContentDTO.getCaCount();
-	        logger.debug("caCount:" + caCount);
-	        
-	        List caList=mcQuestionContentDTO.getListCandidateAnswersDTO(); 
-	        logger.debug("caList:" + caList);
-	        
-	        
-	        logger.debug("displayOrder versus excludeQuestionIndex :" + displayOrder + " versus " + excludeQuestionIndex);
-	        
-	        if ((question != null) && (!question.equals("")))
-    		{
-	            if (!displayOrder.equals(excludeQuestionIndex))
-	            {
-		            ++queIndex;
-		            logger.debug("using queIndex:" + queIndex);
-		            
-		            mcQuestionContentDTO.setQuestion(question);
-		            mcQuestionContentDTO.setDisplayOrder(new Integer(queIndex).toString());
-		            mcQuestionContentDTO.setFeedback(feedback);
-		            mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+    protected static List reorderListQuestionContentDTO(List listQuestionContentDTO, String excludeQuestionIndex) {
+	AuthoringUtil.logger.debug("reorderListQuestionContentDTO");
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	AuthoringUtil.logger.debug("excludeQuestionIndex:" + excludeQuestionIndex);
 
-		            logger.debug("caList size:" + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
-				    mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO().size()).toString());
-		            
-		            listFinalQuestionContentDTO.add(mcQuestionContentDTO);
-	            }
-    		}
+	List listFinalQuestionContentDTO = new LinkedList();
+
+	int queIndex = 0;
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+
+	    String question = mcQuestionContentDTO.getQuestion();
+	    AuthoringUtil.logger.debug("question:" + question);
+
+	    String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+	    AuthoringUtil.logger.debug("displayOrder:" + displayOrder);
+
+	    String feedback = mcQuestionContentDTO.getFeedback();
+	    AuthoringUtil.logger.debug("feedback:" + feedback);
+
+	    String caCount = mcQuestionContentDTO.getCaCount();
+	    AuthoringUtil.logger.debug("caCount:" + caCount);
+
+	    List caList = mcQuestionContentDTO.getListCandidateAnswersDTO();
+	    AuthoringUtil.logger.debug("caList:" + caList);
+
+	    AuthoringUtil.logger.debug("displayOrder versus excludeQuestionIndex :" + displayOrder + " versus "
+		    + excludeQuestionIndex);
+
+	    if ((question != null) && (!question.equals(""))) {
+		if (!displayOrder.equals(excludeQuestionIndex)) {
+		    ++queIndex;
+		    AuthoringUtil.logger.debug("using queIndex:" + queIndex);
+
+		    mcQuestionContentDTO.setQuestion(question);
+		    mcQuestionContentDTO.setDisplayOrder(new Integer(queIndex).toString());
+		    mcQuestionContentDTO.setFeedback(feedback);
+		    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+
+		    AuthoringUtil.logger.debug("caList size:"
+			    + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
+		    mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO()
+			    .size()).toString());
+
+		    listFinalQuestionContentDTO.add(mcQuestionContentDTO);
+		}
 	    }
-	    
-	    
-        logger.debug("final listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
-        return listFinalQuestionContentDTO;
+	}
+
+	AuthoringUtil.logger.debug("final listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
+	return listFinalQuestionContentDTO;
     }
 
-    
     /**
      * List reorderSimpleListQuestionContentDTO(List listQuestionContentDTO)
      * 
      * @param listQuestionContentDTO
      * @return
      */
-    protected  static List reorderSimpleListQuestionContentDTO(List listQuestionContentDTO)
-    {
-        logger.debug("reorderListQuestionContentDTO");
-    	logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-    	List listFinalQuestionContentDTO=new LinkedList();
-    	
-	    int queIndex=0;
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-	        
-	        String question=mcQuestionContentDTO.getQuestion();
-	        logger.debug("question:" + question);
-	        
-	        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-	        logger.debug("displayOrder:" + displayOrder);
-	        
-	        String feedback=mcQuestionContentDTO.getFeedback();
-	        logger.debug("feedback:" + feedback);
-	        
-	        List caList=mcQuestionContentDTO.getListCandidateAnswersDTO(); 
-	        logger.debug("caList:" + caList);
-	        
-	        String caCount=mcQuestionContentDTO.getCaCount(); 
-	        logger.debug("caCount:" + caCount);
-	        
-	        String mark=mcQuestionContentDTO.getMark();
-	        logger.debug("mark:" + mark);
-	        
-	        
-	        if ((question != null) && (!question.equals("")))
-    		{
-		            ++queIndex;
-		            logger.debug("using queIndex:" + queIndex);
-		            
-		            mcQuestionContentDTO.setQuestion(question);
-		            mcQuestionContentDTO.setDisplayOrder(new Integer(queIndex).toString());
-		            mcQuestionContentDTO.setFeedback(feedback);
-		            mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-		            mcQuestionContentDTO.setCaCount(caCount);
-		            mcQuestionContentDTO.setMark(mark);
-		            listFinalQuestionContentDTO.add(mcQuestionContentDTO);
-    		}
+    protected static List reorderSimpleListQuestionContentDTO(List listQuestionContentDTO) {
+	AuthoringUtil.logger.debug("reorderListQuestionContentDTO");
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	List listFinalQuestionContentDTO = new LinkedList();
+
+	int queIndex = 0;
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+
+	    String question = mcQuestionContentDTO.getQuestion();
+	    AuthoringUtil.logger.debug("question:" + question);
+
+	    String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+	    AuthoringUtil.logger.debug("displayOrder:" + displayOrder);
+
+	    String feedback = mcQuestionContentDTO.getFeedback();
+	    AuthoringUtil.logger.debug("feedback:" + feedback);
+
+	    List caList = mcQuestionContentDTO.getListCandidateAnswersDTO();
+	    AuthoringUtil.logger.debug("caList:" + caList);
+
+	    String caCount = mcQuestionContentDTO.getCaCount();
+	    AuthoringUtil.logger.debug("caCount:" + caCount);
+
+	    String mark = mcQuestionContentDTO.getMark();
+	    AuthoringUtil.logger.debug("mark:" + mark);
+
+	    if ((question != null) && (!question.equals(""))) {
+		++queIndex;
+		AuthoringUtil.logger.debug("using queIndex:" + queIndex);
+
+		mcQuestionContentDTO.setQuestion(question);
+		mcQuestionContentDTO.setDisplayOrder(new Integer(queIndex).toString());
+		mcQuestionContentDTO.setFeedback(feedback);
+		mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+		mcQuestionContentDTO.setCaCount(caCount);
+		mcQuestionContentDTO.setMark(mark);
+		listFinalQuestionContentDTO.add(mcQuestionContentDTO);
 	    }
-	    
-	    
-        logger.debug("final listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
-        return listFinalQuestionContentDTO;
+	}
+
+	AuthoringUtil.logger.debug("final listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
+	return listFinalQuestionContentDTO;
     }
 
-    
     /**
-     * reorderUpdateListQuestionContentDTO(List listQuestionContentDTO, 
-            										McQuestionContentDTO mcQuestionContentDTONew, 
-            										String editableQuestionIndex)
-            										
+     * reorderUpdateListQuestionContentDTO(List listQuestionContentDTO, McQuestionContentDTO mcQuestionContentDTONew,
+     * String editableQuestionIndex)
+     * 
      * @param listQuestionContentDTO
      * @param mcQuestionContentDTONew
      * @param editableQuestionIndex
      * @return
      */
-    protected  static List reorderUpdateListQuestionContentDTO(List listQuestionContentDTO, 
-            										McQuestionContentDTO mcQuestionContentDTONew, 
-            										String editableQuestionIndex)
-    {
-        logger.debug("reorderUpdateListQuestionContentDTO");
-    	logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-    	logger.debug("mcQuestionContentDTONew:" + mcQuestionContentDTONew);
-    	logger.debug("editableQuestionIndex:" + editableQuestionIndex);
-    	
-    	
-    	List listFinalQuestionContentDTO=new LinkedList();
-    	
-	    int queIndex=0;
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-	        
-	        ++queIndex;
-	        logger.debug("using queIndex:" + queIndex);
-	        String question=mcQuestionContentDTO.getQuestion();
-	        logger.debug("question:" + question);
-	        
-	        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-	        logger.debug("displayOrder:" + displayOrder);
-	        
-	        String feedback=mcQuestionContentDTO.getFeedback();
-	        logger.debug("feedback:" + feedback);
-	        
-	        String mark=mcQuestionContentDTO.getMark(); 
-	        logger.debug("mark:" + mark);
+    protected static List reorderUpdateListQuestionContentDTO(List listQuestionContentDTO,
+	    McQuestionContentDTO mcQuestionContentDTONew, String editableQuestionIndex) {
+	AuthoringUtil.logger.debug("reorderUpdateListQuestionContentDTO");
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	AuthoringUtil.logger.debug("mcQuestionContentDTONew:" + mcQuestionContentDTONew);
+	AuthoringUtil.logger.debug("editableQuestionIndex:" + editableQuestionIndex);
 
-	        List caList=mcQuestionContentDTO.getListCandidateAnswersDTO();
-	        logger.debug("caList:" + caList);
+	List listFinalQuestionContentDTO = new LinkedList();
 
-	        String caCount=mcQuestionContentDTO.getCaCount();
-	        logger.debug("caCount:" + caCount);
-	        
-	        
-	        if (displayOrder.equals(editableQuestionIndex))
-            {
-	            logger.debug("displayOrder equals editableQuestionIndex:" + editableQuestionIndex);
-		        mcQuestionContentDTO.setQuestion(mcQuestionContentDTONew.getQuestion());
-	            mcQuestionContentDTO.setDisplayOrder(mcQuestionContentDTONew.getDisplayOrder());
-	            mcQuestionContentDTO.setFeedback(mcQuestionContentDTONew.getFeedback());
-	            mcQuestionContentDTO.setMark(mcQuestionContentDTONew.getMark());
-	            mcQuestionContentDTO.setCaCount(mcQuestionContentDTONew.getCaCount());
-	            mcQuestionContentDTO.setListCandidateAnswersDTO(mcQuestionContentDTONew.getListCandidateAnswersDTO());
-	            
-	            listFinalQuestionContentDTO.add(mcQuestionContentDTO);
-	        }
-	        else
-	        {
-	            logger.debug("displayOrder does not equal editableQuestionIndex:" + editableQuestionIndex);
-	            mcQuestionContentDTO.setQuestion(question);
-	            mcQuestionContentDTO.setDisplayOrder(displayOrder);
-	            mcQuestionContentDTO.setFeedback(feedback);
-	            mcQuestionContentDTO.setMark(mark);
-	            mcQuestionContentDTO.setCaCount(caCount);
-	            mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-	            listFinalQuestionContentDTO.add(mcQuestionContentDTO);
-	            
-	        }
-	         
-    	}
-	    
-	    logger.debug("listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
-        return listFinalQuestionContentDTO;
+	int queIndex = 0;
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+
+	    ++queIndex;
+	    AuthoringUtil.logger.debug("using queIndex:" + queIndex);
+	    String question = mcQuestionContentDTO.getQuestion();
+	    AuthoringUtil.logger.debug("question:" + question);
+
+	    String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+	    AuthoringUtil.logger.debug("displayOrder:" + displayOrder);
+
+	    String feedback = mcQuestionContentDTO.getFeedback();
+	    AuthoringUtil.logger.debug("feedback:" + feedback);
+
+	    String mark = mcQuestionContentDTO.getMark();
+	    AuthoringUtil.logger.debug("mark:" + mark);
+
+	    List caList = mcQuestionContentDTO.getListCandidateAnswersDTO();
+	    AuthoringUtil.logger.debug("caList:" + caList);
+
+	    String caCount = mcQuestionContentDTO.getCaCount();
+	    AuthoringUtil.logger.debug("caCount:" + caCount);
+
+	    if (displayOrder.equals(editableQuestionIndex)) {
+		AuthoringUtil.logger.debug("displayOrder equals editableQuestionIndex:" + editableQuestionIndex);
+		mcQuestionContentDTO.setQuestion(mcQuestionContentDTONew.getQuestion());
+		mcQuestionContentDTO.setDisplayOrder(mcQuestionContentDTONew.getDisplayOrder());
+		mcQuestionContentDTO.setFeedback(mcQuestionContentDTONew.getFeedback());
+		mcQuestionContentDTO.setMark(mcQuestionContentDTONew.getMark());
+		mcQuestionContentDTO.setCaCount(mcQuestionContentDTONew.getCaCount());
+		mcQuestionContentDTO.setListCandidateAnswersDTO(mcQuestionContentDTONew.getListCandidateAnswersDTO());
+
+		listFinalQuestionContentDTO.add(mcQuestionContentDTO);
+	    } else {
+		AuthoringUtil.logger
+			.debug("displayOrder does not equal editableQuestionIndex:" + editableQuestionIndex);
+		mcQuestionContentDTO.setQuestion(question);
+		mcQuestionContentDTO.setDisplayOrder(displayOrder);
+		mcQuestionContentDTO.setFeedback(feedback);
+		mcQuestionContentDTO.setMark(mark);
+		mcQuestionContentDTO.setCaCount(caCount);
+		mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+		listFinalQuestionContentDTO.add(mcQuestionContentDTO);
+
+	    }
+
+	}
+
+	AuthoringUtil.logger.debug("listFinalQuestionContentDTO:" + listFinalQuestionContentDTO);
+	return listFinalQuestionContentDTO;
     }
-    
-    
-  
+
     /**
      * sorts the questions by the display order
      * 
-     * reOrganizeDisplayOrder(Map mapQuestionContent, IMcService mcService, McAuthoringForm mcAuthoringForm, McContent mcContent)
+     * reOrganizeDisplayOrder(Map mapQuestionContent, IMcService mcService, McAuthoringForm mcAuthoringForm, McContent
+     * mcContent)
      * 
      * @param mapQuestionContent
      * @param mcService
      * @param mcAuthoringForm
      * @param mcContent
      */
-    public void reOrganizeDisplayOrder(Map mapQuestionContent, IMcService mcService, McAuthoringForm mcAuthoringForm, McContent mcContent)
-    {    
-        logger.debug("mcContent: " + mcContent);
-        if (mcContent != null)
-        {
-        	logger.debug("content uid: " + mcContent.getUid());
-        	List sortedQuestions=mcService.getAllQuestionEntriesSorted(mcContent.getUid().longValue());
-        	logger.debug("sortedQuestions: " + sortedQuestions);
-        	
-    		Iterator listIterator=sortedQuestions.iterator();
-    		int displayOrder=1;
-    		while (listIterator.hasNext())
-    		{
-    			McQueContent queContent=(McQueContent)listIterator.next();
-    			logger.debug("queContent data: " + queContent);
-    			logger.debug("queContent: " + queContent.getQuestion() + " " + queContent.getDisplayOrder());
-    			
-    			McQueContent existingMcQueContent=mcService.getQuestionContentByQuestionText(queContent.getQuestion(), mcContent.getUid());
-    	    	logger.debug("existingMcQueContent: " + existingMcQueContent);
-    	    	existingMcQueContent.setDisplayOrder(new Integer(displayOrder));
-    	    	logger.debug("updating the existing question content for displayOrder: " + existingMcQueContent);
-           		mcService.updateMcQueContent(existingMcQueContent);
-    			displayOrder++;
-    		}
-        }
-		logger.debug("done with reOrganizeDisplayOrder...");
+    public void reOrganizeDisplayOrder(Map mapQuestionContent, IMcService mcService, McAuthoringForm mcAuthoringForm,
+	    McContent mcContent) {
+	AuthoringUtil.logger.debug("mcContent: " + mcContent);
+	if (mcContent != null) {
+	    AuthoringUtil.logger.debug("content uid: " + mcContent.getUid());
+	    List sortedQuestions = mcService.getAllQuestionEntriesSorted(mcContent.getUid().longValue());
+	    AuthoringUtil.logger.debug("sortedQuestions: " + sortedQuestions);
+
+	    Iterator listIterator = sortedQuestions.iterator();
+	    int displayOrder = 1;
+	    while (listIterator.hasNext()) {
+		McQueContent queContent = (McQueContent) listIterator.next();
+		AuthoringUtil.logger.debug("queContent data: " + queContent);
+		AuthoringUtil.logger.debug("queContent: " + queContent.getQuestion() + " "
+			+ queContent.getDisplayOrder());
+
+		McQueContent existingMcQueContent = mcService.getQuestionContentByQuestionText(
+			queContent.getQuestion(), mcContent.getUid());
+		AuthoringUtil.logger.debug("existingMcQueContent: " + existingMcQueContent);
+		existingMcQueContent.setDisplayOrder(new Integer(displayOrder));
+		AuthoringUtil.logger.debug("updating the existing question content for displayOrder: "
+			+ existingMcQueContent);
+		mcService.updateMcQueContent(existingMcQueContent);
+		displayOrder++;
+	    }
+	}
+	AuthoringUtil.logger.debug("done with reOrganizeDisplayOrder...");
     }
-    
-    
 
     /**
      * boolean checkDuplicateQuestions(List listQuestionContentDTO, String newQuestion)
@@ -1122,236 +1012,215 @@
      * @param newQuestion
      * @return
      */
-    public static boolean checkDuplicateQuestions(List listQuestionContentDTO, String newQuestion)
-    {
-        logger.debug("checkDuplicateQuestions: " + listQuestionContentDTO);
-        logger.debug("newQuestion: " + newQuestion);
-        
-        Map mapQuestionContent=extractMapQuestionContent(listQuestionContentDTO);
-        logger.debug("mapQuestionContent: " + mapQuestionContent);
-        
-    	Iterator itMap = mapQuestionContent.entrySet().iterator();
-	    while (itMap.hasNext()) {
-	        Map.Entry pairs = (Map.Entry)itMap.next();
-	        if ((pairs.getValue() != null) && (!pairs.getValue().equals("")))
-    		{
-	        	logger.debug("checking the  pair: " +  pairs.getKey() + " = " + pairs.getValue());
-	        	
-	        	if (pairs.getValue().equals(newQuestion))
-	        	{
-	        	    logger.debug("entry found: " +  newQuestion);
-	        	    return true;
-	        	}
-    		}
+    public static boolean checkDuplicateQuestions(List listQuestionContentDTO, String newQuestion) {
+	AuthoringUtil.logger.debug("checkDuplicateQuestions: " + listQuestionContentDTO);
+	AuthoringUtil.logger.debug("newQuestion: " + newQuestion);
+
+	Map mapQuestionContent = AuthoringUtil.extractMapQuestionContent(listQuestionContentDTO);
+	AuthoringUtil.logger.debug("mapQuestionContent: " + mapQuestionContent);
+
+	Iterator itMap = mapQuestionContent.entrySet().iterator();
+	while (itMap.hasNext()) {
+	    Map.Entry pairs = (Map.Entry) itMap.next();
+	    if ((pairs.getValue() != null) && (!pairs.getValue().equals(""))) {
+		AuthoringUtil.logger.debug("checking the  pair: " + pairs.getKey() + " = " + pairs.getValue());
+
+		if (pairs.getValue().equals(newQuestion)) {
+		    AuthoringUtil.logger.debug("entry found: " + newQuestion);
+		    return true;
+		}
 	    }
-	    return false;
+	}
+	return false;
     }
-    
 
     /**
-     * removes unused question entries from db
-     * removeRedundantQuestions (Map mapQuestionContent, IMcService mcService, McAuthoringForm mcAuthoringForm)
+     * removes unused question entries from db removeRedundantQuestions (Map mapQuestionContent, IMcService mcService,
+     * McAuthoringForm mcAuthoringForm)
      * 
      * @param mapQuestionContent
      * @param mcService
      * @param mcAuthoringForm
      */
-    public void removeRedundantQuestions (Map mapQuestionContent, IMcService mcService, McAuthoringForm mcAuthoringForm, 
-            HttpServletRequest request, String toolContentID)
-	{
-    	logger.debug("removing unused entries... ");
-    	logger.debug("mapQuestionContent:  " + mapQuestionContent);
-    	logger.debug("toolContentID:  " + toolContentID);
-    	
-    	McContent mcContent=mcService.retrieveMc( new Long(toolContentID));
-    	logger.debug("mcContent:  " + mcContent);
-    	
-    	if (mcContent != null)
-    	{
-        	logger.debug("mcContent uid: " + mcContent.getUid());
-        	List allQuestions=mcService.getAllQuestionEntries(mcContent.getUid());
-        	logger.debug("allQuestions: " + allQuestions);
-        	
-        	Iterator listIterator=allQuestions.iterator();
-    		int mapIndex=0;
-    		boolean entryUsed=false;
-    		while (listIterator.hasNext())
-    		{
-	            ++mapIndex;
-	            logger.debug("current mapIndex: " +  mapIndex);
+    public void removeRedundantQuestions(Map mapQuestionContent, IMcService mcService, McAuthoringForm mcAuthoringForm,
+	    HttpServletRequest request, String toolContentID) {
+	AuthoringUtil.logger.debug("removing unused entries... ");
+	AuthoringUtil.logger.debug("mapQuestionContent:  " + mapQuestionContent);
+	AuthoringUtil.logger.debug("toolContentID:  " + toolContentID);
 
-    			McQueContent queContent=(McQueContent)listIterator.next();
-    			logger.debug("queContent data: " + queContent);
-    			logger.debug("queContent: " + queContent.getQuestion() + " " + queContent.getDisplayOrder());
-    			
-    			entryUsed=false;
-    	        Iterator itMap = mapQuestionContent.entrySet().iterator();
-    	        int displayOrder=0;
-    	        while (itMap.hasNext()) 
-    		    {
-    	            ++displayOrder;
-    	            logger.debug("current displayOrder: " +  displayOrder);
-    	        	entryUsed=false;
-    		        Map.Entry pairs = (Map.Entry)itMap.next();
-    		        logger.debug("using the pair: " +  pairs.getKey() + " = " + pairs.getValue());
-    		        
-    		        if (pairs.getValue().toString().length() != 0)
-    		        {
-    		        	logger.debug("text from map:" + pairs.getValue().toString());
-    		        	logger.debug("text from db:" + queContent.getQuestion());
+	McContent mcContent = mcService.retrieveMc(new Long(toolContentID));
+	AuthoringUtil.logger.debug("mcContent:  " + mcContent);
 
-		        	    logger.debug("mapIndex versus displayOrder:" + mapIndex + " versus " + displayOrder);
-    		        	if (mapIndex == displayOrder)
-    		        	{
-    		        		//logger.debug("used entry in db:" + queContent.getQuestion());
-    		        	    logger.debug("used displayOrder position:" + displayOrder);
-    		        		entryUsed=true;
-    		        		break;
-    		        	}
-    		        	
-    		        }
-    		    }
-    	        
-    	        if (entryUsed == false)
-    	        {
-    	        	logger.debug("removing unused entry in db:" + queContent.getQuestion());
-    	        	
-    	        	McQueContent removeableMcQueContent=mcService.getQuestionContentByQuestionText(queContent.getQuestion(), mcContent.getUid());
-        			logger.debug("removeableMcQueContent"  + removeableMcQueContent);
-        			if (removeableMcQueContent != null)
-        			{
-        			    //mcContent.getMcQueContents().remove(removeableMcQueContent);
-        				mcService.removeMcQueContent(removeableMcQueContent);
-            			logger.debug("removed removeableMcQueContent from the db: " + removeableMcQueContent);	
-        			}
-    	        	
-    	        }
-    		}    		
-    	}
-	
+	if (mcContent != null) {
+	    AuthoringUtil.logger.debug("mcContent uid: " + mcContent.getUid());
+	    List allQuestions = mcService.getAllQuestionEntries(mcContent.getUid());
+	    AuthoringUtil.logger.debug("allQuestions: " + allQuestions);
+
+	    Iterator listIterator = allQuestions.iterator();
+	    int mapIndex = 0;
+	    boolean entryUsed = false;
+	    while (listIterator.hasNext()) {
+		++mapIndex;
+		AuthoringUtil.logger.debug("current mapIndex: " + mapIndex);
+
+		McQueContent queContent = (McQueContent) listIterator.next();
+		AuthoringUtil.logger.debug("queContent data: " + queContent);
+		AuthoringUtil.logger.debug("queContent: " + queContent.getQuestion() + " "
+			+ queContent.getDisplayOrder());
+
+		entryUsed = false;
+		Iterator itMap = mapQuestionContent.entrySet().iterator();
+		int displayOrder = 0;
+		while (itMap.hasNext()) {
+		    ++displayOrder;
+		    AuthoringUtil.logger.debug("current displayOrder: " + displayOrder);
+		    entryUsed = false;
+		    Map.Entry pairs = (Map.Entry) itMap.next();
+		    AuthoringUtil.logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue());
+
+		    if (pairs.getValue().toString().length() != 0) {
+			AuthoringUtil.logger.debug("text from map:" + pairs.getValue().toString());
+			AuthoringUtil.logger.debug("text from db:" + queContent.getQuestion());
+
+			AuthoringUtil.logger.debug("mapIndex versus displayOrder:" + mapIndex + " versus "
+				+ displayOrder);
+			if (mapIndex == displayOrder) {
+			    // logger.debug("used entry in db:" + queContent.getQuestion());
+			    AuthoringUtil.logger.debug("used displayOrder position:" + displayOrder);
+			    entryUsed = true;
+			    break;
+			}
+
+		    }
+		}
+
+		if (entryUsed == false) {
+		    AuthoringUtil.logger.debug("removing unused entry in db:" + queContent.getQuestion());
+
+		    McQueContent removeableMcQueContent = mcService.getQuestionContentByQuestionText(
+			    queContent.getQuestion(), mcContent.getUid());
+		    AuthoringUtil.logger.debug("removeableMcQueContent" + removeableMcQueContent);
+		    if (removeableMcQueContent != null) {
+			// mcContent.getMcQueContents().remove(removeableMcQueContent);
+			mcService.removeMcQueContent(removeableMcQueContent);
+			AuthoringUtil.logger.debug("removed removeableMcQueContent from the db: "
+				+ removeableMcQueContent);
+		    }
+
+		}
+	    }
 	}
-    
-    
+
+    }
+
     /**
      * Map extractMapFeedback(List listQuestionContentDTO)
      * 
      * @param listQuestionContentDTO
      * @return
      */
-    protected static Map extractMapFeedback(List listQuestionContentDTO)
-    {
-        logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-        Map mapFeedbackContent= new TreeMap(new McComparator());
-        
-        Iterator listIterator=listQuestionContentDTO.iterator();
-        int queIndex=0;
-        while (listIterator.hasNext())
-        {
-            McQuestionContentDTO mcQuestionContentDTO=(McQuestionContentDTO)listIterator.next();
-            logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-            logger.debug("mcQuestionContentDTO feedback:" + mcQuestionContentDTO.getFeedback()); 
-        
-            queIndex++;
-            logger.debug("queIndex:" + queIndex);
-            mapFeedbackContent.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getFeedback());
-        }
-        logger.debug("mapFeedbackContent:" + mapFeedbackContent);
-        return mapFeedbackContent;
+    protected static Map extractMapFeedback(List listQuestionContentDTO) {
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	Map mapFeedbackContent = new TreeMap(new McComparator());
+
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	int queIndex = 0;
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO feedback:" + mcQuestionContentDTO.getFeedback());
+
+	    queIndex++;
+	    AuthoringUtil.logger.debug("queIndex:" + queIndex);
+	    mapFeedbackContent.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getFeedback());
+	}
+	AuthoringUtil.logger.debug("mapFeedbackContent:" + mapFeedbackContent);
+	return mapFeedbackContent;
     }
 
-    
     /**
      * Map extractMapWeights(List listQuestionContentDTO)
      * 
      * @param listQuestionContentDTO
      * @return
      */
-    protected static Map extractMapWeights(List listQuestionContentDTO)
-    {
-        logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-        Map mapWeights= new TreeMap(new McComparator());
-        
-        Iterator listIterator=listQuestionContentDTO.iterator();
-        int queIndex=0;
-        while (listIterator.hasNext())
-        {
-            McQuestionContentDTO mcQuestionContentDTO=(McQuestionContentDTO)listIterator.next();
-            logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-            logger.debug("mcQuestionContentDTO weight:" + mcQuestionContentDTO.getWeight()); 
-        
-            queIndex++;
-            logger.debug("queIndex:" + queIndex);
-            mapWeights.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getWeight());
-        }
-        logger.debug("mapWeights:" + mapWeights);
-        return mapWeights;
-    }
+    protected static Map extractMapWeights(List listQuestionContentDTO) {
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	Map mapWeights = new TreeMap(new McComparator());
 
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	int queIndex = 0;
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO weight:" + mcQuestionContentDTO.getWeight());
 
+	    queIndex++;
+	    AuthoringUtil.logger.debug("queIndex:" + queIndex);
+	    mapWeights.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getWeight());
+	}
+	AuthoringUtil.logger.debug("mapWeights:" + mapWeights);
+	return mapWeights;
+    }
+
     /**
      * Map extractMapMarks(List listQuestionContentDTO)
      * 
      * @param listQuestionContentDTO
      * @return
      */
-    protected static Map extractMapMarks(List listQuestionContentDTO)
-    {
-        logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-        Map mapMarks= new TreeMap(new McComparator());
-        
-        Iterator listIterator=listQuestionContentDTO.iterator();
-        int queIndex=0;
-        while (listIterator.hasNext())
-        {
-            McQuestionContentDTO mcQuestionContentDTO=(McQuestionContentDTO)listIterator.next();
-            logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-            logger.debug("mcQuestionContentDTO weight:" + mcQuestionContentDTO.getMark()); 
-        
-            queIndex++;
-            logger.debug("queIndex:" + queIndex);
-            mapMarks.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getMark());
-        }
-        logger.debug("mapMarks:" + mapMarks);
-        return mapMarks;
-    }
+    protected static Map extractMapMarks(List listQuestionContentDTO) {
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	Map mapMarks = new TreeMap(new McComparator());
 
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	int queIndex = 0;
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO weight:" + mcQuestionContentDTO.getMark());
 
+	    queIndex++;
+	    AuthoringUtil.logger.debug("queIndex:" + queIndex);
+	    mapMarks.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getMark());
+	}
+	AuthoringUtil.logger.debug("mapMarks:" + mapMarks);
+	return mapMarks;
+    }
+
     /**
      * Map extractMapCandidatesList(List listQuestionContentDTO)
      * 
      * @param listQuestionContentDTO
      * @return
      */
-    protected static Map extractMapCandidatesList(List listQuestionContentDTO)
-    {
-        logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
-        Map mapCandidatesList= new TreeMap(new McComparator());
-        
-        Iterator listIterator=listQuestionContentDTO.iterator();
-        int queIndex=0;
-        while (listIterator.hasNext())
-        {
-            McQuestionContentDTO mcQuestionContentDTO=(McQuestionContentDTO)listIterator.next();
-            logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-            logger.debug("mcQuestionContentDTO candidates list:" + mcQuestionContentDTO.getListCandidateAnswersDTO()); 
-        
-            queIndex++;
-            logger.debug("queIndex:" + queIndex);
-            mapCandidatesList.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getListCandidateAnswersDTO());
-        }
-        logger.debug("mapCandidatesList:" + mapCandidatesList);
-        return mapCandidatesList;
+    protected static Map extractMapCandidatesList(List listQuestionContentDTO) {
+	AuthoringUtil.logger.debug("listQuestionContentDTO:" + listQuestionContentDTO);
+	Map mapCandidatesList = new TreeMap(new McComparator());
+
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	int queIndex = 0;
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    AuthoringUtil.logger.debug("mcQuestionContentDTO candidates list:"
+		    + mcQuestionContentDTO.getListCandidateAnswersDTO());
+
+	    queIndex++;
+	    AuthoringUtil.logger.debug("queIndex:" + queIndex);
+	    mapCandidatesList.put(new Integer(queIndex).toString(), mcQuestionContentDTO.getListCandidateAnswersDTO());
+	}
+	AuthoringUtil.logger.debug("mapCandidatesList:" + mapCandidatesList);
+	return mapCandidatesList;
     }
-    
-    
 
     /**
-     * saveOrUpdateMcContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, Map mapMarks, Map mapCandidatesList, 
-            IMcService mcService, McAuthoringForm mcAuthoringForm, 
-            HttpServletRequest request, McContent mcContent, String strToolContentID)
-            
-        enables persisting content
-        
+     * saveOrUpdateMcContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, Map mapMarks, Map
+     * mapCandidatesList, IMcService mcService, McAuthoringForm mcAuthoringForm, HttpServletRequest request, McContent
+     * mcContent, String strToolContentID)
+     * 
+     * enables persisting content
+     * 
      * @param mapQuestionContent
      * @param mapFeedback
      * @param mapWeights
@@ -1364,198 +1233,186 @@
      * @param strToolContentID
      * @return
      */
-    public McContent  saveOrUpdateMcContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, Map mapMarks, Map mapCandidatesList, 
-            IMcService mcService, McAuthoringForm mcAuthoringForm, 
-            HttpServletRequest request, McContent mcContent, String strToolContentID)
-    {
-        logger.debug("doing saveOrUpdateMcContent, mapCandidatesList: " + mapCandidatesList);
-        UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-        
-        String richTextTitle = request.getParameter(TITLE);
-        String richTextInstructions = request.getParameter(INSTRUCTIONS);
+    public McContent saveOrUpdateMcContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, Map mapMarks,
+	    Map mapCandidatesList, IMcService mcService, McAuthoringForm mcAuthoringForm, HttpServletRequest request,
+	    McContent mcContent, String strToolContentID) {
+	AuthoringUtil.logger.debug("doing saveOrUpdateMcContent, mapCandidatesList: " + mapCandidatesList);
+	UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
-        logger.debug("richTextTitle: " + richTextTitle);
-        logger.debug("richTextInstructions: " + richTextInstructions);
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
 
-    	String sln=request.getParameter("sln");
-    	logger.debug("sln: " + sln);
-		
-		String questionsSequenced=request.getParameter("questionsSequenced");
-		logger.debug("questionsSequenced: " + questionsSequenced);
+	AuthoringUtil.logger.debug("richTextTitle: " + richTextTitle);
+	AuthoringUtil.logger.debug("richTextInstructions: " + richTextInstructions);
 
-		String randomize=request.getParameter("randomize");
-		logger.debug("randomize: " + randomize);
+	String sln = request.getParameter("sln");
+	AuthoringUtil.logger.debug("sln: " + sln);
 
-		String displayAnswers=request.getParameter("displayAnswers");
-		logger.debug("displayAnswers: " + displayAnswers);
-		
-		String showMarks=request.getParameter("showMarks");
-		logger.debug("showMarks: " + showMarks);
-		
+	String questionsSequenced = request.getParameter("questionsSequenced");
+	AuthoringUtil.logger.debug("questionsSequenced: " + questionsSequenced);
 
-		String retries=request.getParameter("retries");
-		logger.debug("retries: " + retries);
-		
-		String reflect=request.getParameter(REFLECT);
-		logger.debug("reflect: " + reflect);
+	String randomize = request.getParameter("randomize");
+	AuthoringUtil.logger.debug("randomize: " + randomize);
 
-		
-		String richTextOfflineInstructions=request.getParameter(OFFLINE_INSTRUCTIONS);
-		String richTextOnlineInstructions=request.getParameter(ONLINE_INSTRUCTIONS);
-		
-		String reflectionSubject=request.getParameter(REFLECTION_SUBJECT);
-		logger.debug("reflectionSubject: " + reflectionSubject);
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-        
-        
-        boolean setCommonContent=true; 
-        if ((sln == null) || (questionsSequenced == null) || 
-             (retries == null) || (reflect == null) || (showMarks == null)  || (randomize == null))
-        {
-        	setCommonContent=false;
-        }
-        logger.debug("setCommonContent: " + setCommonContent);
-		
-        boolean questionsSequencedBoolean=false;
-        boolean randomizeBoolean=false;
-        boolean displayAnswersBoolean=false;
-        boolean showMarksBoolean=false;
-        boolean slnBoolean=false;
-        boolean retriesBoolean=false;
-        boolean reflectBoolean=false;
+	String displayAnswers = request.getParameter("displayAnswers");
+	AuthoringUtil.logger.debug("displayAnswers: " + displayAnswers);
 
-    	if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1")))
-            questionsSequencedBoolean=true;
-    	
-    	if ((randomize != null) && (randomize.equalsIgnoreCase("1")))
-    	    randomizeBoolean=true;            
+	String showMarks = request.getParameter("showMarks");
+	AuthoringUtil.logger.debug("showMarks: " + showMarks);
 
-    	if ((displayAnswers != null) && (displayAnswers.equalsIgnoreCase("1")))
-    		displayAnswersBoolean=true;         	
-    	
-    	if ((showMarks != null) && (showMarks.equalsIgnoreCase("1")))
-    	    showMarksBoolean=true;            
-    	
-        if ((sln != null) && (sln.equalsIgnoreCase("1")))
-            slnBoolean=true;            
-        
-        if ((retries != null) && (retries.equalsIgnoreCase("1")))
-            retriesBoolean=true;            
+	String retries = request.getParameter("retries");
+	AuthoringUtil.logger.debug("retries: " + retries);
 
-        if ((reflect != null) && (reflect.equalsIgnoreCase("1")))
-            reflectBoolean=true;
-            
-            
-        logger.debug("questionsSequencedBoolean: " + questionsSequencedBoolean);
-        logger.debug("slnBoolean: " + slnBoolean);
-        logger.debug("retriesBoolean: " + retriesBoolean);
-        logger.debug("reflectBoolean: " + reflectBoolean);
-        
-        long userId=0;
-        if (toolUser != null)
-        {
-        	userId = toolUser.getUserID().longValue();	
-        }
-        else
-        {
-    		HttpSession ss = SessionManager.getSession();
-    		logger.debug("ss: " + ss);
-    		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-    		logger.debug("user" + user);
-    		if (user != null)
-    		{
-    			userId = user.getUserID().longValue();	
-    		}
-    		else
-    		{
-    			logger.debug("should not reach here");
-    			userId=0;
-    		}
-        }
-        logger.debug("userId: " + userId);
-     	logger.debug("mcContent: " + mcContent);
-     	
-     	boolean newContent=false;
-        if(mcContent == null)
-        {
-        	mcContent = new McContent();
-        	newContent=true;
-        }
+	String reflect = request.getParameter(McAppConstants.REFLECT);
+	AuthoringUtil.logger.debug("reflect: " + reflect);
 
+	String richTextOfflineInstructions = request.getParameter(McAppConstants.OFFLINE_INSTRUCTIONS);
+	String richTextOnlineInstructions = request.getParameter(McAppConstants.ONLINE_INSTRUCTIONS);
 
-    	logger.debug("setting common content values..." + richTextTitle + " " + richTextInstructions);
-    	mcContent.setMcContentId(new Long(strToolContentID));
-     	mcContent.setTitle(richTextTitle);
-     	mcContent.setInstructions(richTextInstructions);
-     	mcContent.setUpdateDate(new Date(System.currentTimeMillis())); /**keep updating this one*/
-     	logger.debug("userId: " + userId);
-     	mcContent.setCreatedBy(userId); /**make sure we are setting the userId from the User object above*/
-     	logger.debug("end of setting common content values...");
+	String reflectionSubject = request.getParameter(McAppConstants.REFLECTION_SUBJECT);
+	AuthoringUtil.logger.debug("reflectionSubject: " + reflectionSubject);
 
-     	
-     	String passmark= request.getParameter("passmark");
-     	logger.debug("passmark: " + passmark);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	AuthoringUtil.logger.debug("activeModule: " + activeModule);
 
-     	if (passmark == null) 
-     	   passmark="0";
-     	
-     	if  ((passmark != null) && (passmark.equals(" ")))
-     	   passmark="0";
-     	    
-     	else if ((passmark != null) && (passmark.length() == 0))  
-      	   passmark="0";
-      	
-     	
-     	     	logger.debug("activeModule:" + activeModule);
-     	if (activeModule.equals(AUTHORING))
-		{
-        	logger.debug("setting other content values...");
-         	mcContent.setOnlineInstructions(richTextOnlineInstructions);
-         	mcContent.setOfflineInstructions(richTextOfflineInstructions);
-         	mcContent.setQuestionsSequenced(questionsSequencedBoolean);
-         	mcContent.setRandomize(randomizeBoolean);
-         	mcContent.setDisplayAnswers(displayAnswersBoolean);
-         	mcContent.setShowMarks(showMarksBoolean);
-         	mcContent.setRetries(retriesBoolean);
-         	mcContent.setShowReport(slnBoolean);	
-         	mcContent.setReflect(reflectBoolean);
-         	mcContent.setReflectionSubject(reflectionSubject);
-         	
-         	logger.debug("setting passmark...");
-         	mcContent.setPassMark(new Integer(passmark));
-		}
-        	
- 
-        if (newContent)
-        {
-        	logger.debug("will create: " + mcContent);
-         	mcService.createMc(mcContent);
-        }
-        else
-        {
-        	logger.debug("will update: " + mcContent);
-            mcService.updateMc(mcContent);
-        }
-        
-        mcContent=mcService.retrieveMc(new Long(strToolContentID));
-     	logger.debug("mcContent: " + mcContent);
-        
-        mcContent=createQuestionContent(mapQuestionContent, mapFeedback, mapWeights, mapMarks, mapCandidatesList, mcService, mcContent);
-        
-        return mcContent;
+	boolean setCommonContent = true;
+	if ((sln == null) || (questionsSequenced == null) || (retries == null) || (reflect == null)
+		|| (showMarks == null) || (randomize == null)) {
+	    setCommonContent = false;
+	}
+	AuthoringUtil.logger.debug("setCommonContent: " + setCommonContent);
+
+	boolean questionsSequencedBoolean = false;
+	boolean randomizeBoolean = false;
+	boolean displayAnswersBoolean = false;
+	boolean showMarksBoolean = false;
+	boolean slnBoolean = false;
+	boolean retriesBoolean = false;
+	boolean reflectBoolean = false;
+
+	if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1"))) {
+	    questionsSequencedBoolean = true;
+	}
+
+	if ((randomize != null) && (randomize.equalsIgnoreCase("1"))) {
+	    randomizeBoolean = true;
+	}
+
+	if ((displayAnswers != null) && (displayAnswers.equalsIgnoreCase("1"))) {
+	    displayAnswersBoolean = true;
+	}
+
+	if ((showMarks != null) && (showMarks.equalsIgnoreCase("1"))) {
+	    showMarksBoolean = true;
+	}
+
+	if ((sln != null) && (sln.equalsIgnoreCase("1"))) {
+	    slnBoolean = true;
+	}
+
+	if ((retries != null) && (retries.equalsIgnoreCase("1"))) {
+	    retriesBoolean = true;
+	}
+
+	if ((reflect != null) && (reflect.equalsIgnoreCase("1"))) {
+	    reflectBoolean = true;
+	}
+
+	AuthoringUtil.logger.debug("questionsSequencedBoolean: " + questionsSequencedBoolean);
+	AuthoringUtil.logger.debug("slnBoolean: " + slnBoolean);
+	AuthoringUtil.logger.debug("retriesBoolean: " + retriesBoolean);
+	AuthoringUtil.logger.debug("reflectBoolean: " + reflectBoolean);
+
+	long userId = 0;
+	if (toolUser != null) {
+	    userId = toolUser.getUserID().longValue();
+	} else {
+	    HttpSession ss = SessionManager.getSession();
+	    AuthoringUtil.logger.debug("ss: " + ss);
+	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    AuthoringUtil.logger.debug("user" + user);
+	    if (user != null) {
+		userId = user.getUserID().longValue();
+	    } else {
+		AuthoringUtil.logger.debug("should not reach here");
+		userId = 0;
+	    }
+	}
+	AuthoringUtil.logger.debug("userId: " + userId);
+	AuthoringUtil.logger.debug("mcContent: " + mcContent);
+
+	boolean newContent = false;
+	if (mcContent == null) {
+	    mcContent = new McContent();
+	    newContent = true;
+	}
+
+	AuthoringUtil.logger.debug("setting common content values..." + richTextTitle + " " + richTextInstructions);
+	mcContent.setMcContentId(new Long(strToolContentID));
+	mcContent.setTitle(richTextTitle);
+	mcContent.setInstructions(richTextInstructions);
+	mcContent.setUpdateDate(new Date(System.currentTimeMillis()));
+	/** keep updating this one */
+	AuthoringUtil.logger.debug("userId: " + userId);
+	mcContent.setCreatedBy(userId);
+	/** make sure we are setting the userId from the User object above */
+	AuthoringUtil.logger.debug("end of setting common content values...");
+
+	String passmark = request.getParameter("passmark");
+	AuthoringUtil.logger.debug("passmark: " + passmark);
+
+	if (passmark == null) {
+	    passmark = "0";
+	}
+
+	if ((passmark != null) && (passmark.equals(" "))) {
+	    passmark = "0";
+	} else if ((passmark != null) && (passmark.length() == 0)) {
+	    passmark = "0";
+	}
+
+	AuthoringUtil.logger.debug("activeModule:" + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    AuthoringUtil.logger.debug("setting other content values...");
+	    mcContent.setOnlineInstructions(richTextOnlineInstructions);
+	    mcContent.setOfflineInstructions(richTextOfflineInstructions);
+	    mcContent.setQuestionsSequenced(questionsSequencedBoolean);
+	    mcContent.setRandomize(randomizeBoolean);
+	    mcContent.setDisplayAnswers(displayAnswersBoolean);
+	    mcContent.setShowMarks(showMarksBoolean);
+	    mcContent.setRetries(retriesBoolean);
+	    mcContent.setShowReport(slnBoolean);
+	    mcContent.setReflect(reflectBoolean);
+	    mcContent.setReflectionSubject(reflectionSubject);
+
+	    AuthoringUtil.logger.debug("setting passmark...");
+	    mcContent.setPassMark(new Integer(passmark));
+	}
+
+	if (newContent) {
+	    AuthoringUtil.logger.debug("will create: " + mcContent);
+	    mcService.createMc(mcContent);
+	} else {
+	    AuthoringUtil.logger.debug("will update: " + mcContent);
+	    mcService.updateMc(mcContent);
+	}
+
+	mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	AuthoringUtil.logger.debug("mcContent: " + mcContent);
+
+	mcContent = createQuestionContent(mapQuestionContent, mapFeedback, mapWeights, mapMarks, mapCandidatesList,
+		mcService, mcContent);
+
+	return mcContent;
     }
-    
-        
-    
+
     /**
      * 
-     * McContent createQuestionContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, 
-            Map mapMarks, Map mapCandidatesList, IMcService mcService, McContent mcContent)
-     *
+     * McContent createQuestionContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, Map mapMarks, Map
+     * mapCandidatesList, IMcService mcService, McContent mcContent)
+     * 
      * persists the questions in the Map the user has submitted
-     *  
+     * 
      * @param mapQuestionContent
      * @param mapFeedback
      * @param mapWeights
@@ -1565,290 +1422,246 @@
      * @param mcContent
      * @return
      */
-    protected McContent createQuestionContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, 
-            Map mapMarks, Map mapCandidatesList, IMcService mcService, McContent mcContent)
-    {    
-        logger.debug("createQuestionContent, mapCandidatesList: " + mapCandidatesList);
-        logger.debug("content uid is: " + mcContent.getUid());
-        List questions=mcService.retrieveMcQueContentsByToolContentId(mcContent.getUid().longValue());
-        logger.debug("questions: " + questions);
-        
-        logger.debug("mapQuestionContent: " + mapQuestionContent);
-        logger.debug("mapFeedback: " + mapFeedback);
-        logger.debug("mapMarks: " + mapMarks);
+    protected McContent createQuestionContent(Map mapQuestionContent, Map mapFeedback, Map mapWeights, Map mapMarks,
+	    Map mapCandidatesList, IMcService mcService, McContent mcContent) {
+	AuthoringUtil.logger.debug("createQuestionContent, mapCandidatesList: " + mapCandidatesList);
+	AuthoringUtil.logger.debug("content uid is: " + mcContent.getUid());
+	List questions = mcService.retrieveMcQueContentsByToolContentId(mcContent.getUid().longValue());
+	AuthoringUtil.logger.debug("questions: " + questions);
 
-        
-        Iterator itMap = mapQuestionContent.entrySet().iterator();
-        int displayOrder=0;
-        while (itMap.hasNext()) 
-	    {
-	        Map.Entry pairs = (Map.Entry)itMap.next();
-	        logger.debug("using the pair: " +  pairs.getKey() + " = " + pairs.getValue());
-	        
-	        if (pairs.getValue().toString().length() != 0)
-	        {
-	        	logger.debug("starting createQuestionContent: pairs.getValue().toString():" + pairs.getValue().toString());
-	        	logger.debug("starting createQuestionContent: mcContent: " + mcContent);
-	        	
-	        	++displayOrder;
-	        	logger.debug("starting createQuestionContent: displayOrder: " + displayOrder);
-	        	String currentFeedback=(String)mapFeedback.get(new Integer(displayOrder).toString());
-	        	logger.debug("currentFeedback: " + currentFeedback);
-	        	
-	        	String currentMark=(String)mapMarks.get(new Integer(displayOrder).toString());
-	        	logger.debug("currentMark: " + currentMark);
-	        	/*set the default mark in case it is not provided*/
-	        	if (currentMark == null)
-	        	    currentMark= "1";
-	        	
-	        	List caList=(List)mapCandidatesList.get(new Integer(displayOrder).toString());
-	        	logger.debug("caList: " + caList);
-	        	
-	        	
-	        	
-	        	McQueContent queContent=  new McQueContent(pairs.getValue().toString(), 
-		        											new Integer(displayOrder),
-		        											new Integer(currentMark),
-		        											currentFeedback,
-															mcContent,
-															null,
-															null);
-		        
-		        
-	      	       logger.debug("queContent: " + queContent);
-	        	
-			       /* checks if the question is already recorded*/
-			       logger.debug("question text is: " + pairs.getValue().toString());
-			       logger.debug("content uid is: " + mcContent.getUid());
-			       logger.debug("question display order is: " + displayOrder);
-			       McQueContent existingMcQueContent=mcService.getQuestionContentByDisplayOrder(new Long(displayOrder), mcContent.getUid());
-			       logger.debug("existingMcQueContent: " + existingMcQueContent);
-			       
-			       if (existingMcQueContent == null)
-			       {
-			       	/*make sure a question with the same question text is not already saved*/
-			    	McQueContent duplicateMcQueContent=mcService.getQuestionContentByQuestionText(pairs.getValue().toString(), mcContent.getUid());
-			    	logger.debug("duplicateMcQueContent: " + duplicateMcQueContent);
-				       		logger.debug("adding a new question to content: " + queContent);
-				       		mcContent.getMcQueContents().add(queContent);
-				       		queContent.setMcContent(mcContent);
-		
-				       		mcService.createMcQue(queContent);
-				       		
-				       		logger.debug("start persisting candidate answers: " + queContent);
-				       		persistCandidates(caList, queContent, mcService);
-			       }
-			       else
-			       {
+	AuthoringUtil.logger.debug("mapQuestionContent: " + mapQuestionContent);
+	AuthoringUtil.logger.debug("mapFeedback: " + mapFeedback);
+	AuthoringUtil.logger.debug("mapMarks: " + mapMarks);
 
-				       String existingQuestion=existingMcQueContent.getQuestion(); 
-				       logger.debug("existingQuestion: " + existingQuestion);
-				       
-				       logger.debug("map question versus existingQuestion: " + pairs.getValue().toString() + 
-				               " versus db question value: " + existingQuestion);
+	Iterator itMap = mapQuestionContent.entrySet().iterator();
+	int displayOrder = 0;
+	while (itMap.hasNext()) {
+	    Map.Entry pairs = (Map.Entry) itMap.next();
+	    AuthoringUtil.logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue());
 
-			       		existingMcQueContent.setQuestion(pairs.getValue().toString());
-			       		existingMcQueContent.setFeedback(currentFeedback);
-			       		existingMcQueContent.setDisplayOrder(new Integer(displayOrder));
-			       		existingMcQueContent.setMark(new Integer(currentMark));
-			       		
-			       		
-			       		logger.debug("updating the existing question content: " + existingMcQueContent);
-			       		mcService.updateMcQueContent(existingMcQueContent);
+	    if (pairs.getValue().toString().length() != 0) {
+		AuthoringUtil.logger.debug("starting createQuestionContent: pairs.getValue().toString():"
+			+ pairs.getValue().toString());
+		AuthoringUtil.logger.debug("starting createQuestionContent: mcContent: " + mcContent);
 
-			       		logger.debug("questionUid " + existingMcQueContent.getUid());
-			       		 
-			       		logger.debug("will be removing redundant candidates, questionUid: " + existingMcQueContent.getUid());
-			       		mcService.removeMcOptionsContentByQueId(existingMcQueContent.getUid());
-			       		logger.debug("start persisting candidates " + existingMcQueContent.getUid());
-			       		
-			       		persistCandidates(caList, existingMcQueContent, mcService);
-			       }
-	        }      
+		++displayOrder;
+		AuthoringUtil.logger.debug("starting createQuestionContent: displayOrder: " + displayOrder);
+		String currentFeedback = (String) mapFeedback.get(new Integer(displayOrder).toString());
+		AuthoringUtil.logger.debug("currentFeedback: " + currentFeedback);
+
+		String currentMark = (String) mapMarks.get(new Integer(displayOrder).toString());
+		AuthoringUtil.logger.debug("currentMark: " + currentMark);
+		/*set the default mark in case it is not provided*/
+		if (currentMark == null) {
+		    currentMark = "1";
+		}
+
+		List caList = (List) mapCandidatesList.get(new Integer(displayOrder).toString());
+		AuthoringUtil.logger.debug("caList: " + caList);
+
+		McQueContent queContent = new McQueContent(pairs.getValue().toString(), new Integer(displayOrder),
+			new Integer(currentMark), currentFeedback, mcContent, null, null);
+
+		AuthoringUtil.logger.debug("queContent: " + queContent);
+
+		/* checks if the question is already recorded*/
+		AuthoringUtil.logger.debug("question text is: " + pairs.getValue().toString());
+		AuthoringUtil.logger.debug("content uid is: " + mcContent.getUid());
+		AuthoringUtil.logger.debug("question display order is: " + displayOrder);
+		McQueContent existingMcQueContent = mcService.getQuestionContentByDisplayOrder(new Long(displayOrder),
+			mcContent.getUid());
+		AuthoringUtil.logger.debug("existingMcQueContent: " + existingMcQueContent);
+
+		if (existingMcQueContent == null) {
+		    /*make sure a question with the same question text is not already saved*/
+		    McQueContent duplicateMcQueContent = mcService.getQuestionContentByQuestionText(pairs.getValue()
+			    .toString(), mcContent.getUid());
+		    AuthoringUtil.logger.debug("duplicateMcQueContent: " + duplicateMcQueContent);
+		    AuthoringUtil.logger.debug("adding a new question to content: " + queContent);
+		    mcContent.getMcQueContents().add(queContent);
+		    queContent.setMcContent(mcContent);
+
+		    mcService.createMcQue(queContent);
+
+		    AuthoringUtil.logger.debug("start persisting candidate answers: " + queContent);
+		    persistCandidates(caList, queContent, mcService);
+		} else {
+
+		    String existingQuestion = existingMcQueContent.getQuestion();
+		    AuthoringUtil.logger.debug("existingQuestion: " + existingQuestion);
+
+		    AuthoringUtil.logger.debug("map question versus existingQuestion: " + pairs.getValue().toString()
+			    + " versus db question value: " + existingQuestion);
+
+		    existingMcQueContent.setQuestion(pairs.getValue().toString());
+		    existingMcQueContent.setFeedback(currentFeedback);
+		    existingMcQueContent.setDisplayOrder(new Integer(displayOrder));
+		    existingMcQueContent.setMark(new Integer(currentMark));
+
+		    AuthoringUtil.logger.debug("updating the existing question content: " + existingMcQueContent);
+		    mcService.updateMcQueContent(existingMcQueContent);
+
+		    AuthoringUtil.logger.debug("questionUid " + existingMcQueContent.getUid());
+
+		    AuthoringUtil.logger.debug("will be removing redundant candidates, questionUid: "
+			    + existingMcQueContent.getUid());
+		    mcService.removeMcOptionsContentByQueId(existingMcQueContent.getUid());
+		    AuthoringUtil.logger.debug("start persisting candidates " + existingMcQueContent.getUid());
+
+		    persistCandidates(caList, existingMcQueContent, mcService);
+		}
 	    }
-        return mcContent;
+	}
+	return mcContent;
     }
 
-    
-    
-    protected Map buildDynamicPassMarkMap(List listQuestionContentDTO, boolean initialScreen)
-    {
-        logger.debug("starting buildDynamicPassMarkMap: " + listQuestionContentDTO);
-        logger.debug("initialScreen: " + initialScreen);
-        
-    	Map map= new TreeMap(new McComparator());
-        
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        
-        int intTotalMark=0;
-        if ((totalMark != null) && (totalMark.length() > 0))
-            intTotalMark= new Integer(totalMark).intValue();
-        
-        logger.debug("intTotalMark: " + intTotalMark);
-            
-        
-        Map passMarksMap=buildPassMarkMap(intTotalMark, false);
-        logger.debug("passMarksMap: " + passMarksMap);
-        return  passMarksMap;
+    protected Map buildDynamicPassMarkMap(List listQuestionContentDTO, boolean initialScreen) {
+	AuthoringUtil.logger.debug("starting buildDynamicPassMarkMap: " + listQuestionContentDTO);
+	AuthoringUtil.logger.debug("initialScreen: " + initialScreen);
+
+	Map map = new TreeMap(new McComparator());
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	AuthoringUtil.logger.debug("totalMark: " + totalMark);
+
+	int intTotalMark = 0;
+	if ((totalMark != null) && (totalMark.length() > 0)) {
+	    intTotalMark = new Integer(totalMark).intValue();
+	}
+
+	AuthoringUtil.logger.debug("intTotalMark: " + intTotalMark);
+
+	Map passMarksMap = buildPassMarkMap(intTotalMark, false);
+	AuthoringUtil.logger.debug("passMarksMap: " + passMarksMap);
+	return passMarksMap;
     }
-    
-    
-    protected Map buildPassMarkMap(int intTotalMark, boolean initialScreen)
-    {
-        logger.debug("building buildMarksMap: " + intTotalMark);
-        logger.debug("initialScreen: " + initialScreen);
-        
-    	Map map= new TreeMap(new McComparator());
-    	
-        if (initialScreen)
-            return map;
-        
-    	for (int i=1; i <= intTotalMark ; i++)
-		{
-    	    map.put(new Integer(i).toString(), new Integer(i).toString());
-		}
-    	logger.debug("return passmarks Map: " + map);
-    	return map;
-    }
 
+    protected Map buildPassMarkMap(int intTotalMark, boolean initialScreen) {
+	AuthoringUtil.logger.debug("building buildMarksMap: " + intTotalMark);
+	AuthoringUtil.logger.debug("initialScreen: " + initialScreen);
 
-    
+	Map map = new TreeMap(new McComparator());
+
+	if (initialScreen) {
+	    return map;
+	}
+
+	for (int i = 1; i <= intTotalMark; i++) {
+	    map.put(new Integer(i).toString(), new Integer(i).toString());
+	}
+	AuthoringUtil.logger.debug("return passmarks Map: " + map);
+	return map;
+    }
+
     /**
      * Map buildMarksMap()
      * 
      * @return
      */
-    protected Map buildMarksMap()
-    {
-    	Map map= new TreeMap(new McComparator());
-    	
-    	for (int i=1; i <= 10 ; i++)
-		{
-    	    map.put(new Integer(i).toString(), new Integer(i).toString());
-		}
-    	logger.debug("return marks Map: " + map);
-    	return map;
+    protected Map buildMarksMap() {
+	Map map = new TreeMap(new McComparator());
+
+	for (int i = 1; i <= 10; i++) {
+	    map.put(new Integer(i).toString(), new Integer(i).toString());
+	}
+	AuthoringUtil.logger.debug("return marks Map: " + map);
+	return map;
     }
 
-
     /**
      * Map buildCorrectMap()
      * 
      * @return
      */
-    protected Map buildCorrectMap()
-    {
-    	Map map= new TreeMap(new McComparator());
-	    map.put(new Integer(2).toString(), "Correct");
-    	logger.debug("return marks Map: " + map);
-    	return map;
+    protected Map buildCorrectMap() {
+	Map map = new TreeMap(new McComparator());
+	map.put(new Integer(2).toString(), "Correct");
+	AuthoringUtil.logger.debug("return marks Map: " + map);
+	return map;
     }
 
-    
     /**
      * List repopulateCandidateAnswersBox(HttpServletRequest request, boolean addBlankCa)
      * 
      * @param request
      * @param addBlankCa
      * @return
      */
-    protected List repopulateCandidateAnswersBox(HttpServletRequest request, boolean addBlankCa)
-    {
-        logger.debug("doing repopulateCandidateAnswersBox, addBlankCa: " + addBlankCa);
-        
-        String correct= request.getParameter("correct");
-        logger.debug("correct: " + correct);
-        
-        
-        /* check this logic again*/
-        int intCorrect=0;
-        if (correct == null)
-        {
-            logger.debug("correct is null: ");
-        }
-        else
-        {
-            intCorrect= new Integer(correct).intValue();            
-        }
-        
+    protected List repopulateCandidateAnswersBox(HttpServletRequest request, boolean addBlankCa) {
+	AuthoringUtil.logger.debug("doing repopulateCandidateAnswersBox, addBlankCa: " + addBlankCa);
 
-        logger.debug("intCorrect: " + intCorrect);
-        
-        List listFinalCandidatesDTO=new LinkedList();
-        
-        for (int i=0; i< MAX_OPTION_COUNT; i++)
-        {
-            String candidate= request.getParameter("ca" + i);
-            logger.debug("candidate: " + candidate);
-            
-            String isCorrect="Incorrect";
-            logger.debug("i versus intCorrect: " + i + " versus " + intCorrect);
-           
-            if (i == intCorrect)
-            {
-                isCorrect="Correct";
-            }
-            logger.debug("isCorrect: " + isCorrect);
-            
-            if (candidate != null)            
-            {
-                McCandidateAnswersDTO mcCandidateAnswersDTO= new McCandidateAnswersDTO();
-                mcCandidateAnswersDTO.setCandidateAnswer(candidate);
-                mcCandidateAnswersDTO.setCorrect(isCorrect);
-                listFinalCandidatesDTO.add(mcCandidateAnswersDTO);
-            }
-        }
-        
-        if (addBlankCa == true)
-        {
-            McCandidateAnswersDTO mcCandidateAnswersDTO= new McCandidateAnswersDTO();
-            mcCandidateAnswersDTO.setCandidateAnswer("");
-            mcCandidateAnswersDTO.setCorrect("Incorrect");
-            listFinalCandidatesDTO.add(mcCandidateAnswersDTO);
-        }
+	String correct = request.getParameter("correct");
+	AuthoringUtil.logger.debug("correct: " + correct);
 
-        logger.debug("returning listFinalCandidatesDTO: " + listFinalCandidatesDTO);
-        return listFinalCandidatesDTO;
+	/* check this logic again*/
+	int intCorrect = 0;
+	if (correct == null) {
+	    AuthoringUtil.logger.debug("correct is null: ");
+	} else {
+	    intCorrect = new Integer(correct).intValue();
+	}
+
+	AuthoringUtil.logger.debug("intCorrect: " + intCorrect);
+
+	List listFinalCandidatesDTO = new LinkedList();
+
+	for (int i = 0; i < McAppConstants.MAX_OPTION_COUNT; i++) {
+	    String candidate = request.getParameter("ca" + i);
+	    AuthoringUtil.logger.debug("candidate: " + candidate);
+
+	    String isCorrect = "Incorrect";
+	    AuthoringUtil.logger.debug("i versus intCorrect: " + i + " versus " + intCorrect);
+
+	    if (i == intCorrect) {
+		isCorrect = "Correct";
+	    }
+	    AuthoringUtil.logger.debug("isCorrect: " + isCorrect);
+
+	    if (candidate != null) {
+		McCandidateAnswersDTO mcCandidateAnswersDTO = new McCandidateAnswersDTO();
+		mcCandidateAnswersDTO.setCandidateAnswer(candidate);
+		mcCandidateAnswersDTO.setCorrect(isCorrect);
+		listFinalCandidatesDTO.add(mcCandidateAnswersDTO);
+	    }
+	}
+
+	if (addBlankCa == true) {
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = new McCandidateAnswersDTO();
+	    mcCandidateAnswersDTO.setCandidateAnswer("");
+	    mcCandidateAnswersDTO.setCorrect("Incorrect");
+	    listFinalCandidatesDTO.add(mcCandidateAnswersDTO);
+	}
+
+	AuthoringUtil.logger.debug("returning listFinalCandidatesDTO: " + listFinalCandidatesDTO);
+	return listFinalCandidatesDTO;
     }
 
+    protected boolean validateCandidateAnswersNotBlank(HttpServletRequest request) {
 
-    
-    protected boolean validateCandidateAnswersNotBlank(HttpServletRequest request)
-    {
-        
-        for (int i=0; i< MAX_OPTION_COUNT; i++)
-        {
-            String candidate= request.getParameter("ca" + i);
-            logger.debug("candidate: " + candidate);
-            
-            if ((candidate != null) && (candidate.length() == 0))
-            {
-                logger.debug("there is at least 1 blank candidate");
-                return false;
-            }
-        }
-        return true;
+	for (int i = 0; i < McAppConstants.MAX_OPTION_COUNT; i++) {
+	    String candidate = request.getParameter("ca" + i);
+	    AuthoringUtil.logger.debug("candidate: " + candidate);
+
+	    if ((candidate != null) && (candidate.length() == 0)) {
+		AuthoringUtil.logger.debug("there is at least 1 blank candidate");
+		return false;
+	    }
+	}
+	return true;
     }
 
+    protected List repopulateCandidateAnswersRadioBox(HttpServletRequest request, boolean addBlankCa) {
+	AuthoringUtil.logger.debug("doing repopulateCandidateAnswersRadioBox, addBlankCa: " + addBlankCa);
 
-    
-    
-    
-    protected List repopulateCandidateAnswersRadioBox(HttpServletRequest request, boolean addBlankCa)
-    {
-        logger.debug("doing repopulateCandidateAnswersRadioBox, addBlankCa: " + addBlankCa);
-        
-        String correct= request.getParameter("correct");
-        logger.debug("correct: " + correct);
-        
-        List listFinalCandidatesDTO=new LinkedList();
+	String correct = request.getParameter("correct");
+	AuthoringUtil.logger.debug("correct: " + correct);
 
-        logger.debug("returning listFinalCandidatesDTO: " + listFinalCandidatesDTO);
-        return listFinalCandidatesDTO;
+	List listFinalCandidatesDTO = new LinkedList();
+
+	AuthoringUtil.logger.debug("returning listFinalCandidatesDTO: " + listFinalCandidatesDTO);
+	return listFinalCandidatesDTO;
     }
 
-    
     /**
      * boolean validateSingleCorrectCandidate(List caList)
      * 
@@ -1857,61 +1670,51 @@
      * @param caList
      * @return
      */
-    protected boolean validateSingleCorrectCandidate(List caList)
-    {
-        Iterator itCaList=  caList.iterator();
-        while (itCaList.hasNext())
-        {
-            McCandidateAnswersDTO mcCandidateAnswersDTO= (McCandidateAnswersDTO)itCaList.next();
-            logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+    protected boolean validateSingleCorrectCandidate(List caList) {
+	Iterator itCaList = caList.iterator();
+	while (itCaList.hasNext()) {
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = (McCandidateAnswersDTO) itCaList.next();
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
 
- 	       	String candidateAnswer= mcCandidateAnswersDTO.getCandidateAnswer();
- 	    	String correct= mcCandidateAnswersDTO.getCorrect();
- 	    	logger.debug("correct:" + correct);
- 	    	
- 	    	if (correct.equals("Correct"))
- 	    	{
- 	    	   logger.debug("there is at least one Correct candidate, it is good.");
- 	    	   return true;
- 	    	}
-    	} 	    
- 	
- 	    return false;
- 	}
- 	    	    
+	    String candidateAnswer = mcCandidateAnswersDTO.getCandidateAnswer();
+	    String correct = mcCandidateAnswersDTO.getCorrect();
+	    AuthoringUtil.logger.debug("correct:" + correct);
 
-    
-    protected boolean validateOnlyOneCorrectCandidate(List caList)
-    {
-        int correctCandidatesCount= 0;
-        
-        Iterator itCaList=  caList.iterator();
-        while (itCaList.hasNext())
-        {
-            McCandidateAnswersDTO mcCandidateAnswersDTO= (McCandidateAnswersDTO)itCaList.next();
-            logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+	    if (correct.equals("Correct")) {
+		AuthoringUtil.logger.debug("there is at least one Correct candidate, it is good.");
+		return true;
+	    }
+	}
 
- 	       	String candidateAnswer= mcCandidateAnswersDTO.getCandidateAnswer();
- 	    	String correct= mcCandidateAnswersDTO.getCorrect();
- 	    	logger.debug("correct:" + correct);
- 	    	
- 	    	if (correct.equals("Correct"))
- 	    	{
- 	    	   logger.debug("there is at leat one Correct candidate, it is good.");
- 	    	   ++correctCandidatesCount;
- 	    	}
-    	} 	    
- 	   logger.debug("correctCandidatesCount: " + correctCandidatesCount);
- 	   
- 	   if (correctCandidatesCount > 1)
- 	       return false; //not good
- 	
- 	   return true;
- 	}
-    
-    
-    
-    
+	return false;
+    }
+
+    protected boolean validateOnlyOneCorrectCandidate(List caList) {
+	int correctCandidatesCount = 0;
+
+	Iterator itCaList = caList.iterator();
+	while (itCaList.hasNext()) {
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = (McCandidateAnswersDTO) itCaList.next();
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+
+	    String candidateAnswer = mcCandidateAnswersDTO.getCandidateAnswer();
+	    String correct = mcCandidateAnswersDTO.getCorrect();
+	    AuthoringUtil.logger.debug("correct:" + correct);
+
+	    if (correct.equals("Correct")) {
+		AuthoringUtil.logger.debug("there is at leat one Correct candidate, it is good.");
+		++correctCandidatesCount;
+	    }
+	}
+	AuthoringUtil.logger.debug("correctCandidatesCount: " + correctCandidatesCount);
+
+	if (correctCandidatesCount > 1) {
+	    return false; // not good
+	}
+
+	return true;
+    }
+
     /**
      * buildDefaultQuestionContent(McContent mcContent, IMcService mcService)
      * 
@@ -1921,138 +1724,128 @@
      * @param mcService
      * @return
      */
-    protected List buildDefaultQuestionContent(McContent mcContent, IMcService mcService)
-    {
-        logger.debug("starting buildDefaultQuestionContent, mcContent: " + mcContent);
-        List listQuestionContentDTO= new  LinkedList();
-    	
-        /*
-    	 * get the existing question content
-    	 */
-    	logger.debug("setting content data from the db");
-    	Iterator queIterator=mcContent.getMcQueContents().iterator();
-    	Long mapIndex=new Long(1);
-    	
-    	while (queIterator.hasNext())
-    	{
-    	    McQuestionContentDTO mcQuestionContentDTO=new McQuestionContentDTO();
-    	    
-    		McQueContent mcQueContent=(McQueContent) queIterator.next();
-    		if (mcQueContent != null)
-    		{
-    			logger.debug("question: " + mcQueContent.getQuestion());
-    			logger.debug("displayorder: " + mcQueContent.getDisplayOrder().toString());
-    			logger.debug("mark: " + mcQueContent.getMark().toString());
-    			logger.debug("feedback: " + mcQueContent.getFeedback());
-    			
-    			String feedback="";
-    			if (mcQueContent.getFeedback() != null)
-    			    feedback=mcQueContent.getFeedback();
-    			
-    			logger.debug("feedback now: " + mcQueContent.getFeedback());
-    			
-    			
-        		String question=mcQueContent.getQuestion();
-        		logger.debug("question: " + question);
-    			
-    			
-    			mcQuestionContentDTO.setQuestion(question);
-        		mcQuestionContentDTO.setDisplayOrder(mcQueContent.getDisplayOrder().toString());
-        		mcQuestionContentDTO.setFeedback(feedback);
-        		mcQuestionContentDTO.setMark(mcQueContent.getMark().toString());
-        		
-        		
-        		/* get candidates, from here.. */
-        		List list=mcService.findMcOptionsContentByQueId(mcQueContent.getUid());
-        		logger.debug("candidiate answers list for mapQuestionContent:" + list);
-        		
-        		int caCount=list.size();
-        		logger.debug("caCount:" + caCount);
-        		mcQuestionContentDTO.setCaCount(new Integer(caCount).toString());
+    protected List buildDefaultQuestionContent(McContent mcContent, IMcService mcService) {
+	AuthoringUtil.logger.debug("starting buildDefaultQuestionContent, mcContent: " + mcContent);
+	List listQuestionContentDTO = new LinkedList();
 
-        		List listCandidates= new  LinkedList();
-        		Iterator listIterator=list.iterator();
-        		while (listIterator.hasNext())
-        		{
-        			McOptsContent mcOptsContent=(McOptsContent)listIterator.next();
-        			McCandidateAnswersDTO mcCandidateAnswersDTO = new McCandidateAnswersDTO();
-        			
-    	    		logger.debug("mcOptsContent:" + mcOptsContent);
-        			logger.debug("option text:" + mcOptsContent.getMcQueOptionText());
-        			logger.debug("option text:" + mcOptsContent.isCorrectOption());
-        			
-        			mcCandidateAnswersDTO.setCandidateAnswer(mcOptsContent.getMcQueOptionText());
-        			
-        			if (mcOptsContent.isCorrectOption())
-        			{
-        			    logger.debug("mcOptsContent.getMcQueOptionText() is set to true");
-        			    mcCandidateAnswersDTO.setCorrect("Correct");
-        			}
-        			else
-        			{
-        			    logger.debug("mcOptsContent.getMcQueOptionText() is set to true");
-        			    mcCandidateAnswersDTO.setCorrect("Incorrect");
-        			}
-        			logger.debug("current mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
-        			listCandidates.add(mcCandidateAnswersDTO);
-        			logger.debug("current listCandidates:" + listCandidates);
-        		}
-        		logger.debug("final listCandidates for mcQueContent:" + listCandidates);
-        		/* get candidates, till here.. */
-        		
-        		mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
-        		logger.debug("current mcQuestionContentDTO:" + mcQuestionContentDTO);
-        		
-        		
-        		listQuestionContentDTO.add(mcQuestionContentDTO);
-        		logger.debug("current listQuestionContentDTO:" + listQuestionContentDTO);
+	/*
+	 * get the existing question content
+	 */
+	AuthoringUtil.logger.debug("setting content data from the db");
+	Iterator queIterator = mcContent.getMcQueContents().iterator();
+	Long mapIndex = new Long(1);
 
-        		mapIndex=new Long(mapIndex.longValue()+1);
-    		}
-    	}
-    	
-    	logger.debug("final listQuestionContentDTO:" + listQuestionContentDTO);
-    	return listQuestionContentDTO;
+	while (queIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = new McQuestionContentDTO();
+
+	    McQueContent mcQueContent = (McQueContent) queIterator.next();
+	    if (mcQueContent != null) {
+		AuthoringUtil.logger.debug("question: " + mcQueContent.getQuestion());
+		AuthoringUtil.logger.debug("displayorder: " + mcQueContent.getDisplayOrder().toString());
+		AuthoringUtil.logger.debug("mark: " + mcQueContent.getMark().toString());
+		AuthoringUtil.logger.debug("feedback: " + mcQueContent.getFeedback());
+
+		String feedback = "";
+		if (mcQueContent.getFeedback() != null) {
+		    feedback = mcQueContent.getFeedback();
+		}
+
+		AuthoringUtil.logger.debug("feedback now: " + mcQueContent.getFeedback());
+
+		String question = mcQueContent.getQuestion();
+		AuthoringUtil.logger.debug("question: " + question);
+
+		mcQuestionContentDTO.setQuestion(question);
+		mcQuestionContentDTO.setDisplayOrder(mcQueContent.getDisplayOrder().toString());
+		mcQuestionContentDTO.setFeedback(feedback);
+		mcQuestionContentDTO.setMark(mcQueContent.getMark().toString());
+
+		/* get candidates, from here.. */
+		List list = mcService.findMcOptionsContentByQueId(mcQueContent.getUid());
+		AuthoringUtil.logger.debug("candidiate answers list for mapQuestionContent:" + list);
+
+		int caCount = list.size();
+		AuthoringUtil.logger.debug("caCount:" + caCount);
+		mcQuestionContentDTO.setCaCount(new Integer(caCount).toString());
+
+		List listCandidates = new LinkedList();
+		Iterator listIterator = list.iterator();
+		while (listIterator.hasNext()) {
+		    McOptsContent mcOptsContent = (McOptsContent) listIterator.next();
+		    McCandidateAnswersDTO mcCandidateAnswersDTO = new McCandidateAnswersDTO();
+
+		    AuthoringUtil.logger.debug("mcOptsContent:" + mcOptsContent);
+		    AuthoringUtil.logger.debug("option text:" + mcOptsContent.getMcQueOptionText());
+		    AuthoringUtil.logger.debug("option text:" + mcOptsContent.isCorrectOption());
+
+		    mcCandidateAnswersDTO.setCandidateAnswer(mcOptsContent.getMcQueOptionText());
+
+		    if (mcOptsContent.isCorrectOption()) {
+			AuthoringUtil.logger.debug("mcOptsContent.getMcQueOptionText() is set to true");
+			mcCandidateAnswersDTO.setCorrect("Correct");
+		    } else {
+			AuthoringUtil.logger.debug("mcOptsContent.getMcQueOptionText() is set to true");
+			mcCandidateAnswersDTO.setCorrect("Incorrect");
+		    }
+		    AuthoringUtil.logger.debug("current mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+		    listCandidates.add(mcCandidateAnswersDTO);
+		    AuthoringUtil.logger.debug("current listCandidates:" + listCandidates);
+		}
+		AuthoringUtil.logger.debug("final listCandidates for mcQueContent:" + listCandidates);
+		/* get candidates, till here.. */
+
+		mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
+		AuthoringUtil.logger.debug("current mcQuestionContentDTO:" + mcQuestionContentDTO);
+
+		listQuestionContentDTO.add(mcQuestionContentDTO);
+		AuthoringUtil.logger.debug("current listQuestionContentDTO:" + listQuestionContentDTO);
+
+		mapIndex = new Long(mapIndex.longValue() + 1);
+	    }
+	}
+
+	AuthoringUtil.logger.debug("final listQuestionContentDTO:" + listQuestionContentDTO);
+	return listQuestionContentDTO;
     }
-    
+
     /**
      * persistCandidates(List caList, McQueContent mcQueContent, IMcService mcService)
      * 
      * @param caList
      * @param mcQueContent
      * @param mcService
      */
-    protected void persistCandidates(List caList, McQueContent mcQueContent, IMcService mcService)
-    {
-       logger.debug("doing persistCandidates:" + caList);
-       logger.debug("mcQueContent:" + mcQueContent);
+    protected void persistCandidates(List caList, McQueContent mcQueContent, IMcService mcService) {
+	AuthoringUtil.logger.debug("doing persistCandidates:" + caList);
+	AuthoringUtil.logger.debug("mcQueContent:" + mcQueContent);
 
-       int displayOrder = 0;
-       Iterator itCaList=  caList.iterator();
-       while (itCaList.hasNext())
-       {
-           McCandidateAnswersDTO mcCandidateAnswersDTO= (McCandidateAnswersDTO)itCaList.next();
-           logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+	int displayOrder = 0;
+	Iterator itCaList = caList.iterator();
+	while (itCaList.hasNext()) {
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = (McCandidateAnswersDTO) itCaList.next();
+	    AuthoringUtil.logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
 
-	       	String candidateAnswer= mcCandidateAnswersDTO.getCandidateAnswer();
-	    	String correct= mcCandidateAnswersDTO.getCorrect();
-	    	
-	    	boolean correctOption=false;
-	    	if (correct.equals("Correct"))
-	    	    correctOption= true;
-	    	else
-	    	    correctOption= false;
-	    	    
-	    	
-	    	++ displayOrder; 
-	    	logger.debug("displayOrder:" + displayOrder);
-	    	
-	    	//McOptsContent mcOptsContent = new McOptsContent(correctOption, candidateAnswer, mcQueContent, new TreeSet());
-	    	McOptsContent mcOptsContent = new McOptsContent(new Integer(displayOrder), correctOption, candidateAnswer, mcQueContent, new TreeSet());
-			logger.debug("mcOptsContent: " + mcOptsContent);
-			
-			mcService.saveMcOptionsContent(mcOptsContent);
-			logger.debug("persisted mcOptsContent: " + mcOptsContent);	
-       }
+	    String candidateAnswer = mcCandidateAnswersDTO.getCandidateAnswer();
+	    String correct = mcCandidateAnswersDTO.getCorrect();
+
+	    boolean correctOption = false;
+	    if (correct.equals("Correct")) {
+		correctOption = true;
+	    } else {
+		correctOption = false;
+	    }
+
+	    ++displayOrder;
+	    AuthoringUtil.logger.debug("displayOrder:" + displayOrder);
+
+	    // McOptsContent mcOptsContent = new McOptsContent(correctOption, candidateAnswer, mcQueContent, new
+	    // TreeSet());
+	    McOptsContent mcOptsContent = new McOptsContent(new Integer(displayOrder), correctOption, candidateAnswer,
+		    mcQueContent, new TreeSet());
+	    AuthoringUtil.logger.debug("mcOptsContent: " + mcOptsContent);
+
+	    mcService.saveMcOptionsContent(mcOptsContent);
+	    AuthoringUtil.logger.debug("persisted mcOptsContent: " + mcOptsContent);
+	}
     }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r44f74e0aba228c535d38970b0cb3c1011d9081a5 -r65ed4da382b320542dcd88cb1375662dcfac8769
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 44f74e0aba228c535d38970b0cb3c1011d9081a5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -37,6 +37,7 @@
 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.Globals;
 import org.apache.struts.action.ActionForm;
@@ -49,6 +50,9 @@
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.questions.Answer;
+import org.lamsfoundation.lams.questions.Question;
+import org.lamsfoundation.lams.questions.QuestionParser;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.mc.EditActivityDTO;
 import org.lamsfoundation.lams.tool.mc.McAppConstants;
@@ -71,116 +75,87 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-
 /**
- * <p>Action class that controls the logic of tool behavior. </p>
+ * <p>
+ * Action class that controls the logic of tool behavior.
+ * </p>
  * 
- * <p>Note that Struts action class only has the responsibility to navigate 
- * page flow. All database operation should go to service layer and data 
- * transformation from domain model to struts form bean should go to form 
- * bean class. This ensure clean and maintainable code.
+ * <p>
+ * Note that Struts action class only has the responsibility to navigate page flow. All database operation should go to
+ * service layer and data transformation from domain model to struts form bean should go to form bean class. This ensure
+ * clean and maintainable code.
  * </p>
  * 
- * <code>SystemException</code> is thrown whenever an known error condition is
- * identified. No system exception error handling code should appear in the 
- * Struts action class as all of them are handled in 
+ * <code>SystemException</code> is thrown whenever an known error condition is identified. No system exception error
+ * handling code should appear in the Struts action class as all of them are handled in
  * <code>CustomStrutsExceptionHandler<code>.
  * 
  * @author Ozgur Demirtas
  * 
- *	<action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.mc.web.McAction"
-      name="McAuthoringForm"
-      input="/AuthoringMaincontent.jsp"
-      parameter="dispatch"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-    
-	  	<forward
-	        name="load"
-	        path="/AuthoringMaincontent.jsp"
-	        redirect="false"
-		/>
-	
-	  	<forward
-			name="loadMonitoring"
-			path="/monitoring/MonitoringMaincontent.jsp"
-			redirect="false"
-	  	/>
-	
-	  	<forward
-		    name="refreshMonitoring"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="false"
-	  	/>
-	  
-	    <forward
-			name="loadViewOnly"
-			path="/authoring/AuthoringTabsHolder.jsp"
-			redirect="false"
-	    />
-	    
-	    <forward
-			name="newQuestionBox"
-			path="/authoring/newQuestionBox.jsp"
-			redirect="false"
-	    />
-
-	    <forward
-			name="editQuestionBox"
-			path="/authoring/editQuestionBox.jsp"
-			redirect="false"
-	    />
-
-
-	  	<forward
-	        name="starter"
-	        path="/index.jsp"
-	        redirect="false"
-	  	/>
-  </action>
+ *         <action path="/authoring" type="org.lamsfoundation.lams.tool.mc.web.McAction" name="McAuthoringForm"
+ *         input="/AuthoringMaincontent.jsp" parameter="dispatch" scope="request" unknown="false" validate="false" >
  * 
+ *         <forward name="load" path="/AuthoringMaincontent.jsp" redirect="false" />
+ * 
+ *         <forward name="loadMonitoring" path="/monitoring/MonitoringMaincontent.jsp" redirect="false" />
+ * 
+ *         <forward name="refreshMonitoring" path="/monitoring/MonitoringMaincontent.jsp" redirect="false" />
+ * 
+ *         <forward name="loadViewOnly" path="/authoring/AuthoringTabsHolder.jsp" redirect="false" />
+ * 
+ *         <forward name="newQuestionBox" path="/authoring/newQuestionBox.jsp" redirect="false" />
+ * 
+ *         <forward name="editQuestionBox" path="/authoring/editQuestionBox.jsp" redirect="false" />
+ * 
+ * 
+ *         <forward name="starter" path="/index.jsp" redirect="false" /> </action>
+ * 
  */
-public class McAction extends LamsDispatchAction implements McAppConstants
-{
+public class McAction extends LamsDispatchAction implements McAppConstants {
     static Logger logger = Logger.getLogger(McAction.class.getName());
-    
+
     private McToolContentHandler toolContentHandler;
-    
-    /** 
-     * <p>Struts dispatch method.</p> 
+
+    /**
+     * <p>
+     * Struts dispatch method.
+     * </p>
      * 
-     * <p>It is assuming that progress engine should pass in the tool access
-     * mode and the tool session id as http parameters.</p>
+     * <p>
+     * It is assuming that progress engine should pass in the tool access mode and the tool session id as http
+     * parameters.
+     * </p>
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     *
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *            An ActionMapping class that will be used by the Action class to tell the ActionServlet where to send
+     *            the end-user.
+     * 
+     * @param form
+     *            The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *            A standard Servlet HttpServletRequest class.
+     * @param response
+     *            A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
-     * @throws McApplicationException the known runtime exception 
+     * @throws McApplicationException
+     *             the known runtime exception
      * 
      */
-    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-        return (mapping.findForward(LOAD_QUESTIONS));
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
     }
-    
+
     /**
      * 
-     * ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-        throws IOException, ServletException
-        
-        submits content into the tool database
+     * ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+     * HttpServletResponse response) throws IOException, ServletException
      * 
+     * submits content into the tool database
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -189,276 +164,255 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-        throws IOException, ServletException {
-    	
-    	logger.debug("dispathcing submitAllContent :" +form);
-    	
-    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
+    public ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
 
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-		
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
+	McAction.logger.debug("dispathcing submitAllContent :" + form);
 
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();
-		
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-        
-        Map mapQuestionContent=AuthoringUtil.extractMapQuestionContent(listQuestionContentDTO);
-        logger.debug("extracted mapQuestionContent: " + mapQuestionContent);
-         
-        Map mapFeedback=AuthoringUtil.extractMapFeedback(listQuestionContentDTO);
-        logger.debug("extracted mapFeedback: " + mapFeedback);
-        
-        Map mapWeights=new TreeMap(new McComparator());
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-        Map mapMarks=AuthoringUtil.extractMapMarks(listQuestionContentDTO);
-        logger.debug("extracted mapMarks: " + mapMarks);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-        Map mapCandidatesList=AuthoringUtil.extractMapCandidatesList(listQuestionContentDTO);
-        logger.debug("extracted mapCandidatesList: " + mapCandidatesList);
-        
-        
-        ActionMessages errors = new ActionMessages();
-        logger.debug("mapQuestionContent size: " + mapQuestionContent.size());
-        
-        if (mapQuestionContent.size() == 0)
-        {
-            ActionMessage error = new ActionMessage("questions.none.submitted");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        logger.debug("errors: " + errors);
-	    
-	    AuthoringUtil authoringUtil= new AuthoringUtil();
-	 	
-	 	McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-	 	
-        logger.debug("activeModule: " + activeModule);
-        if (activeModule.equals(AUTHORING))
-        {
-    		List attachmentListBackup= new  ArrayList();
-            List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-    	    logger.debug("attachmentList: " + attachmentList);
-    	    attachmentListBackup=attachmentList;
-    	    
-    	    List deletedAttachmentListBackup= new  ArrayList();
-    	    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-    	    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-    	    deletedAttachmentListBackup=deletedAttachmentList;
-    	    
-            String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-            logger.debug("onlineInstructions: " + onlineInstructions);
-    	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-            String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-            logger.debug("offlineInstructions: " + offlineInstructions);
-    	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
 
-    	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-    		mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-    		
-    		String strOnlineInstructions= request.getParameter("onlineInstructions");
-    		String strOfflineInstructions= request.getParameter("offlineInstructions");
-    		logger.debug("onlineInstructions: " + strOnlineInstructions);
-    		logger.debug("offlineInstructions: " + strOfflineInstructions);
-    		mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-    		mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-        }
-	 	
-	 	
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	 	String richTextTitle = request.getParameter(TITLE);
-        String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	 	
-        logger.debug("richTextTitle: " + richTextTitle);
-        logger.debug("richTextInstructions: " + richTextInstructions);
-        
-        mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-        mcAuthoringForm.setTitle(richTextTitle);
-        
-        mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-        
-        sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-        sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-        
-	    mcGeneralAuthoringDTO.setMapQuestionContent(mapQuestionContent);
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-        
-		logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-		
-	 	logger.debug("there are no issues with input, continue and submit data");
+	Map mapQuestionContent = AuthoringUtil.extractMapQuestionContent(listQuestionContentDTO);
+	McAction.logger.debug("extracted mapQuestionContent: " + mapQuestionContent);
 
-        McContent mcContentTest=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContentTest: " + mcContentTest);
+	Map mapFeedback = AuthoringUtil.extractMapFeedback(listQuestionContentDTO);
+	McAction.logger.debug("extracted mapFeedback: " + mapFeedback);
 
-		logger.debug("errors: " + errors);
-	 	if(!errors.isEmpty()){
-			saveErrors(request, errors);
-	        logger.debug("errors saved: " + errors);
+	Map mapWeights = new TreeMap(new McComparator());
+
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
+
+	Map mapMarks = AuthoringUtil.extractMapMarks(listQuestionContentDTO);
+	McAction.logger.debug("extracted mapMarks: " + mapMarks);
+
+	Map mapCandidatesList = AuthoringUtil.extractMapCandidatesList(listQuestionContentDTO);
+	McAction.logger.debug("extracted mapCandidatesList: " + mapCandidatesList);
+
+	ActionMessages errors = new ActionMessages();
+	McAction.logger.debug("mapQuestionContent size: " + mapQuestionContent.size());
+
+	if (mapQuestionContent.size() == 0) {
+	    ActionMessage error = new ActionMessage("questions.none.submitted");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+	McAction.logger.debug("errors: " + errors);
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    List attachmentListBackup = new ArrayList();
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    attachmentListBackup = attachmentList;
+
+	    List deletedAttachmentListBackup = new ArrayList();
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	    deletedAttachmentListBackup = deletedAttachmentList;
+
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOfflineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+
+	}
+
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	mcGeneralAuthoringDTO.setMapQuestionContent(mapQuestionContent);
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+
+	McAction.logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	McAction.logger.debug("there are no issues with input, continue and submit data");
+
+	McContent mcContentTest = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContentTest: " + mcContentTest);
+
+	McAction.logger.debug("errors: " + errors);
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    McAction.logger.debug("errors saved: " + errors);
+	}
+
+	McContent mcContent = mcContentTest;
+	if (errors.isEmpty()) {
+	    McAction.logger.debug("errors is empty: " + errors);
+	    authoringUtil.removeRedundantQuestions(mapQuestionContent, mcService, mcAuthoringForm, request,
+		    strToolContentID);
+	    McAction.logger.debug("end of removing unused entries... ");
+
+	    mcContent = authoringUtil.saveOrUpdateMcContent(mapQuestionContent, mapFeedback, mapWeights, mapMarks,
+		    mapCandidatesList, mcService, mcAuthoringForm, request, mcContentTest, strToolContentID);
+	    McAction.logger.debug("mcContent: " + mcContent);
+
+	    long defaultContentID = 0;
+	    McAction.logger.debug("attempt retrieving tool with signatute : " + McAppConstants.MY_SIGNATURE);
+	    defaultContentID = mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE);
+	    McAction.logger.debug("retrieved tool default contentId: " + defaultContentID);
+
+	    if (mcContent != null) {
+		mcGeneralAuthoringDTO.setDefaultContentIdStr(new Long(defaultContentID).toString());
+	    }
+	    McAction.logger.debug("updated mcGeneralAuthoringDTO to: " + mcGeneralAuthoringDTO);
+
+	    authoringUtil.reOrganizeDisplayOrder(mapQuestionContent, mcService, mcAuthoringForm, mcContent);
+	    McAction.logger.debug("post reOrganizeDisplayOrder: " + mcContent);
+
+	    McAction.logger.debug("activeModule: " + activeModule);
+	    if (activeModule.equals(McAppConstants.AUTHORING)) {
+
+		List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+		McAction.logger.debug("attachmentList: " + attachmentList);
+
+		List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+
+		List attachments = saveAttachments(mcContent, attachmentList, deletedAttachmentList, mapping, request);
+		McAction.logger.debug("attachments: " + attachments);
+	    }
+
+	    McAction.logger.debug("strToolContentID: " + strToolContentID);
+	    McUtils.setDefineLater(request, false, strToolContentID, mcService);
+	    McAction.logger.debug("define later set to false");
+
+	    McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		    defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	    if (activeModule.equals(McAppConstants.AUTHORING)) {
+		McAction.logger.debug("standard authoring close");
+		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	    } else {
+		McAction.logger.debug("go back to view only screen");
+		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
+	    }
+
+	} else {
+	    McAction.logger.debug("errors is not empty: " + errors);
+
+	    if (mcContent != null) {
+		long defaultContentID = 0;
+		McAction.logger.debug("attempt retrieving tool with signatute : " + McAppConstants.MY_SIGNATURE);
+		defaultContentID = mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE);
+		McAction.logger.debug("retrieved tool default contentId: " + defaultContentID);
+
+		if (mcContent != null) {
+		    mcGeneralAuthoringDTO.setDefaultContentIdStr(new Long(defaultContentID).toString());
 		}
-	 	
 
-	 	McContent mcContent=mcContentTest;
-	 	if(errors.isEmpty()){
-	 	    logger.debug("errors is empty: " + errors);
-	        authoringUtil.removeRedundantQuestions(mapQuestionContent, mcService, mcAuthoringForm, request, strToolContentID);
-	        logger.debug("end of removing unused entries... ");
+		McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+			defaultContentIdStr, activeModule, sessionMap, httpSessionID);
 
-	        mcContent=authoringUtil.saveOrUpdateMcContent(mapQuestionContent, mapFeedback, mapWeights, 
-	                mapMarks, mapCandidatesList, mcService, mcAuthoringForm, request, mcContentTest, strToolContentID);
-	        logger.debug("mcContent: " + mcContent);
-	        
-	        
-	        long defaultContentID=0;
-			logger.debug("attempt retrieving tool with signatute : " + MY_SIGNATURE);
-	        defaultContentID=mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE);
-			logger.debug("retrieved tool default contentId: " + defaultContentID);
-			
-	        if (mcContent != null)
-	        {
-	            mcGeneralAuthoringDTO.setDefaultContentIdStr(new Long(defaultContentID).toString());
-	        }
-			logger.debug("updated mcGeneralAuthoringDTO to: " + mcGeneralAuthoringDTO);
-			
-		    authoringUtil.reOrganizeDisplayOrder(mapQuestionContent, mcService, mcAuthoringForm, mcContent);
-		    logger.debug("post reOrganizeDisplayOrder: " + mcContent);
+	    }
+	}
 
-	        logger.debug("activeModule: " + activeModule);
-	        if (activeModule.equals(AUTHORING))
-	        {
+	mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(1).toString());
 
-	            List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-	    	    logger.debug("attachmentList: " + attachmentList);
+	mcAuthoringForm.resetUserAction();
+	mcGeneralAuthoringDTO.setMapQuestionContent(mapQuestionContent);
 
-	    	    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
 
-	            List attachments=saveAttachments(mcContent, attachmentList, deletedAttachmentList, mapping, request);
-	            logger.debug("attachments: " + attachments);
-	        }
-	        
-		    logger.debug("strToolContentID: " + strToolContentID);
-	        McUtils.setDefineLater(request, false, strToolContentID, mcService);
-	        logger.debug("define later set to false");
-	        
-			McUtils.setFormProperties(request, mcService,  
-		             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
 
-			if (activeModule.equals(AUTHORING))
-			{
-		        logger.debug("standard authoring close");
-			    request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
-			    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-			}
-			else
-			{
-			    logger.debug("go back to view only screen");
-			    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
-			}
-	        
-	 	}
-	 	else
-	 	{
-	 	   logger.debug("errors is not empty: " + errors);
-	 	   
-	 	   if (mcContent != null)
-	 	   {
-		        long defaultContentID=0;
-				logger.debug("attempt retrieving tool with signatute : " + MY_SIGNATURE);
-		        defaultContentID=mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE);
-				logger.debug("retrieved tool default contentId: " + defaultContentID);
-				
-		        if (mcContent != null)
-		        {
-		            mcGeneralAuthoringDTO.setDefaultContentIdStr(new Long(defaultContentID).toString());
-		        }
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-				McUtils.setFormProperties(request, mcService, 
-			             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	 	       
-	 	   }
-	 	}
-        
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
 
-        mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(1).toString());
-        
-        mcAuthoringForm.resetUserAction();
-        mcGeneralAuthoringDTO.setMapQuestionContent(mapQuestionContent);
-        
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
-	    
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
 
-	    
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
 
-		request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	    
-	    request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-	    
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
 
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
 
-        logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
 
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-        
-		logger.debug("forwarding to :" + LOAD_QUESTIONS);
-        return mapping.findForward(LOAD_QUESTIONS);
+	McAction.logger.debug("forwarding to :" + McAppConstants.LOAD_QUESTIONS);
+	return mapping.findForward(McAppConstants.LOAD_QUESTIONS);
     }
 
-    
     /**
      * 
-     * saveSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+     * saveSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response)
      * 
      * @param mapping
      * @param form
@@ -468,409 +422,475 @@
      * @throws IOException
      * @throws ServletException
      */
-	public ActionForward saveSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		
-		logger.debug("dispathcing saveSingleQuestion");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-	
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-		
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-	
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+    public ActionForward saveSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	McAction.logger.debug("dispathcing saveSingleQuestion");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-		
-		String passmark=request.getParameter("passmark");
-		logger.debug("passmark: " + passmark);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		
-		AuthoringUtil authoringUtil = new AuthoringUtil();
-		
-		boolean validateCandidateAnswersNotBlank =authoringUtil.validateCandidateAnswersNotBlank(request);
-		logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
-		
-		
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
-	    
-	    caList=AuthoringUtil.removeBlankEntries(caList);
-	    logger.debug("caList after removing blank entries: " + caList);
-	    
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		boolean validateSingleCorrectCandidate=authoringUtil.validateSingleCorrectCandidate(caList);
-	    logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
-	    
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-		boolean validateOnlyOneCorrectCandidate=authoringUtil.validateOnlyOneCorrectCandidate(caList);
-	    logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	    
-	    
-        ActionMessages errors = new ActionMessages();
-        
-        
-        if (!validateCandidateAnswersNotBlank)
-        {
-            ActionMessage error = new ActionMessage("candidates.blank");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
-        
-        if (!validateSingleCorrectCandidate)
-        {
-            ActionMessage error = new ActionMessage("candidates.none.correct");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-        if (!validateOnlyOneCorrectCandidate)
-        {
-            ActionMessage error = new ActionMessage("candidates.duplicate.correct");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
-        
-        logger.debug("errors: " + errors);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	 	if(!errors.isEmpty()){
-			saveErrors(request, errors);
-	        logger.debug("errors saved: " + errors);
-		}
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-		
-        McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
 
-        logger.debug("entry using mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
-	    mcGeneralAuthoringDTO.setPassMarkValue(passmark);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-        
-	 	if(errors.isEmpty())
-	 	{
-	        logger.debug("errors is empty: " + errors);
-		    McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-			logger.debug("mcContent: " + mcContent);
-			
-			logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-			mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-			
-			mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-			
-		    String newQuestion=request.getParameter("newQuestion");
-		    logger.debug("newQuestion: " + newQuestion);
-		    
-		    String feedback=request.getParameter("feedback");
-		    logger.debug("feedback: " + feedback);
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
 
-		    
-		    String editableQuestionIndex=request.getParameter("editableQuestionIndex");
-		    logger.debug("editableQuestionIndex: " + editableQuestionIndex);
-		    mcAuthoringForm.setQuestionIndex(editableQuestionIndex);
-		    
+	String passmark = request.getParameter("passmark");
+	McAction.logger.debug("passmark: " + passmark);
 
-		    if ((newQuestion != null) && (newQuestion.length() > 0))
-		    {
-			        if ((editQuestionBoxRequest != null) && (editQuestionBoxRequest.equals("false")))
-			        {
-			            logger.debug("request for add and save");
-				        boolean duplicates=AuthoringUtil.checkDuplicateQuestions(listQuestionContentDTO, newQuestion);
-				        logger.debug("duplicates: " + duplicates);
-			            
-				        if (!duplicates)
-				        {
-						    McQuestionContentDTO mcQuestionContentDTO= null;
-						    Iterator listIterator=listQuestionContentDTO.iterator();
-						    while (listIterator.hasNext())
-						    {
-						        mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-						        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-						        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-						        
-						        String question=mcQuestionContentDTO.getQuestion();
-						        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-						        logger.debug("displayOrder:" + displayOrder);
-						        
-						        if ((displayOrder != null) && (!displayOrder.equals("")))
-					    		{
-						            if (displayOrder.equals(editableQuestionIndex))
-						            {
-						                break;
-						            }
-						            
-					    		}
-						    }
-						    logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
-						    
-						    mcQuestionContentDTO.setQuestion(newQuestion);
-						    mcQuestionContentDTO.setFeedback(feedback);
-						    mcQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
-						    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-						    mcQuestionContentDTO.setMark(mark);
-						    
-						    logger.debug("caList size:" + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
-						    mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO().size()).toString());
-						    
-						    
-						    listQuestionContentDTO=AuthoringUtil.reorderUpdateListQuestionContentDTO(listQuestionContentDTO, mcQuestionContentDTO, editableQuestionIndex);
-						    logger.debug("post reorderUpdateListQuestionContentDTO listQuestionContentDTO: " + listQuestionContentDTO);
-				        }
-				        else
-				        {
-				            logger.debug("duplicate question entry, not adding");
-				        }
-			        }
-				    else
-				    {
-				        	logger.debug("request for edit and save.");
-						    McQuestionContentDTO mcQuestionContentDTO= null;
-						    Iterator listIterator=listQuestionContentDTO.iterator();
-						    while (listIterator.hasNext())
-						    {
-						        mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-						        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-						        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-						        
-						        String question=mcQuestionContentDTO.getQuestion();
-						        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-						        logger.debug("displayOrder:" + displayOrder);
-						        
-						        if ((displayOrder != null) && (!displayOrder.equals("")))
-					    		{
-						            if (displayOrder.equals(editableQuestionIndex))
-						            {
-						                break;
-						            }
-						            
-					    		}
-						    }
-						    logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
-						    
-						    mcQuestionContentDTO.setQuestion(newQuestion);
-						    mcQuestionContentDTO.setFeedback(feedback);
-						    mcQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
-						    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-						    mcQuestionContentDTO.setMark(mark);
-						    
-						    logger.debug("caList size:" + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
-						    mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO().size()).toString());
-						    
-						    listQuestionContentDTO=AuthoringUtil.reorderUpdateListQuestionContentDTO(listQuestionContentDTO, mcQuestionContentDTO, editableQuestionIndex);
-						    logger.debug("post reorderUpdateListQuestionContentDTO listQuestionContentDTO: " + listQuestionContentDTO);			        
-				  }
-		    }
-	        else
-	        {
-	            logger.debug("entry blank, not adding");
-	        }
-		    
-		    logger.debug("entryusing mark: " + mark);
-		    mcGeneralAuthoringDTO.setMarkValue(mark);
-		    
-		    
-		    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-			sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-		    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+	AuthoringUtil authoringUtil = new AuthoringUtil();
 
-		    commonSaveCode(request, mcGeneralAuthoringDTO, 
-	        mcAuthoringForm, sessionMap, activeModule, strToolContentID, 
-	        defaultContentIdStr,  mcService, httpSessionID,listQuestionContentDTO);
+	boolean validateCandidateAnswersNotBlank = authoringUtil.validateCandidateAnswersNotBlank(request);
+	McAction.logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
 
-		    request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		    
-			logger.debug("fwd ing to LOAD_QUESTIONS: " + LOAD_QUESTIONS);
-		    return (mapping.findForward(LOAD_QUESTIONS));
-	 	}
-	 	else
-	 	{
-	        logger.debug("errors is not empty: " + errors);
-	        
-		    commonSaveCode(request, mcGeneralAuthoringDTO, 
-			        mcAuthoringForm, sessionMap, activeModule, strToolContentID, 
-			        defaultContentIdStr,  mcService, httpSessionID,listQuestionContentDTO);
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
 
-		    
-		    
-		    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-		    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-		    logger.debug("passMarksMap: " + passMarksMap);
-		    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-		    
-	        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-	        logger.debug("totalMark: " + totalMark);
-	        mcAuthoringForm.setTotalMarks(totalMark);
-	        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	caList = AuthoringUtil.removeBlankEntries(caList);
+	McAction.logger.debug("caList after removing blank entries: " + caList);
 
-		    		    
-	        logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-	    	request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	boolean validateSingleCorrectCandidate = authoringUtil.validateSingleCorrectCandidate(caList);
+	McAction.logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
 
-	        
-		    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-			sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-		    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+	boolean validateOnlyOneCorrectCandidate = authoringUtil.validateOnlyOneCorrectCandidate(caList);
+	McAction.logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
 
-		    request.setAttribute("requestNewEditableQuestionBox",new Boolean(true).toString());
-		    
-		    logger.debug("forwarding using newEditableQuestionBox");
-		    return newEditableQuestionBox(mapping, form,  request, response);
-	 	}
+	ActionMessages errors = new ActionMessages();
 
+	if (!validateCandidateAnswersNotBlank) {
+	    ActionMessage error = new ActionMessage("candidates.blank");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 	}
 
-	
-	/**
-	 * commonSaveCode(HttpServletRequest request, McGeneralAuthoringDTO mcGeneralAuthoringDTO, 
-	        McAuthoringForm mcAuthoringForm, SessionMap sessionMap, String activeModule, String strToolContentID, 
-	        String defaultContentIdStr, IMcService mcService, String httpSessionID, List listQuestionContentDTO)
-	 * 
-	 * @param request
-	 * @param mcGeneralAuthoringDTO
-	 * @param mcAuthoringForm
-	 * @param sessionMap
-	 * @param activeModule
-	 * @param strToolContentID
-	 * @param defaultContentIdStr
-	 * @param mcService
-	 * @param httpSessionID
-	 * @param listQuestionContentDTO
-	 */
-	protected void commonSaveCode(HttpServletRequest request, McGeneralAuthoringDTO mcGeneralAuthoringDTO, 
-	        McAuthoringForm mcAuthoringForm, SessionMap sessionMap, String activeModule, String strToolContentID, 
-	        String defaultContentIdStr, IMcService mcService, String httpSessionID, List listQuestionContentDTO)
-	{
-		String richTextTitle = request.getParameter(TITLE);
-	    String richTextInstructions = request.getParameter(INSTRUCTIONS);
+	if (!validateSingleCorrectCandidate) {
+	    ActionMessage error = new ActionMessage("candidates.none.correct");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
 
-	    logger.debug("richTextTitle: " + richTextTitle);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-			
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+	if (!validateOnlyOneCorrectCandidate) {
+	    ActionMessage error = new ActionMessage("candidates.duplicate.correct");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
 
-	    
-	    logger.debug("activeModule: " + activeModule);
-	    if (activeModule.equals(AUTHORING))
-	    {
-		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-		    logger.debug("onlineInstructions: " + onlineInstructions);
-		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-		
-		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-		    logger.debug("offlineInstructions: " + offlineInstructions);
-		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-		    
-		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-		    logger.debug("attachmentList: " + attachmentList);
-		
-		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-		
-		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-		    
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOfflineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	McAction.logger.debug("errors: " + errors);
 
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    McAction.logger.debug("errors saved: " + errors);
+	}
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+
+	McAction.logger.debug("entry using mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+	mcGeneralAuthoringDTO.setPassMarkValue(passmark);
+
+	if (errors.isEmpty()) {
+	    McAction.logger.debug("errors is empty: " + errors);
+	    McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	    McAction.logger.debug("mcContent: " + mcContent);
+
+	    McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	    mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	    mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
+
+	    String newQuestion = request.getParameter("newQuestion");
+	    McAction.logger.debug("newQuestion: " + newQuestion);
+
+	    String feedback = request.getParameter("feedback");
+	    McAction.logger.debug("feedback: " + feedback);
+
+	    String editableQuestionIndex = request.getParameter("editableQuestionIndex");
+	    McAction.logger.debug("editableQuestionIndex: " + editableQuestionIndex);
+	    mcAuthoringForm.setQuestionIndex(editableQuestionIndex);
+
+	    if ((newQuestion != null) && (newQuestion.length() > 0)) {
+		if ((editQuestionBoxRequest != null) && (editQuestionBoxRequest.equals("false"))) {
+		    McAction.logger.debug("request for add and save");
+		    boolean duplicates = AuthoringUtil.checkDuplicateQuestions(listQuestionContentDTO, newQuestion);
+		    McAction.logger.debug("duplicates: " + duplicates);
+
+		    if (!duplicates) {
+			McQuestionContentDTO mcQuestionContentDTO = null;
+			Iterator listIterator = listQuestionContentDTO.iterator();
+			while (listIterator.hasNext()) {
+			    mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+			    McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+			    McAction.logger
+				    .debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+
+			    String question = mcQuestionContentDTO.getQuestion();
+			    String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+			    McAction.logger.debug("displayOrder:" + displayOrder);
+
+			    if ((displayOrder != null) && (!displayOrder.equals(""))) {
+				if (displayOrder.equals(editableQuestionIndex)) {
+				    break;
+				}
+
+			    }
+			}
+			McAction.logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
+
+			mcQuestionContentDTO.setQuestion(newQuestion);
+			mcQuestionContentDTO.setFeedback(feedback);
+			mcQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
+			mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+			mcQuestionContentDTO.setMark(mark);
+
+			McAction.logger
+				.debug("caList size:" + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
+			mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO()
+				.size()).toString());
+
+			listQuestionContentDTO = AuthoringUtil.reorderUpdateListQuestionContentDTO(
+				listQuestionContentDTO, mcQuestionContentDTO, editableQuestionIndex);
+			McAction.logger.debug("post reorderUpdateListQuestionContentDTO listQuestionContentDTO: "
+				+ listQuestionContentDTO);
+		    } else {
+			McAction.logger.debug("duplicate question entry, not adding");
+		    }
+		} else {
+		    McAction.logger.debug("request for edit and save.");
+		    McQuestionContentDTO mcQuestionContentDTO = null;
+		    Iterator listIterator = listQuestionContentDTO.iterator();
+		    while (listIterator.hasNext()) {
+			mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+			McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+			McAction.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+
+			String question = mcQuestionContentDTO.getQuestion();
+			String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+			McAction.logger.debug("displayOrder:" + displayOrder);
+
+			if ((displayOrder != null) && (!displayOrder.equals(""))) {
+			    if (displayOrder.equals(editableQuestionIndex)) {
+				break;
+			    }
+
+			}
+		    }
+		    McAction.logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
+
+		    mcQuestionContentDTO.setQuestion(newQuestion);
+		    mcQuestionContentDTO.setFeedback(feedback);
+		    mcQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
+		    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+		    mcQuestionContentDTO.setMark(mark);
+
+		    McAction.logger.debug("caList size:" + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
+		    mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO()
+			    .size()).toString());
+
+		    listQuestionContentDTO = AuthoringUtil.reorderUpdateListQuestionContentDTO(listQuestionContentDTO,
+			    mcQuestionContentDTO, editableQuestionIndex);
+		    McAction.logger.debug("post reorderUpdateListQuestionContentDTO listQuestionContentDTO: "
+			    + listQuestionContentDTO);
+		}
+	    } else {
+		McAction.logger.debug("entry blank, not adding");
 	    }
-	    
 
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+	    McAction.logger.debug("entryusing mark: " + mark);
+	    mcGeneralAuthoringDTO.setMarkValue(mark);
 
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	 	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	    request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	    sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+	    McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
 
-		
-		AuthoringUtil authoringUtil = new AuthoringUtil();
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
-	    
-	    
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
+	    commonSaveCode(request, mcGeneralAuthoringDTO, mcAuthoringForm, sessionMap, activeModule, strToolContentID,
+		    defaultContentIdStr, mcService, httpSessionID, listQuestionContentDTO);
+
+	    request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	    McAction.logger.debug("fwd ing to LOAD_QUESTIONS: " + McAppConstants.LOAD_QUESTIONS);
+	    return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
+	} else {
+	    McAction.logger.debug("errors is not empty: " + errors);
+
+	    commonSaveCode(request, mcGeneralAuthoringDTO, mcAuthoringForm, sessionMap, activeModule, strToolContentID,
+		    defaultContentIdStr, mcService, httpSessionID, listQuestionContentDTO);
+
+	    McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	    Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	    McAction.logger.debug("passMarksMap: " + passMarksMap);
 	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
 
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	    String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	    McAction.logger.debug("totalMark: " + totalMark);
+	    mcAuthoringForm.setTotalMarks(totalMark);
+	    mcGeneralAuthoringDTO.setTotalMarks(totalMark);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-	    
-		logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	    
-	    logger.debug("httpSessionID: " + httpSessionID);
-	    logger.debug("sessionMap: " + sessionMap);
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	    logger.debug("mcGeneralAuthoringDTO.getMapQuestionContent(); " + mcGeneralAuthoringDTO.getMapQuestionContent());
+	    McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	    request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	    request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	    sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+	    McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	    request.setAttribute("requestNewEditableQuestionBox", new Boolean(true).toString());
+
+	    McAction.logger.debug("forwarding using newEditableQuestionBox");
+	    return newEditableQuestionBox(mapping, form, request, response);
 	}
 
-	
-    
+    }
+
     /**
-     * addSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+     * Parses questions extracted from IMS QTI file and adds them to currently edited question.
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public ActionForward saveQTI(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	// big part of code was taken from addSingleQuestion() and saveSingleQuestion() methods
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+
+	String httpSessionID = request.getParameter("httpSessionID");
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+	mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
+
+	List<McQuestionContentDTO> listQuestionContentDTO = (List<McQuestionContentDTO>) sessionMap
+		.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	// proper parsing
+	Question[] questions = QuestionParser.parseQuestionChoiceForm(request.getQueryString());
+
+	for (Question question : questions) {
+	    // quietly do same verification as in other question-adding methods 
+	    String questionText = WebUtil.removeHTMLtags(question.getText());
+	    if (StringUtils.isBlank(questionText)) {
+		LamsDispatchAction.log.warn("Skipping a blank question.");
+		continue;
+	    }
+
+	    if (AuthoringUtil.checkDuplicateQuestions(listQuestionContentDTO, questionText)) {
+		LamsDispatchAction.log.warn("Skipping duplicate question: " + questionText);
+		continue;
+	    }
+
+	    List<McCandidateAnswersDTO> caList = new ArrayList<McCandidateAnswersDTO>();
+	    String correctAnswer = null;
+	    Integer correctAnswerScore = 1;
+
+	    if (question.getAnswers() != null) {
+		for (Answer answer : question.getAnswers()) {
+		    McCandidateAnswersDTO mcCandidateAnswersDTO = new McCandidateAnswersDTO();
+		    String answerText = WebUtil.removeHTMLtags(answer.getText());
+		    if (correctAnswer != null && correctAnswer.equals(answerText)) {
+			LamsDispatchAction.log.warn("Skipping an answer with same text as the correct answer: "
+				+ answerText);
+
+			continue;
+		    }
+
+		    mcCandidateAnswersDTO.setCandidateAnswer(answerText);
+
+		    if ((answer.getScore() != null) && (answer.getScore() > 0)) {
+			if (correctAnswer == null) {
+			    mcCandidateAnswersDTO.setCorrect("Correct");
+			    correctAnswer = mcCandidateAnswersDTO.getCandidateAnswer();
+			    // marks are integer numbers
+			    correctAnswerScore = Math.min(new Double(Math.ceil(answer.getScore())).intValue(), 10);
+			} else {
+			    // there can be only one correct answer in a MCQ question
+			    LamsDispatchAction.log
+				    .warn("Choosing only first correct answer, despite another one was found: "
+					    + answerText);
+			    mcCandidateAnswersDTO.setCorrect("Incorrect");
+			}
+		    } else {
+			mcCandidateAnswersDTO.setCorrect("Incorrect");
+		    }
+
+		    caList.add(mcCandidateAnswersDTO);
+		}
+	    }
+
+	    if (correctAnswer == null) {
+		LamsDispatchAction.log.warn("No correct answer found for question: " + questionText);
+		continue;
+	    }
+
+	    McQuestionContentDTO mcQuestionContentDTO = new McQuestionContentDTO();
+	    mcQuestionContentDTO.setDisplayOrder(String.valueOf(listQuestionContentDTO.size() + 1));
+	    mcQuestionContentDTO.setQuestion(questionText);
+	    mcQuestionContentDTO.setFeedback(question.getFeedback());
+	    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+	    mcQuestionContentDTO.setMark(correctAnswerScore.toString());
+	    mcQuestionContentDTO.setCaCount(String.valueOf(caList.size()));
+
+	    listQuestionContentDTO.add(mcQuestionContentDTO);
+
+	    if (LamsDispatchAction.log.isDebugEnabled()) {
+		LamsDispatchAction.log.debug("Added question: " + questionText);
+	    }
+	}
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	commonSaveCode(request, mcGeneralAuthoringDTO, mcAuthoringForm, sessionMap, activeModule, strToolContentID,
+		defaultContentIdStr, mcService, httpSessionID, listQuestionContentDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
+    }
+
+    /**
+     * commonSaveCode(HttpServletRequest request, McGeneralAuthoringDTO mcGeneralAuthoringDTO, McAuthoringForm
+     * mcAuthoringForm, SessionMap sessionMap, String activeModule, String strToolContentID, String defaultContentIdStr,
+     * IMcService mcService, String httpSessionID, List listQuestionContentDTO)
      * 
+     * @param request
+     * @param mcGeneralAuthoringDTO
+     * @param mcAuthoringForm
+     * @param sessionMap
+     * @param activeModule
+     * @param strToolContentID
+     * @param defaultContentIdStr
+     * @param mcService
+     * @param httpSessionID
+     * @param listQuestionContentDTO
+     */
+    protected void commonSaveCode(HttpServletRequest request, McGeneralAuthoringDTO mcGeneralAuthoringDTO,
+	    McAuthoringForm mcAuthoringForm, SessionMap sessionMap, String activeModule, String strToolContentID,
+	    String defaultContentIdStr, IMcService mcService, String httpSessionID, List listQuestionContentDTO) {
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOfflineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+	McAction.logger.debug("mcGeneralAuthoringDTO.getMapQuestionContent(); "
+		+ mcGeneralAuthoringDTO.getMapQuestionContent());
+    }
+
+    /**
+     * addSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response)
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -879,253 +899,220 @@
      * @throws IOException
      * @throws ServletException
      */
-	public ActionForward addSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-	    throws IOException, ServletException {
-		
-		logger.debug("dispathcing addSingleQuestion");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-	
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-		
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
+    public ActionForward addSingleQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	McAction.logger.debug("dispathcing addSingleQuestion");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
-	
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-		mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-		
-	    AuthoringUtil authoringUtil= new AuthoringUtil();
-	    
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-        
-        List listAddableQuestionContentDTO = (List)sessionMap.get(NEW_ADDABLE_QUESTION_CONTENT_KEY);
-		logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-	    McQuestionContentDTO mcQuestionContentDTONew = null; 
-	    
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	    int listSize=listQuestionContentDTO.size();
-	    logger.debug("listSize: " + listSize);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	    logger.debug("listAddableQuestionContentDTO now: " + listAddableQuestionContentDTO);
-		request.setAttribute(NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    String passmark=request.getParameter("passmark");
-		logger.debug("passmark: " + passmark);
-	    mcGeneralAuthoringDTO.setPassMarkValue(passmark);
-	    
-	    
-		boolean validateCandidateAnswersNotBlank =authoringUtil.validateCandidateAnswersNotBlank(request);
-		logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
-	    
-	    caList=AuthoringUtil.removeBlankEntries(caList);
-	    logger.debug("caList after removing blank entries: " + caList);
-	    
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-		boolean validateSingleCorrectCandidate=authoringUtil.validateSingleCorrectCandidate(caList);
-	    logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
-	    
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
 
-		boolean validateOnlyOneCorrectCandidate=authoringUtil.validateOnlyOneCorrectCandidate(caList);
-	    logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
+	mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
 
-	    
-        ActionMessages errors = new ActionMessages();
-        
-        if (!validateCandidateAnswersNotBlank)
-        {
-            ActionMessage error = new ActionMessage("candidates.blank");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
-        
-        if (!validateSingleCorrectCandidate)
-        {
-            ActionMessage error = new ActionMessage("candidates.none.correct");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
-        if (!validateOnlyOneCorrectCandidate)
-        {
-            ActionMessage error = new ActionMessage("candidates.duplicate.correct");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
-        logger.debug("errors: " + errors);
+	AuthoringUtil authoringUtil = new AuthoringUtil();
 
-	 	if(!errors.isEmpty()){
-			saveErrors(request, errors);
-	        logger.debug("errors saved: " + errors);
-		}
-	    
-	    
-	    
-        logger.debug("errors saved: " + errors);
-	    
-	 	if(errors.isEmpty())
-	 	{
-		    if ((newQuestion != null) && (newQuestion.length() > 0))
-		    {
-		        boolean duplicates=AuthoringUtil.checkDuplicateQuestions(listQuestionContentDTO, newQuestion);
-		        logger.debug("duplicates: " + duplicates);
-		        
-		        if (!duplicates)
-		        {
-				    McQuestionContentDTO mcQuestionContentDTO=new McQuestionContentDTO();
-				    mcQuestionContentDTO.setDisplayOrder(new Long(listSize+1).toString());
-				    mcQuestionContentDTO.setFeedback(feedback);
-				    mcQuestionContentDTO.setQuestion(newQuestion);
-				    mcQuestionContentDTO.setMark(mark);
-				    
-				    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-				    logger.debug("caList size:" + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
-				    mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO().size()).toString());
-				    
-				    listQuestionContentDTO.add(mcQuestionContentDTO);
-				    logger.debug("updated listQuestionContentDTO: " + listQuestionContentDTO);	            
-		        }
-		        else
-		        {
-		            logger.debug("entry duplicate, not adding");
-		        }
-		    }
-	        else
-	        {
-	            logger.debug("entry blank, not adding");
-	        }
-	 	}
-	 	else
-	 	{
-	        logger.debug("errors, not adding");
-	        
-	        logger.debug("errors is not empty: " + errors);
-	        
-		    commonSaveCode(request, mcGeneralAuthoringDTO, 
-			        mcAuthoringForm, sessionMap, activeModule, strToolContentID, 
-			        defaultContentIdStr,  mcService, httpSessionID,listQuestionContentDTO);
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-		    
-		    
-		    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-		    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-		    logger.debug("passMarksMap: " + passMarksMap);
-		    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-		    
-	        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-	        logger.debug("totalMark: " + totalMark);
-	        mcAuthoringForm.setTotalMarks(totalMark);
-	        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	List listAddableQuestionContentDTO = (List) sessionMap.get(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY);
+	McAction.logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
 
-		    		    
-	        logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-	    	request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	McQuestionContentDTO mcQuestionContentDTONew = null;
 
-	        
-		    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-			sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-		    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+	int listSize = listQuestionContentDTO.size();
+	McAction.logger.debug("listSize: " + listSize);
 
-		    logger.debug("forwarding using newQuestionBox");
-			return newQuestionBox(mapping, form,  request, response);
-	 	}
-	    
-	    
-	    
-	    
-	    logger.debug("entry using mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
-	    
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
+	McAction.logger.debug("listAddableQuestionContentDTO now: " + listAddableQuestionContentDTO);
+	request.setAttribute(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	String passmark = request.getParameter("passmark");
+	McAction.logger.debug("passmark: " + passmark);
+	mcGeneralAuthoringDTO.setPassMarkValue(passmark);
+
+	boolean validateCandidateAnswersNotBlank = authoringUtil.validateCandidateAnswersNotBlank(request);
+	McAction.logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	caList = AuthoringUtil.removeBlankEntries(caList);
+	McAction.logger.debug("caList after removing blank entries: " + caList);
+
+	boolean validateSingleCorrectCandidate = authoringUtil.validateSingleCorrectCandidate(caList);
+	McAction.logger.debug("validateSingleCorrectCandidate: " + validateSingleCorrectCandidate);
+
+	boolean validateOnlyOneCorrectCandidate = authoringUtil.validateOnlyOneCorrectCandidate(caList);
+	McAction.logger.debug("validateOnlyOneCorrectCandidate: " + validateOnlyOneCorrectCandidate);
+
+	ActionMessages errors = new ActionMessages();
+
+	if (!validateCandidateAnswersNotBlank) {
+	    ActionMessage error = new ActionMessage("candidates.blank");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+
+	if (!validateSingleCorrectCandidate) {
+	    ActionMessage error = new ActionMessage("candidates.none.correct");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+
+	if (!validateOnlyOneCorrectCandidate) {
+	    ActionMessage error = new ActionMessage("candidates.duplicate.correct");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+
+	McAction.logger.debug("errors: " + errors);
+
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    McAction.logger.debug("errors saved: " + errors);
+	}
+
+	McAction.logger.debug("errors saved: " + errors);
+
+	if (errors.isEmpty()) {
+	    if ((newQuestion != null) && (newQuestion.length() > 0)) {
+		boolean duplicates = AuthoringUtil.checkDuplicateQuestions(listQuestionContentDTO, newQuestion);
+		McAction.logger.debug("duplicates: " + duplicates);
+
+		if (!duplicates) {
+		    McQuestionContentDTO mcQuestionContentDTO = new McQuestionContentDTO();
+		    mcQuestionContentDTO.setDisplayOrder(new Long(listSize + 1).toString());
+		    mcQuestionContentDTO.setFeedback(feedback);
+		    mcQuestionContentDTO.setQuestion(newQuestion);
+		    mcQuestionContentDTO.setMark(mark);
+
+		    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+		    McAction.logger.debug("caList size:" + mcQuestionContentDTO.getListCandidateAnswersDTO().size());
+		    mcQuestionContentDTO.setCaCount(new Integer(mcQuestionContentDTO.getListCandidateAnswersDTO()
+			    .size()).toString());
+
+		    listQuestionContentDTO.add(mcQuestionContentDTO);
+		    McAction.logger.debug("updated listQuestionContentDTO: " + listQuestionContentDTO);
+		} else {
+		    McAction.logger.debug("entry duplicate, not adding");
+		}
+	    } else {
+		McAction.logger.debug("entry blank, not adding");
+	    }
+	} else {
+	    McAction.logger.debug("errors, not adding");
+
+	    McAction.logger.debug("errors is not empty: " + errors);
+
+	    commonSaveCode(request, mcGeneralAuthoringDTO, mcAuthoringForm, sessionMap, activeModule, strToolContentID,
+		    defaultContentIdStr, mcService, httpSessionID, listQuestionContentDTO);
+
+	    McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	    Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	    McAction.logger.debug("passMarksMap: " + passMarksMap);
 	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
 
+	    String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	    McAction.logger.debug("totalMark: " + totalMark);
+	    mcAuthoringForm.setTotalMarks(totalMark);
+	    mcGeneralAuthoringDTO.setTotalMarks(totalMark);
 
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
+	    McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	    request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
 
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	    request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	    sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+	    McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
 
-        
-        logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-    	request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	    McAction.logger.debug("forwarding using newQuestionBox");
+	    return newQuestionBox(mapping, form, request, response);
+	}
 
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+	McAction.logger.debug("entry using mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
 
-	    commonSaveCode(request, mcGeneralAuthoringDTO, 
-        mcAuthoringForm, sessionMap, activeModule, strToolContentID, 
-        defaultContentIdStr,  mcService, httpSessionID,listQuestionContentDTO);
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
 
-	    request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-	    
-        logger.debug("before forwarding mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-	    
-		logger.debug("fwd LOAD_QUESTIONS");
-	    return (mapping.findForward(LOAD_QUESTIONS));
- 	}
-	
-    
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	commonSaveCode(request, mcGeneralAuthoringDTO, mcAuthoringForm, sessionMap, activeModule, strToolContentID,
+		defaultContentIdStr, mcService, httpSessionID, listQuestionContentDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("before forwarding mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+
+	McAction.logger.debug("fwd LOAD_QUESTIONS");
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
+    }
+
     /**
      * newQuestionBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
      * 
      * opens up an new screen within the current page for adding a new question
      * 
      * newQuestionBox
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -1134,165 +1121,150 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward newQuestionBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException 
-    {
-        logger.debug("dispathcing newQuestionBox");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-		
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
+    public ActionForward newQuestionBox(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispathcing newQuestionBox");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		
-		/* create default mcContent object*/
-		McContent mcContent=mcService.retrieveMc(new Long(defaultContentIdStr));
-		logger.debug("mcContent: " + mcContent);
-		
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-		String richTextTitle = request.getParameter(TITLE);
-	    String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	
-	    logger.debug("richTextTitle: " + richTextTitle);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-			
-		
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-		
-		logger.debug("activeModule: " + activeModule);
-	    if (activeModule.equals(AUTHORING))
-	    {
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOnlineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-	    }
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    
-	    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-	    AuthoringUtil authoringUtil = new AuthoringUtil();
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
+	/* create default mcContent object*/
+	McContent mcContent = mcService.retrieveMc(new Long(defaultContentIdStr));
+	McAction.logger.debug("mcContent: " + mcContent);
 
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
-	    
-		logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
 
-		String requestType=request.getParameter("requestType");
-		logger.debug("requestType: " + requestType);
-		
-		
-		List listAddableQuestionContentDTO = (List)sessionMap.get(NEW_ADDABLE_QUESTION_CONTENT_KEY);
-		logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
-		
-		if ((requestType != null) && (requestType.equals("direct")))
-		{
-			logger.debug("requestType is direct");
-			listAddableQuestionContentDTO=authoringUtil.buildDefaultQuestionContent(mcContent, mcService);
-			logger.debug("listAddableQuestionContentDTO from db: " + listAddableQuestionContentDTO);		    
-		}
-		    
-		request.setAttribute(NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
-		sessionMap.put(NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
 
-		
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	    request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
 
-	    
-        logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-    	request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
 
-		logger.debug("final listQuestionContentDTO: " + listQuestionContentDTO);
-		request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		
-		
-		logger.debug("fwd ing to newQuestionBox: ");
-        return (mapping.findForward("newQuestionBox"));
-    }
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
 
+	McAction.logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	String requestType = request.getParameter("requestType");
+	McAction.logger.debug("requestType: " + requestType);
+
+	List listAddableQuestionContentDTO = (List) sessionMap.get(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY);
+	McAction.logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+
+	if ((requestType != null) && (requestType.equals("direct"))) {
+	    McAction.logger.debug("requestType is direct");
+	    listAddableQuestionContentDTO = authoringUtil.buildDefaultQuestionContent(mcContent, mcService);
+	    McAction.logger.debug("listAddableQuestionContentDTO from db: " + listAddableQuestionContentDTO);
+	}
+
+	request.setAttribute(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
+	sessionMap.put(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
+
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	McAction.logger.debug("final listQuestionContentDTO: " + listQuestionContentDTO);
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+
+	McAction.logger.debug("fwd ing to newQuestionBox: ");
+	return (mapping.findForward("newQuestionBox"));
+    }
+
     /**
-     * newEditableQuestionBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+     * newEditableQuestionBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response)
      * 
      * opens up an new screen within the current page for editing a question
      * 
@@ -1304,210 +1276,194 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward newEditableQuestionBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException 
-    {
-        logger.debug("dispathcing newEditableQuestionBox");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-		
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
+    public ActionForward newEditableQuestionBox(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispathcing newEditableQuestionBox");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
-		
-		request.setAttribute(CURRENT_EDITABLE_QUESTION_INDEX,questionIndex); 
-		
-		mcAuthoringForm.setEditableQuestionIndex(questionIndex);
-		
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-        String editableQuestion="";
-        String editableFeedback="";
-        String editableMark="";
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-	        String question=mcQuestionContentDTO.getQuestion();
-	        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-	        
-	        if ((displayOrder != null) && (!displayOrder.equals("")))
-    		{
-	            if (displayOrder.equals(questionIndex))
-	            {
-	                editableFeedback=mcQuestionContentDTO.getFeedback();
-	                editableQuestion=mcQuestionContentDTO.getQuestion();
-	                editableMark=mcQuestionContentDTO.getMark();
-	                logger.debug("editableFeedback found :" + editableFeedback);
-	                
-	                List candidates=mcQuestionContentDTO.getListCandidateAnswersDTO();
-	                logger.debug("candidates found :" + candidates);
-	                
-	                break;
-	            }
-	            
-    		}
-	    }
-	    logger.debug("editableFeedback found :" + editableFeedback);
-	    logger.debug("editableQuestion found :" + editableQuestion);
-	    logger.debug("editableMark found :" + editableMark);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	    String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
+	request.setAttribute(McAppConstants.CURRENT_EDITABLE_QUESTION_INDEX, questionIndex);
 
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
+	mcAuthoringForm.setEditableQuestionIndex(questionIndex);
 
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
-		
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO = (McGeneralAuthoringDTO)  request.getAttribute(MC_GENERAL_AUTHORING_DTO);
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		
-		if (mcGeneralAuthoringDTO == null)
-		    mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		
-		mcGeneralAuthoringDTO.setMarkValue(editableMark);
-		
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+	String editableQuestion = "";
+	String editableFeedback = "";
+	String editableMark = "";
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    McAction.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+	    String question = mcQuestionContentDTO.getQuestion();
+	    String displayOrder = mcQuestionContentDTO.getDisplayOrder();
 
-		
-		String richTextTitle = request.getParameter(TITLE);
-	    String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	
-	    logger.debug("richTextTitle: " + richTextTitle);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-			
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-		
-		mcGeneralAuthoringDTO.setEditableQuestionText(editableQuestion);
-		mcGeneralAuthoringDTO.setEditableQuestionFeedback (editableFeedback);
-		mcAuthoringForm.setFeedback(editableFeedback);
-		
-	    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	    if ((displayOrder != null) && (!displayOrder.equals(""))) {
+		if (displayOrder.equals(questionIndex)) {
+		    editableFeedback = mcQuestionContentDTO.getFeedback();
+		    editableQuestion = mcQuestionContentDTO.getQuestion();
+		    editableMark = mcQuestionContentDTO.getMark();
+		    McAction.logger.debug("editableFeedback found :" + editableFeedback);
 
-	    AuthoringUtil authoringUtil = new AuthoringUtil();
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+		    List candidates = mcQuestionContentDTO.getListCandidateAnswersDTO();
+		    McAction.logger.debug("candidates found :" + candidates);
 
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+		    break;
+		}
 
-	    
-	    logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-		
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		logger.debug("activeModule: " + activeModule);
-	    if (activeModule.equals(AUTHORING))
-	    {
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOnlineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
 	    }
-		
-	    
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	}
+	McAction.logger.debug("editableFeedback found :" + editableFeedback);
+	McAction.logger.debug("editableQuestion found :" + editableQuestion);
+	McAction.logger.debug("editableMark found :" + editableMark);
 
-        
-        String requestNewEditableQuestionBox=(String )request.getAttribute("requestNewEditableQuestionBox");
-        logger.debug("requestNewEditableQuestionBox: " + requestNewEditableQuestionBox);
-        
-        String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-        logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-        //if ((editQuestionBoxRequest != null) && (editQuestionBoxRequest.equals("false")))
-        if ( (requestNewEditableQuestionBox != null) && requestNewEditableQuestionBox.equals("true"))
-        {
-    	    //String newQuestion=request.getParameter("newQuestion");
-    	    //logger.debug("newQuestion: " + newQuestion);
-    	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-    	    
-    	    String feedback=request.getParameter("feedback");
-    	    logger.debug("feedback: " + feedback);
-    	    mcAuthoringForm.setFeedback(feedback);
-        }
-        
-        
-        
-        logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-    	request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    
-	    logger.debug("final listQuestionContentDTO: " + listQuestionContentDTO);
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		
-	    mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-	    logger.debug("fwd ing to editQuestionBox: ");
-        return (mapping.findForward("editQuestionBox"));
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
+
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = (McGeneralAuthoringDTO) request
+		.getAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO);
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+
+	if (mcGeneralAuthoringDTO == null) {
+	    mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	}
+
+	mcGeneralAuthoringDTO.setMarkValue(editableMark);
+
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setEditableQuestionText(editableQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionFeedback(editableFeedback);
+	mcAuthoringForm.setFeedback(editableFeedback);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("mcGeneralAuthoringDTO now: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	String requestNewEditableQuestionBox = (String) request.getAttribute("requestNewEditableQuestionBox");
+	McAction.logger.debug("requestNewEditableQuestionBox: " + requestNewEditableQuestionBox);
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+
+	// if ((editQuestionBoxRequest != null) && (editQuestionBoxRequest.equals("false")))
+	if ((requestNewEditableQuestionBox != null) && requestNewEditableQuestionBox.equals("true")) {
+	    // String newQuestion=request.getParameter("newQuestion");
+	    // logger.debug("newQuestion: " + newQuestion);
+	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	    String feedback = request.getParameter("feedback");
+	    McAction.logger.debug("feedback: " + feedback);
+	    mcAuthoringForm.setFeedback(feedback);
+	}
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	McAction.logger.debug("final listQuestionContentDTO: " + listQuestionContentDTO);
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	McAction.logger.debug("fwd ing to editQuestionBox: ");
+	return (mapping.findForward("editQuestionBox"));
     }
 
-    
-    
     /**
      * 
-     * ActionForward removeQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-        throws IOException, ServletException
-        
-        removes a question from the questions map
+     * ActionForward removeQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+     * HttpServletResponse response) throws IOException, ServletException
      * 
+     * removes a question from the questions map
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -1516,200 +1472,186 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward removeQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-        throws IOException, ServletException {
-    	logger.debug("dispatching removeQuestion");
-    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-    	
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
+    public ActionForward removeQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching removeQuestion");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		
-	    
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	    McQuestionContentDTO mcQuestionContentDTO= null;
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-	        
-	        String question=mcQuestionContentDTO.getQuestion();
-	        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-	        logger.debug("displayOrder:" + displayOrder);
-	        
-	        if ((displayOrder != null) && (!displayOrder.equals("")))
-    		{
-	            if (displayOrder.equals(questionIndex))
-	            {
-	                break;
-	            }
-	            
-    		}
-	    }
-	    
-	    logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
-	    mcQuestionContentDTO.setQuestion("");
-	    logger.debug("listQuestionContentDTO after remove:" + listQuestionContentDTO);
-	  
-	    
-	    listQuestionContentDTO=AuthoringUtil.reorderListQuestionContentDTO(listQuestionContentDTO, questionIndex );
-	    logger.debug("listQuestionContentDTO reordered:" + listQuestionContentDTO);
-        
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-        
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-        logger.debug("richTextInstructions: " + richTextInstructions);
-        
-		
-        sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-        sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
+	McQuestionContentDTO mcQuestionContentDTO = null;
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    McAction.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
 
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
-		
-		if (mcContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			mcContent=mcService.retrieveMc(new Long(defaultContentIdStr));
+	    String question = mcQuestionContentDTO.getQuestion();
+	    String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+	    McAction.logger.debug("displayOrder:" + displayOrder);
+
+	    if ((displayOrder != null) && (!displayOrder.equals(""))) {
+		if (displayOrder.equals(questionIndex)) {
+		    break;
 		}
-		logger.debug("final mcContent: " + mcContent);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-        mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-        mcAuthoringForm.setTitle(richTextTitle);
-        
-  		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+	    }
+	}
 
-	    logger.debug("activeModule: " + activeModule);
-  		if (activeModule.equals(AUTHORING))
-  		{
-  	        String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-  	        logger.debug("onlineInstructions: " + onlineInstructions);
-  		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	McAction.logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
+	mcQuestionContentDTO.setQuestion("");
+	McAction.logger.debug("listQuestionContentDTO after remove:" + listQuestionContentDTO);
 
-  	        String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-  	        logger.debug("offlineInstructions: " + offlineInstructions);
-  		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-  		    
-  		    
-  	        List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-  		    logger.debug("attachmentList: " + attachmentList);
-  		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-  		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	listQuestionContentDTO = AuthoringUtil.reorderListQuestionContentDTO(listQuestionContentDTO, questionIndex);
+	McAction.logger.debug("listQuestionContentDTO reordered:" + listQuestionContentDTO);
 
-  		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-  		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-  		    
-  			String strOnlineInstructions= request.getParameter("onlineInstructions");
-  			String strOfflineInstructions= request.getParameter("offlineInstructions");
-  			logger.debug("onlineInstructions: " + strOnlineInstructions);
-  			logger.debug("offlineInstructions: " + strOnlineInstructions);
-  			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-  			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-  		}
-        
-		AuthoringUtil authoringUtil= new AuthoringUtil();
-        
-        mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-        
-        request.getSession().setAttribute(httpSessionID, sessionMap);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
 
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("mcQuestionContentDTO now: " + mcQuestionContentDTO);
-	    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-	    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		
-		logger.debug("fwd ing to LOAD_QUESTIONS: " + LOAD_QUESTIONS);
-        return (mapping.findForward(LOAD_QUESTIONS));
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	if (mcContent == null) {
+	    McAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
+	    mcContent = mcService.retrieveMc(new Long(defaultContentIdStr));
+	}
+	McAction.logger.debug("final mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("mcQuestionContentDTO now: " + mcQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("fwd ing to LOAD_QUESTIONS: " + McAppConstants.LOAD_QUESTIONS);
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
     }
-    
-    
+
     /**
-     * moveQuestionDown(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+     * moveQuestionDown(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response)
      * 
      * moves a question down in the list
      * 
      * moveQuestionDown
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -1718,165 +1660,157 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward moveQuestionDown(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching moveQuestionDown");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+    public ActionForward moveQuestionDown(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching moveQuestionDown");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-	    
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	    
-	    listQuestionContentDTO=AuthoringUtil.swapNodes(listQuestionContentDTO, questionIndex, "down");
-	    logger.debug("listQuestionContentDTO after swap: " + listQuestionContentDTO);
-	    
-	    listQuestionContentDTO=AuthoringUtil.reorderSimpleListQuestionContentDTO(listQuestionContentDTO);
-	    logger.debug("listQuestionContentDTO after reordersimple: " + listQuestionContentDTO);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-	    
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-		logger.debug("activeModule: " + activeModule);
-  		if (activeModule.equals(AUTHORING))
-  		{
-  		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("onlineInstructions: " + onlineInstructions);
-  		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-  		
-  		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("offlineInstructions: " + offlineInstructions);
-  		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-  		    
-  		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-  		    logger.debug("attachmentList: " + attachmentList);
-  		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-  		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-  		
-  		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-  		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-  			String strOnlineInstructions= request.getParameter("onlineInstructions");
-  			String strOfflineInstructions= request.getParameter("offlineInstructions");
-  			logger.debug("onlineInstructions: " + strOnlineInstructions);
-  			logger.debug("offlineInstructions: " + strOnlineInstructions);
-  			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-  			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-  		}
-	    
-		AuthoringUtil authoringUtil= new AuthoringUtil();
-	    
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	listQuestionContentDTO = AuthoringUtil.swapNodes(listQuestionContentDTO, questionIndex, "down");
+	McAction.logger.debug("listQuestionContentDTO after swap: " + listQuestionContentDTO);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		
-		logger.debug("fwd ing to LOAD_QUESTIONS: " + LOAD_QUESTIONS);
-	    return (mapping.findForward(LOAD_QUESTIONS));
+	listQuestionContentDTO = AuthoringUtil.reorderSimpleListQuestionContentDTO(listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO after reordersimple: " + listQuestionContentDTO);
+
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
+
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
+
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
+
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("fwd ing to LOAD_QUESTIONS: " + McAppConstants.LOAD_QUESTIONS);
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
     }
 
-    
     /**
      * moveQuestionUp(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
-     *
-     *  moveQuestionUp(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)     * 
      * 
+     * moveQuestionUp(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+     * *
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -1885,167 +1819,158 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward moveQuestionUp(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching moveQuestionUp");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
-		
-	    
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	    
-	    listQuestionContentDTO=AuthoringUtil.swapNodes(listQuestionContentDTO, questionIndex, "up");
-	    logger.debug("listQuestionContentDTO after swap: " + listQuestionContentDTO);	    
-	    
-	    listQuestionContentDTO=AuthoringUtil.reorderSimpleListQuestionContentDTO(listQuestionContentDTO);
-	    logger.debug("listQuestionContentDTO after reordersimple: " + listQuestionContentDTO);
-		    
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+    public ActionForward moveQuestionUp(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching moveQuestionUp");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
-		
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-	    logger.debug("activeModule: " + activeModule);
-		if (activeModule.equals(AUTHORING))
-		{
-		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-		    logger.debug("onlineInstructions: " + onlineInstructions);
-		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-		
-		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-		    logger.debug("offlineInstructions: " + offlineInstructions);
-		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-		    
-		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-		    logger.debug("attachmentList: " + attachmentList);
-		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-		
-		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-		    
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOnlineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-		}
-	    
-		AuthoringUtil authoringUtil= new AuthoringUtil();
-	    
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		logger.debug("fwd ing to LOAD_QUESTIONS: " + LOAD_QUESTIONS);
-	    return (mapping.findForward(LOAD_QUESTIONS));
-    }
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
+	listQuestionContentDTO = AuthoringUtil.swapNodes(listQuestionContentDTO, questionIndex, "up");
+	McAction.logger.debug("listQuestionContentDTO after swap: " + listQuestionContentDTO);
 
-    
+	listQuestionContentDTO = AuthoringUtil.reorderSimpleListQuestionContentDTO(listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO after reordersimple: " + listQuestionContentDTO);
+
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
+
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
+
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
+
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
+
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("fwd ing to LOAD_QUESTIONS: " + McAppConstants.LOAD_QUESTIONS);
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
+    }
+
     /**
      * 
-     * ActionForward addNewFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-        throws IOException, ServletException
-        
-        adds a new file to content repository
-        
+     * ActionForward addNewFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response) throws IOException, ServletException
+     * 
+     * adds a new file to content repository
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -2054,154 +1979,148 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward addNewFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-        throws IOException, ServletException {
-        logger.debug("dispathching addNewFile");
-    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-        
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
+    public ActionForward addNewFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispathching addNewFile");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-		
-		String onlineInstructions=request.getParameter(ONLINE_INSTRUCTIONS);
-		logger.debug("onlineInstructions: " + onlineInstructions);
-		
-		String offlineInstructions=request.getParameter(OFFLINE_INSTRUCTIONS);
-		logger.debug("offlineInstructions: " + offlineInstructions);
-		
-		sessionMap.put(ONLINE_INSTRUCTIONS_KEY, onlineInstructions);
-		sessionMap.put(OFFLINE_INSTRUCTIONS, offlineInstructions);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-        
-        request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-		mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
-		
-		String richTextTitle = request.getParameter(TITLE);
-	    String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	
-	    logger.debug("richTextTitle: " + richTextTitle);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-			
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-	    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-	    logger.debug("attachmentList: " + attachmentList);
-	    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-	    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-	    
-        addFileToContentRepository(request, mcAuthoringForm, attachmentList, deletedAttachmentList, sessionMap, mcGeneralAuthoringDTO);
-        logger.debug("post addFileToContentRepository, attachmentList: " + attachmentList);
-        logger.debug("post addFileToContentRepository, deletedAttachmentList: " + deletedAttachmentList);
+	String onlineInstructions = request.getParameter(McAppConstants.ONLINE_INSTRUCTIONS);
+	McAction.logger.debug("onlineInstructions: " + onlineInstructions);
 
-        sessionMap.put(ATTACHMENT_LIST_KEY,attachmentList);
-        sessionMap.put(DELETED_ATTACHMENT_LIST_KEY,deletedAttachmentList);
-        
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
+	String offlineInstructions = request.getParameter(McAppConstants.OFFLINE_INSTRUCTIONS);
+	McAction.logger.debug("offlineInstructions: " + offlineInstructions);
 
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, 
-	             activeModule, sessionMap, httpSessionID);
+	sessionMap.put(McAppConstants.ONLINE_INSTRUCTIONS_KEY, onlineInstructions);
+	sessionMap.put(McAppConstants.OFFLINE_INSTRUCTIONS, offlineInstructions);
 
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("3");
-		
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-	    AuthoringUtil authoringUtil = new AuthoringUtil();
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-        mcAuthoringForm.resetUserAction();
-		
-        String strOnlineInstructions= request.getParameter("onlineInstructions");
-		String strOfflineInstructions= request.getParameter("offlineInstructions");
-		logger.debug("onlineInstructions: " + strOnlineInstructions);
-		logger.debug("offlineInstructions: " + strOnlineInstructions);
-		mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-		mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
 
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-        logger.debug("fwd ing to LOAD_QUESTIONS: " + LOAD_QUESTIONS);
-        return (mapping.findForward(LOAD_QUESTIONS));
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	McAction.logger.debug("attachmentList: " + attachmentList);
+	List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	addFileToContentRepository(request, mcAuthoringForm, attachmentList, deletedAttachmentList, sessionMap,
+		mcGeneralAuthoringDTO);
+	McAction.logger.debug("post addFileToContentRepository, attachmentList: " + attachmentList);
+	McAction.logger.debug("post addFileToContentRepository, deletedAttachmentList: " + deletedAttachmentList);
+
+	sessionMap.put(McAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
+	sessionMap.put(McAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
+
+	mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("3");
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	mcAuthoringForm.resetUserAction();
+
+	String strOnlineInstructions = request.getParameter("onlineInstructions");
+	String strOfflineInstructions = request.getParameter("offlineInstructions");
+	McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("fwd ing to LOAD_QUESTIONS: " + McAppConstants.LOAD_QUESTIONS);
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
     }
-    
-    
+
     /**
      * 
-     * ActionForward deleteFile(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException
+     * ActionForward deleteFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response) throws IOException, ServletException
      * 
      * deletes a file from the content repository
      * 
@@ -2213,154 +2132,143 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward deleteFile(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException
-    {
-        logger.debug("dispatching deleteFile");
-    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-        
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
+    public ActionForward deleteFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching deleteFile");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-		
-		
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-        List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-        logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-        
-        request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO(); 
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-		mcGeneralAuthoringDTO.setSbmtSuccess( new Integer(0).toString());
-        
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-        
-		String onlineInstructions=(String) sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-		logger.debug("onlineInstructions: " + onlineInstructions);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-		String offlineInstructions=(String) sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-		logger.debug("offlineInstructions: " + offlineInstructions);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-		mcAuthoringForm.setOnlineInstructions(onlineInstructions);
-		mcAuthoringForm.setOfflineInstructions(offlineInstructions);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-	    String richTextTitle=(String)sessionMap.get(ACTIVITY_TITLE_KEY);
-	    String richTextInstructions=(String)sessionMap.get(ACTIVITY_INSTRUCTIONS_KEY);
-	
-	    logger.debug("richTextTitle: " + richTextTitle);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-			
-        long uuid = WebUtil.readLongParam(request, UUID);
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
 
-	    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-	    logger.debug("attachmentList: " + attachmentList);
-	    
-	    if(attachmentList == null)
-	        attachmentList = new ArrayList();
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
 
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
-	    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-	    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	mcGeneralAuthoringDTO.setSbmtSuccess(new Integer(0).toString());
 
-	    if(deletedAttachmentList == null)
-            deletedAttachmentList = new ArrayList();
-        
-        /* move the file's details from the attachment collection to the deleted attachments collection
-         the attachment will be delete on saving. */
-	    
-        deletedAttachmentList = McUtils.moveToDelete(Long.toString(uuid), attachmentList, deletedAttachmentList );
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
 
-        
-        sessionMap.put(ATTACHMENT_LIST_KEY,attachmentList);
-        sessionMap.put(DELETED_ATTACHMENT_LIST_KEY,deletedAttachmentList);
-        
-	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
+	String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	McAction.logger.debug("onlineInstructions: " + onlineInstructions);
 
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("3");
-		
-	    AuthoringUtil authoringUtil = new AuthoringUtil();
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	McAction.logger.debug("offlineInstructions: " + offlineInstructions);
 
+	mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+	mcAuthoringForm.setOnlineInstructions(onlineInstructions);
+	mcAuthoringForm.setOfflineInstructions(offlineInstructions);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+	String richTextTitle = (String) sessionMap.get(McAppConstants.ACTIVITY_TITLE_KEY);
+	String richTextInstructions = (String) sessionMap.get(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY);
 
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+	long uuid = WebUtil.readLongParam(request, McAppConstants.UUID);
 
-        mcAuthoringForm.resetUserAction();
-        logger.debug("fwd ing to LOAD_QUESTIONS: " + LOAD_QUESTIONS);
-        return (mapping.findForward(LOAD_QUESTIONS));
+	List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	McAction.logger.debug("attachmentList: " + attachmentList);
+
+	if (attachmentList == null) {
+	    attachmentList = new ArrayList();
+	}
+
+	List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	if (deletedAttachmentList == null) {
+	    deletedAttachmentList = new ArrayList();
+	}
+
+	/* move the file's details from the attachment collection to the deleted attachments collection
+	 the attachment will be delete on saving. */
+
+	deletedAttachmentList = McUtils.moveToDelete(Long.toString(uuid), attachmentList, deletedAttachmentList);
+
+	sessionMap.put(McAppConstants.ATTACHMENT_LIST_KEY, attachmentList);
+	sessionMap.put(McAppConstants.DELETED_ATTACHMENT_LIST_KEY, deletedAttachmentList);
+
+	mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("3");
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	mcAuthoringForm.resetUserAction();
+	McAction.logger.debug("fwd ing to LOAD_QUESTIONS: " + McAppConstants.LOAD_QUESTIONS);
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
     }
-   
-    
+
     /**
      * persistError(HttpServletRequest request, String message)
      * 
@@ -2369,135 +2277,130 @@
      * @param request
      * @param message
      */
-    public void persistError(HttpServletRequest request, String message)
-    {
-        ActionMessages errors= new ActionMessages();
-        errors.add(Globals.ERROR_KEY, new ActionMessage(message));
-        logger.debug("add " + message +"  to ActionMessages:");
-        saveErrors(request,errors);             
-    } 
-    
-    
+    public void persistError(HttpServletRequest request, String message) {
+	ActionMessages errors = new ActionMessages();
+	errors.add(Globals.ERROR_KEY, new ActionMessage(message));
+	McAction.logger.debug("add " + message + "  to ActionMessages:");
+	saveErrors(request, errors);
+    }
+
     /**
-     * addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm, 
-            List attachmentList, List deletedAttachmentList, SessionMap sessionMap, 
-            McGeneralAuthoringDTO mcGeneralAuthoringDTO)
-            
+     * addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm, List attachmentList, List
+     * deletedAttachmentList, SessionMap sessionMap, McGeneralAuthoringDTO mcGeneralAuthoringDTO)
+     * 
      * @param request
      * @param mcAuthoringForm
      */
-    public void addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm, 
-            List attachmentList, List deletedAttachmentList, SessionMap sessionMap, 
-            McGeneralAuthoringDTO mcGeneralAuthoringDTO)
-    {
-        logger.debug("attempt addFileToContentRepository");
-        logger.debug("attachmentList: " + attachmentList);
-        logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-        IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
-        logger.debug("mcService: " + mcService);
-        
-        if(attachmentList == null)
-            attachmentList = new ArrayList();
-        
-        if(deletedAttachmentList == null)
-            deletedAttachmentList = new ArrayList();
-        
-        FormFile uploadedFile = null;
-        boolean isOnlineFile = false;
-        String fileType = null;
-        if(mcAuthoringForm.getTheOfflineFile() != null && mcAuthoringForm.getTheOfflineFile().getFileSize() > 0 ){
-            logger.debug("theOfflineFile is available: ");
-            uploadedFile = mcAuthoringForm.getTheOfflineFile();
-            logger.debug("uploadedFile: " + uploadedFile);
-            fileType = IToolContentHandler.TYPE_OFFLINE;
-        }
-        else if(mcAuthoringForm.getTheOnlineFile() != null && mcAuthoringForm.getTheOnlineFile().getFileSize() > 0 ){
-            logger.debug("theOnlineFile is available: ");
-            uploadedFile = mcAuthoringForm.getTheOnlineFile();
-            logger.debug("uploadedFile: " + uploadedFile);
-            isOnlineFile = true;
-            fileType = IToolContentHandler.TYPE_ONLINE;
-        }
-        else
-            /*no file uploaded*/
-            return;
-        
-        //validate upload file size.
-		ActionMessages errors = new ActionMessages();
-		FileValidatorUtil.validateFileSize(uploadedFile, true, errors );
-		if(!errors.isEmpty()){
-			this.saveErrors(request, errors);
-			return;
-		}
-		
-        logger.debug("uploadedFile.getFileName(): " + uploadedFile.getFileName());
-        
-        /* if a file with the same name already exists then move the old one to deleted */
-        deletedAttachmentList = McUtils.moveToDelete(uploadedFile.getFileName(), isOnlineFile, attachmentList, deletedAttachmentList );
-        logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+    public void addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm,
+	    List attachmentList, List deletedAttachmentList, SessionMap sessionMap,
+	    McGeneralAuthoringDTO mcGeneralAuthoringDTO) {
+	McAction.logger.debug("attempt addFileToContentRepository");
+	McAction.logger.debug("attachmentList: " + attachmentList);
+	McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-        try
-        {
-            /* This is a new file and so is saved to the content repository. Add it to the 
-             attachments collection, but don't add it to the tool's tables yet.
-             */
-            NodeKey node = getToolContentHandler().uploadFile(uploadedFile.getInputStream(), uploadedFile.getFileName(), 
-                    uploadedFile.getContentType(), fileType); 
-            McUploadedFile file = new McUploadedFile();
-            String fileName=uploadedFile.getFileName();
-            logger.debug("fileName: " + fileName);
-            logger.debug("fileName length: " + fileName.length());
-            
-            if ((fileName != null) && (fileName.length() > 30))
-            {
-                fileName=fileName.substring(0, 31);
-                logger.debug("shortened fileName: " + fileName);
-            }
-            	
-            file.setFileName(fileName);
-            file.setFileOnline(isOnlineFile);
-            file.setUuid(node.getUuid().toString());
-            /* file.setVersionId(node.getVersion()); */ 
-            
-            /* add the files to the attachment collection - if one existed, it should have already been removed. */
-            attachmentList.add(file);
-            
-            /* reset the fields so that more files can be uploaded */
-            mcAuthoringForm.setTheOfflineFile(null);
-            mcAuthoringForm.setTheOnlineFile(null);
-        }
-        catch (FileNotFoundException e) {
-            logger.error("Unable to uploadfile",e);
-            throw new RuntimeException("Unable to upload file, exception was "+e.getMessage());
-        } catch (IOException e) {
-            logger.error("Unable to uploadfile",e);
-            throw new RuntimeException("Unable to upload file, exception was "+e.getMessage());
-        } catch (RepositoryCheckedException e) {
-            logger.error("Unable to uploadfile",e);
-            throw new RuntimeException("Unable to upload file, exception was "+e.getMessage());
-        }
+	if (attachmentList == null) {
+	    attachmentList = new ArrayList();
+	}
+
+	if (deletedAttachmentList == null) {
+	    deletedAttachmentList = new ArrayList();
+	}
+
+	FormFile uploadedFile = null;
+	boolean isOnlineFile = false;
+	String fileType = null;
+	if ((mcAuthoringForm.getTheOfflineFile() != null) && (mcAuthoringForm.getTheOfflineFile().getFileSize() > 0)) {
+	    McAction.logger.debug("theOfflineFile is available: ");
+	    uploadedFile = mcAuthoringForm.getTheOfflineFile();
+	    McAction.logger.debug("uploadedFile: " + uploadedFile);
+	    fileType = IToolContentHandler.TYPE_OFFLINE;
+	} else if ((mcAuthoringForm.getTheOnlineFile() != null)
+		&& (mcAuthoringForm.getTheOnlineFile().getFileSize() > 0)) {
+	    McAction.logger.debug("theOnlineFile is available: ");
+	    uploadedFile = mcAuthoringForm.getTheOnlineFile();
+	    McAction.logger.debug("uploadedFile: " + uploadedFile);
+	    isOnlineFile = true;
+	    fileType = IToolContentHandler.TYPE_ONLINE;
+	} else {
+	    /*no file uploaded*/
+	    return;
+	}
+
+	// validate upload file size.
+	ActionMessages errors = new ActionMessages();
+	FileValidatorUtil.validateFileSize(uploadedFile, true, errors);
+	if (!errors.isEmpty()) {
+	    this.saveErrors(request, errors);
+	    return;
+	}
+
+	McAction.logger.debug("uploadedFile.getFileName(): " + uploadedFile.getFileName());
+
+	/* if a file with the same name already exists then move the old one to deleted */
+	deletedAttachmentList = McUtils.moveToDelete(uploadedFile.getFileName(), isOnlineFile, attachmentList,
+		deletedAttachmentList);
+	McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	try {
+	    /* This is a new file and so is saved to the content repository. Add it to the 
+	     attachments collection, but don't add it to the tool's tables yet.
+	     */
+	    NodeKey node = getToolContentHandler().uploadFile(uploadedFile.getInputStream(),
+		    uploadedFile.getFileName(), uploadedFile.getContentType(), fileType);
+	    McUploadedFile file = new McUploadedFile();
+	    String fileName = uploadedFile.getFileName();
+	    McAction.logger.debug("fileName: " + fileName);
+	    McAction.logger.debug("fileName length: " + fileName.length());
+
+	    if ((fileName != null) && (fileName.length() > 30)) {
+		fileName = fileName.substring(0, 31);
+		McAction.logger.debug("shortened fileName: " + fileName);
+	    }
+
+	    file.setFileName(fileName);
+	    file.setFileOnline(isOnlineFile);
+	    file.setUuid(node.getUuid().toString());
+	    /* file.setVersionId(node.getVersion()); */
+
+	    /* add the files to the attachment collection - if one existed, it should have already been removed. */
+	    attachmentList.add(file);
+
+	    /* reset the fields so that more files can be uploaded */
+	    mcAuthoringForm.setTheOfflineFile(null);
+	    mcAuthoringForm.setTheOnlineFile(null);
+	} catch (FileNotFoundException e) {
+	    McAction.logger.error("Unable to uploadfile", e);
+	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
+	} catch (IOException e) {
+	    McAction.logger.error("Unable to uploadfile", e);
+	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
+	} catch (RepositoryCheckedException e) {
+	    McAction.logger.error("Unable to uploadfile", e);
+	    throw new RuntimeException("Unable to upload file, exception was " + e.getMessage());
+	}
     }
-        
-    
+
     /**
      * McToolContentHandler getToolContentHandler()
      * 
      * @return
      */
-    private McToolContentHandler getToolContentHandler()
-    {
-        if ( toolContentHandler == null ) {
-              WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-              toolContentHandler = (McToolContentHandler) wac.getBean("mcToolContentHandler");
-            }
-            return toolContentHandler;
+    private McToolContentHandler getToolContentHandler() {
+	if (toolContentHandler == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		    .getServletContext());
+	    toolContentHandler = (McToolContentHandler) wac.getBean("mcToolContentHandler");
+	}
+	return toolContentHandler;
     }
 
     /**
      * 
-     * Go through the attachments collections. Remove any content repository or tool objects
-     * matching entries in the the deletedAttachments collection, add any new attachments in the
-     * attachments collection. Clear the deletedAttachments collection, ready for new editing.
+     * Go through the attachments collections. Remove any content repository or tool objects matching entries in the the
+     * deletedAttachments collection, add any new attachments in the attachments collection. Clear the
+     * deletedAttachments collection, ready for new editing.
      * 
      * @param mcContent
      * @param attachmentList
@@ -2506,81 +2409,67 @@
      * @param request
      * @return
      */
-    private List saveAttachments (McContent mcContent, 
-            List attachmentList, List deletedAttachmentList,
-            ActionMapping mapping, HttpServletRequest request) {
+    private List saveAttachments(McContent mcContent, List attachmentList, List deletedAttachmentList,
+	    ActionMapping mapping, HttpServletRequest request) {
 
-        logger.debug("start saveAttachments, mcContent " + mcContent);
-    	logger.debug("start saveAttachments, attachmentList " + attachmentList);
-    	logger.debug("start deletedAttachmentList, deletedAttachmentList " + deletedAttachmentList);
-    	
-        if(attachmentList==null || deletedAttachmentList==null)
-            return null;
-        
-        IMcService voteService = McServiceProxy.getMcService(getServlet().getServletContext());
-        logger.debug("voteService: " + voteService);
-        
-        if ( deletedAttachmentList != null ) {
-        	logger.debug("deletedAttachmentList is iterated...");
-            Iterator iter = deletedAttachmentList.iterator();
-            while (iter.hasNext()) {
-                McUploadedFile attachment = (McUploadedFile) iter.next();
-                logger.debug("attachment: " + attachment);
-                
-                if ( attachment.getSubmissionId() != null ) {
-                    voteService.removeFile(attachment.getSubmissionId());
-                }
-            }
-            deletedAttachmentList.clear();
-            logger.error("cleared attachment list.");
-        }
-        
-        
-        if ( attachmentList != null ) 
-        {
-        	logger.debug("attachmentList is iterated...");
-            Iterator iter = attachmentList.iterator();
-            while (iter.hasNext()) {
-                McUploadedFile attachment = (McUploadedFile) iter.next();
-            	logger.debug("attachment: " + attachment);
-            	logger.debug("attachment submission id: " + attachment.getSubmissionId());
+	McAction.logger.debug("start saveAttachments, mcContent " + mcContent);
+	McAction.logger.debug("start saveAttachments, attachmentList " + attachmentList);
+	McAction.logger.debug("start deletedAttachmentList, deletedAttachmentList " + deletedAttachmentList);
 
-                if ( attachment.getSubmissionId() == null ) {
-                    /* add entry to tool table - file already in content repository */
-                	logger.debug("calling persistFile with  attachment: " + attachment);
-                    voteService.persistFile(mcContent, attachment);
-                }
-            }
-        }
-            
-        return deletedAttachmentList;
-    }
-    
-    
-    
-    public ActionForward editActivity(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException
-	{
-    	logger.debug("dispatching proxy editActivity...");
-    	return null;
+	if ((attachmentList == null) || (deletedAttachmentList == null)) {
+	    return null;
 	}
 
-    
-    
+	IMcService voteService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("voteService: " + voteService);
+
+	if (deletedAttachmentList != null) {
+	    McAction.logger.debug("deletedAttachmentList is iterated...");
+	    Iterator iter = deletedAttachmentList.iterator();
+	    while (iter.hasNext()) {
+		McUploadedFile attachment = (McUploadedFile) iter.next();
+		McAction.logger.debug("attachment: " + attachment);
+
+		if (attachment.getSubmissionId() != null) {
+		    voteService.removeFile(attachment.getSubmissionId());
+		}
+	    }
+	    deletedAttachmentList.clear();
+	    McAction.logger.error("cleared attachment list.");
+	}
+
+	if (attachmentList != null) {
+	    McAction.logger.debug("attachmentList is iterated...");
+	    Iterator iter = attachmentList.iterator();
+	    while (iter.hasNext()) {
+		McUploadedFile attachment = (McUploadedFile) iter.next();
+		McAction.logger.debug("attachment: " + attachment);
+		McAction.logger.debug("attachment submission id: " + attachment.getSubmissionId());
+
+		if (attachment.getSubmissionId() == null) {
+		    /* add entry to tool table - file already in content repository */
+		    McAction.logger.debug("calling persistFile with  attachment: " + attachment);
+		    voteService.persistFile(mcContent, attachment);
+		}
+	    }
+	}
+
+	return deletedAttachmentList;
+    }
+
+    public ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching proxy editActivity...");
+	return null;
+    }
+
     /**
      * 
-     * ActionForward editActivityQuestions(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException,
-                                         ToolException
-                                         
-       generates Edit Activity screen
+     * ActionForward editActivityQuestions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+     * HttpServletResponse response) throws IOException, ServletException, ToolException
      * 
+     * generates Edit Activity screen
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -2590,146 +2479,137 @@
      * @throws ServletException
      * @throws ToolException
      */
-    public ActionForward editActivityQuestions(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException,
-                                         ToolException
-    {
-    	logger.debug("dispatching editActivityQuestions...");
-    	
-    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		logger.debug("mcAuthoringForm: " + mcAuthoringForm);
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
+    public ActionForward editActivityQuestions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException, ToolException {
+	McAction.logger.debug("dispatching editActivityQuestions...");
 
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
+	McAction.logger.debug("mcAuthoringForm: " + mcAuthoringForm);
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-		
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
-		
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		
-        logger.debug("title: " + mcContent.getTitle());
-        logger.debug("instructions: " + mcContent.getInstructions());
-        
-        mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
-        mcAuthoringForm.setTitle(mcContent.getTitle());
-        
-        mcGeneralAuthoringDTO.setActivityInstructions(mcContent.getInstructions());
-        
-        sessionMap.put(ACTIVITY_TITLE_KEY, mcContent.getTitle());
-        sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, mcContent.getInstructions());
-        
-		
-		/* determine whether the request is from Monitoring url Edit Activity*/
-		String sourceMcStarter = (String) request.getAttribute(SOURCE_MC_STARTER);
-		logger.debug("sourceMcStarter: " + sourceMcStarter);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-		mcAuthoringForm.setDefineLaterInEditMode(new Boolean(true).toString());
-     	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-     	
-		boolean isContentInUse=McUtils.isContentInUse(mcContent);
-		logger.debug("isContentInUse:" + isContentInUse);
-		
-		mcGeneralAuthoringDTO.setMonitoredContentInUse(new Boolean(false).toString());
-		if (isContentInUse == true)
-		{
-			logger.debug("monitoring url does not allow editActivity since the content is in use.");
-	    	persistError(request,"error.content.inUse");
-	    	mcGeneralAuthoringDTO.setMonitoredContentInUse(new Boolean(true).toString());
-		}
-		
-	    EditActivityDTO editActivityDTO = new EditActivityDTO();
-		logger.debug("isContentInUse:" + isContentInUse);
-		if (isContentInUse == true)
-		{
-		    editActivityDTO.setMonitoredContentInUse(new Boolean(true).toString());
-		}
-		request.setAttribute(EDIT_ACTIVITY_DTO, editActivityDTO);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-		McUtils.setDefineLater(request, true, strToolContentID, mcService);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-	    AuthoringUtil authoringUtil= new AuthoringUtil();
-	    List listQuestionContentDTO=authoringUtil.buildDefaultQuestionContent(mcContent, mcService);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
 
-	    request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-		request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		request.getSession().setAttribute(httpSessionID, sessionMap);
+	McAction.logger.debug("title: " + mcContent.getTitle());
+	McAction.logger.debug("instructions: " + mcContent.getInstructions());
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
+	mcAuthoringForm.setTitle(mcContent.getTitle());
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setActivityInstructions(mcContent.getInstructions());
 
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-		logger.debug("before fwding to jsp, mcAuthoringForm: " + mcAuthoringForm);
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, mcContent.getTitle());
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, mcContent.getInstructions());
 
-		logger.debug("forwarding to : " + LOAD_QUESTIONS);
-		return mapping.findForward(LOAD_QUESTIONS);
-    }
+	/* determine whether the request is from Monitoring url Edit Activity*/
+	String sourceMcStarter = (String) request.getAttribute(McAppConstants.SOURCE_MC_STARTER);
+	McAction.logger.debug("sourceMcStarter: " + sourceMcStarter);
 
+	mcAuthoringForm.setDefineLaterInEditMode(new Boolean(true).toString());
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
+	boolean isContentInUse = McUtils.isContentInUse(mcContent);
+	McAction.logger.debug("isContentInUse:" + isContentInUse);
+
+	mcGeneralAuthoringDTO.setMonitoredContentInUse(new Boolean(false).toString());
+	if (isContentInUse == true) {
+	    McAction.logger.debug("monitoring url does not allow editActivity since the content is in use.");
+	    persistError(request, "error.content.inUse");
+	    mcGeneralAuthoringDTO.setMonitoredContentInUse(new Boolean(true).toString());
+	}
+
+	EditActivityDTO editActivityDTO = new EditActivityDTO();
+	McAction.logger.debug("isContentInUse:" + isContentInUse);
+	if (isContentInUse == true) {
+	    editActivityDTO.setMonitoredContentInUse(new Boolean(true).toString());
+	}
+	request.setAttribute(McAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
+
+	McUtils.setDefineLater(request, true, strToolContentID, mcService);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	List listQuestionContentDTO = authoringUtil.buildDefaultQuestionContent(mcContent, mcService);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("before fwding to jsp, mcAuthoringForm: " + mcAuthoringForm);
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	McAction.logger.debug("forwarding to : " + McAppConstants.LOAD_QUESTIONS);
+	return mapping.findForward(McAppConstants.LOAD_QUESTIONS);
+    }
+
     /**
      * 
-     * newEditableCaBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+     * newEditableCaBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response)
      * 
      * @param mapping
      * @param form
@@ -2739,15 +2619,15 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward  newEditableCaBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching newEditableCaBox");
-		return null;
+    public ActionForward newEditableCaBox(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching newEditableCaBox");
+	return null;
     }
-    
-    
+
     /**
-     * moveCandidateDown(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+     * moveCandidateDown(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
+     * response)
      * 
      * moves a candidate dwn in the list
      * 
@@ -2759,243 +2639,220 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward moveCandidateDown(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching moveCandidateDown");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
-		
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+    public ActionForward moveCandidateDown(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching moveCandidateDown");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		AuthoringUtil authoringUtil = new AuthoringUtil();
-		
-		boolean validateCandidateAnswersNotBlank =authoringUtil.validateCandidateAnswersNotBlank(request);
-		logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		ActionMessages errors = new ActionMessages();
-		
-        if (!validateCandidateAnswersNotBlank)
-        {
-            ActionMessage error = new ActionMessage("candidates.blank");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	 	if(!errors.isEmpty()){
-			saveErrors(request, errors);
-	        logger.debug("errors saved: " + errors);
-		}
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-		
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
 
-		
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	  
-	    
-	    
-	 	if (errors.isEmpty())
-	 	{
-		    List candidates =new LinkedList();
-		    List listCandidates =new LinkedList();
-	        String editableQuestion="";
-		    Iterator listIterator=listQuestionContentDTO.iterator();
-		    while (listIterator.hasNext())
-		    {
-		        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-		        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-		        
-		        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-		        String question=mcQuestionContentDTO.getQuestion();
-		        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-		        
-		        if ((displayOrder != null) && (!displayOrder.equals("")))
-	    		{
-		            if (displayOrder.equals(questionIndex))
-		            {
-		                logger.debug("displayOrder equals questionIndex :" + questionIndex);
-		                editableQuestion=mcQuestionContentDTO.getQuestion();
-		                
-		                candidates=mcQuestionContentDTO.getListCandidateAnswersDTO();
-		                logger.debug("candidates found :" + candidates);
-		                logger.debug("but we are using the repopulated caList here: " + caList);
-		                
-		                listCandidates=AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "down");
-		                logger.debug("swapped candidates :" + listCandidates);
-		                
-		                mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
-		                
-		                break;
-		            }
-		            
-	    		}
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+
+	boolean validateCandidateAnswersNotBlank = authoringUtil.validateCandidateAnswersNotBlank(request);
+	McAction.logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+
+	ActionMessages errors = new ActionMessages();
+
+	if (!validateCandidateAnswersNotBlank) {
+	    ActionMessage error = new ActionMessage("candidates.blank");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    McAction.logger.debug("errors saved: " + errors);
+	}
+
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	if (errors.isEmpty()) {
+	    List candidates = new LinkedList();
+	    List listCandidates = new LinkedList();
+	    String editableQuestion = "";
+	    Iterator listIterator = listQuestionContentDTO.iterator();
+	    while (listIterator.hasNext()) {
+		McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+		McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+
+		McAction.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+		String question = mcQuestionContentDTO.getQuestion();
+		String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+
+		if ((displayOrder != null) && (!displayOrder.equals(""))) {
+		    if (displayOrder.equals(questionIndex)) {
+			McAction.logger.debug("displayOrder equals questionIndex :" + questionIndex);
+			editableQuestion = mcQuestionContentDTO.getQuestion();
+
+			candidates = mcQuestionContentDTO.getListCandidateAnswersDTO();
+			McAction.logger.debug("candidates found :" + candidates);
+			McAction.logger.debug("but we are using the repopulated caList here: " + caList);
+
+			listCandidates = AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "down");
+			McAction.logger.debug("swapped candidates :" + listCandidates);
+
+			mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
+
+			break;
 		    }
-		    logger.debug("candidates found :" + candidates);
-		    logger.debug("swapped candidates is :" + listCandidates);
-	 	}
 
-	    logger.debug("listQuestionContentDTO after swapped candidates :" + listQuestionContentDTO);
+		}
+	    }
+	    McAction.logger.debug("candidates found :" + candidates);
+	    McAction.logger.debug("swapped candidates is :" + listCandidates);
+	}
 
-	    
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	McAction.logger.debug("listQuestionContentDTO after swapped candidates :" + listQuestionContentDTO);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-		logger.debug("activeModule: " + activeModule);
-  		if (activeModule.equals(AUTHORING))
-  		{
-  		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("onlineInstructions: " + onlineInstructions);
-  		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-  		
-  		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("offlineInstructions: " + offlineInstructions);
-  		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-  		    
-  		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-  		    logger.debug("attachmentList: " + attachmentList);
-  		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-  		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-  		
-  		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-  		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
 
-  			String strOnlineInstructions= request.getParameter("onlineInstructions");
-  			String strOfflineInstructions= request.getParameter("offlineInstructions");
-  			logger.debug("onlineInstructions: " + strOnlineInstructions);
-  			logger.debug("offlineInstructions: " + strOnlineInstructions);
-  			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-  			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-  		}
-	    
-	    
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-	    
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
 
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-	
-		
-		String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-		request.setAttribute("requestNewEditableQuestionBox",new Boolean(true).toString());
-		return newEditableQuestionBox(mapping, form,  request, response);
-    }
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	request.setAttribute("requestNewEditableQuestionBox", new Boolean(true).toString());
+	return newEditableQuestionBox(mapping, form, request, response);
+    }
+
     /**
      * moveCandidateUp(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
      * 
@@ -3009,242 +2866,223 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward moveCandidateUp(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching moveCandidateUp");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+    public ActionForward moveCandidateUp(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching moveCandidateUp");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		AuthoringUtil authoringUtil = new AuthoringUtil();
-		
-		boolean validateCandidateAnswersNotBlank =authoringUtil.validateCandidateAnswersNotBlank(request);
-		logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		ActionMessages errors = new ActionMessages();
-		
-        if (!validateCandidateAnswersNotBlank)
-        {
-            ActionMessage error = new ActionMessage("candidates.blank");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	 	if(!errors.isEmpty()){
-			saveErrors(request, errors);
-	        logger.debug("errors saved: " + errors);
-		}
-		
-		
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
-		
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    
-	 	if (errors.isEmpty())
-	 	{
-		    List candidates =new LinkedList();
-		    List listCandidates =new LinkedList();
-	        String editableQuestion="";
-		    Iterator listIterator=listQuestionContentDTO.iterator();
-		    while (listIterator.hasNext())
-		    {
-		        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-		        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-		        
-		        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-		        String question=mcQuestionContentDTO.getQuestion();
-		        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-		        
-		        if ((displayOrder != null) && (!displayOrder.equals("")))
-	    		{
-		            if (displayOrder.equals(questionIndex))
-		            {
-		                logger.debug("displayOrder equals questionIndex :" + questionIndex);
-		                editableQuestion=mcQuestionContentDTO.getQuestion();
-		                
-		                candidates=mcQuestionContentDTO.getListCandidateAnswersDTO();
-		                logger.debug("candidates found :" + candidates);
-		                
-		                logger.debug("using repopulated caList:" + caList);
-		                
-		                listCandidates=AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "up");
-		                logger.debug("swapped candidates :" + listCandidates);
-		                
-		                
-		                mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
-		                mcQuestionContentDTO.setCaCount(new Integer(listCandidates.size()).toString());
-		                
-		                break;
-		            }
-		            
-	    		}
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+
+	boolean validateCandidateAnswersNotBlank = authoringUtil.validateCandidateAnswersNotBlank(request);
+	McAction.logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+
+	ActionMessages errors = new ActionMessages();
+
+	if (!validateCandidateAnswersNotBlank) {
+	    ActionMessage error = new ActionMessage("candidates.blank");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    McAction.logger.debug("errors saved: " + errors);
+	}
+
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	if (errors.isEmpty()) {
+	    List candidates = new LinkedList();
+	    List listCandidates = new LinkedList();
+	    String editableQuestion = "";
+	    Iterator listIterator = listQuestionContentDTO.iterator();
+	    while (listIterator.hasNext()) {
+		McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+		McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+
+		McAction.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+		String question = mcQuestionContentDTO.getQuestion();
+		String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+
+		if ((displayOrder != null) && (!displayOrder.equals(""))) {
+		    if (displayOrder.equals(questionIndex)) {
+			McAction.logger.debug("displayOrder equals questionIndex :" + questionIndex);
+			editableQuestion = mcQuestionContentDTO.getQuestion();
+
+			candidates = mcQuestionContentDTO.getListCandidateAnswersDTO();
+			McAction.logger.debug("candidates found :" + candidates);
+
+			McAction.logger.debug("using repopulated caList:" + caList);
+
+			listCandidates = AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "up");
+			McAction.logger.debug("swapped candidates :" + listCandidates);
+
+			mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
+			mcQuestionContentDTO.setCaCount(new Integer(listCandidates.size()).toString());
+
+			break;
 		    }
 
-		    logger.debug("candidates found :" + candidates);
-		    logger.debug("swapped candidates is :" + listCandidates);
-	 	}
-	    
-	    logger.debug("listQuestionContentDTO after swapped candidates :" + listQuestionContentDTO);
+		}
+	    }
 
-	    
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	    McAction.logger.debug("candidates found :" + candidates);
+	    McAction.logger.debug("swapped candidates is :" + listCandidates);
+	}
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-		logger.debug("activeModule: " + activeModule);
-  		if (activeModule.equals(AUTHORING))
-  		{
-  		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("onlineInstructions: " + onlineInstructions);
-  		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-  		
-  		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("offlineInstructions: " + offlineInstructions);
-  		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-  		    
-  		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-  		    logger.debug("attachmentList: " + attachmentList);
-  		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-  		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-  		
-  		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-  		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+	McAction.logger.debug("listQuestionContentDTO after swapped candidates :" + listQuestionContentDTO);
 
-  			String strOnlineInstructions= request.getParameter("onlineInstructions");
-  			String strOfflineInstructions= request.getParameter("offlineInstructions");
-  			logger.debug("onlineInstructions: " + strOnlineInstructions);
-  			logger.debug("offlineInstructions: " + strOnlineInstructions);
-  			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-  			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-  		}
-	    
-		mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
 
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
 
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-		request.setAttribute("requestNewEditableQuestionBox",new Boolean(true).toString());
-		return newEditableQuestionBox(mapping, form,  request, response);
-    }
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
 
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	request.setAttribute("requestNewEditableQuestionBox", new Boolean(true).toString());
+	return newEditableQuestionBox(mapping, form, request, response);
+    }
+
     /**
      * removeCandidate(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
      * 
@@ -3258,245 +3096,226 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward removeCandidate(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching removeCandidate");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
+    public ActionForward removeCandidate(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching removeCandidate");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	    
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	
-	    AuthoringUtil authoringUtil = new AuthoringUtil();
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
-	    
-	    
-	    McQuestionContentDTO mcQuestionContentDTO= null;
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
-	        
-	        String question=mcQuestionContentDTO.getQuestion();
-	        String displayOrder=mcQuestionContentDTO.getDisplayOrder();
-	        logger.debug("displayOrder:" + displayOrder);
-	        
-	        if ((displayOrder != null) && (!displayOrder.equals("")))
-			{
-	            if (displayOrder.equals(questionIndex))
-	            {
-	                break;
-	            }
-	            
-			}
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
+
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
+
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
+
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	McQuestionContentDTO mcQuestionContentDTO = null;
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+	    McAction.logger.debug("mcQuestionContentDTO question:" + mcQuestionContentDTO.getQuestion());
+
+	    String question = mcQuestionContentDTO.getQuestion();
+	    String displayOrder = mcQuestionContentDTO.getDisplayOrder();
+	    McAction.logger.debug("displayOrder:" + displayOrder);
+
+	    if ((displayOrder != null) && (!displayOrder.equals(""))) {
+		if (displayOrder.equals(questionIndex)) {
+		    break;
+		}
+
 	    }
-	    
-	    logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
-	    logger.debug("setting caList for the content:");
-	    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-	    
-	    List candidateAnswers=mcQuestionContentDTO.getListCandidateAnswersDTO();
-	    logger.debug("candidateAnswers:" + candidateAnswers);
-	    
-	    McCandidateAnswersDTO mcCandidateAnswersDTO= null;
-	    Iterator listCaIterator=candidateAnswers.iterator();
-	    int caIndex=0;
-	    while (listCaIterator.hasNext())
-	    {
-	        caIndex ++;
-	        logger.debug("caIndex:" + caIndex);
-	        mcCandidateAnswersDTO= (McCandidateAnswersDTO)listCaIterator.next();
-	        logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
-	        logger.debug("mcCandidateAnswersDTO question:" + mcCandidateAnswersDTO.getCandidateAnswer());
-	        
-	        if (caIndex == new Integer(candidateIndex).intValue())
-	        {
-	            logger.debug("candidateIndex found");
-	            mcCandidateAnswersDTO.setCandidateAnswer("");
-	            
-	            
-	            break;
-	        }
+	}
+
+	McAction.logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
+	McAction.logger.debug("setting caList for the content:");
+	mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+
+	List candidateAnswers = mcQuestionContentDTO.getListCandidateAnswersDTO();
+	McAction.logger.debug("candidateAnswers:" + candidateAnswers);
+
+	McCandidateAnswersDTO mcCandidateAnswersDTO = null;
+	Iterator listCaIterator = candidateAnswers.iterator();
+	int caIndex = 0;
+	while (listCaIterator.hasNext()) {
+	    caIndex++;
+	    McAction.logger.debug("caIndex:" + caIndex);
+	    mcCandidateAnswersDTO = (McCandidateAnswersDTO) listCaIterator.next();
+	    McAction.logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+	    McAction.logger.debug("mcCandidateAnswersDTO question:" + mcCandidateAnswersDTO.getCandidateAnswer());
+
+	    if (caIndex == new Integer(candidateIndex).intValue()) {
+		McAction.logger.debug("candidateIndex found");
+		mcCandidateAnswersDTO.setCandidateAnswer("");
+
+		break;
 	    }
-		logger.debug("candidateAnswers after resetting answer" + candidateAnswers);
-	    
-		candidateAnswers=AuthoringUtil.reorderListCandidatesDTO(candidateAnswers);
-		logger.debug("candidateAnswers after reordering candidate nodes" + candidateAnswers);
+	}
+	McAction.logger.debug("candidateAnswers after resetting answer" + candidateAnswers);
 
-		mcQuestionContentDTO.setListCandidateAnswersDTO(candidateAnswers);
-		mcQuestionContentDTO.setCaCount(new Integer(candidateAnswers.size()).toString());
-		
-		logger.debug("listQuestionContentDTO after remove: " + listQuestionContentDTO);
-	    
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
-		
-		if (mcContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			mcContent=mcService.retrieveMc(new Long(defaultContentIdStr));
-		}
-		logger.debug("final mcContent: " + mcContent);
-	
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-	    logger.debug("activeModule: " + activeModule);
-		if (activeModule.equals(AUTHORING))
-		{
-	        String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-	        logger.debug("onlineInstructions: " + onlineInstructions);
-		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	candidateAnswers = AuthoringUtil.reorderListCandidatesDTO(candidateAnswers);
+	McAction.logger.debug("candidateAnswers after reordering candidate nodes" + candidateAnswers);
 
-	        String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-	        logger.debug("offlineInstructions: " + offlineInstructions);
-		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-		    
-		    
-	        List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-		    logger.debug("attachmentList: " + attachmentList);
-		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	mcQuestionContentDTO.setListCandidateAnswersDTO(candidateAnswers);
+	mcQuestionContentDTO.setCaCount(new Integer(candidateAnswers.size()).toString());
 
-		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-		    
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOnlineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-		}
-	    
-		mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("mcQuestionContentDTO now: " + mcQuestionContentDTO);
-	    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-	    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-	
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	McAction.logger.debug("listQuestionContentDTO after remove: " + listQuestionContentDTO);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
 
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-        
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
 
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		
-		String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
 
-		request.setAttribute("requestNewEditableQuestionBox",new Boolean(true).toString());
-		return newEditableQuestionBox(mapping, form,  request, response);
-    }
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
+
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	if (mcContent == null) {
+	    McAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
+	    mcContent = mcService.retrieveMc(new Long(defaultContentIdStr));
+	}
+	McAction.logger.debug("final mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("mcQuestionContentDTO now: " + mcQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	request.setAttribute("requestNewEditableQuestionBox", new Boolean(true).toString());
+	return newEditableQuestionBox(mapping, form, request, response);
+    }
+
     /**
      * newCandidateBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
      * 
@@ -3510,1290 +3329,1165 @@
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward newCandidateBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching newCandidateBox");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-	    
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
+    public ActionForward newCandidateBox(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching newCandidateBox");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	    
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-		AuthoringUtil authoringUtil = new AuthoringUtil();
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, true);
-	    logger.debug("repopulated caList: " + caList);
-	    
-	    int caCount=caList.size();
-	    logger.debug("caCount: " + caCount);
-	    
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    
-	    String mark=request.getParameter("mark");
-	    logger.debug("mark: " + mark);
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
 
-	    String passmark=request.getParameter("passmark");
-	    logger.debug("passmark: " + passmark);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    
-	    int currentQuestionCount= listQuestionContentDTO.size();
-	    logger.debug("currentQuestionCount: " + currentQuestionCount);
-	    
-	    
-	    String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
-		
-		
-	    McQuestionContentDTO mcQuestionContentDTOLocal= null;
-	    Iterator listIterator=listQuestionContentDTO.iterator();
-	    while (listIterator.hasNext())
-	    {
-	        mcQuestionContentDTOLocal= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTOLocal:" + mcQuestionContentDTOLocal);
-	        logger.debug("mcQuestionContentDTOLocal question:" + mcQuestionContentDTOLocal.getQuestion());
-	        
-	        String question=mcQuestionContentDTOLocal.getQuestion();
-	        String displayOrder=mcQuestionContentDTOLocal.getDisplayOrder();
-	        logger.debug("displayOrder:" + displayOrder);
-	        
-	        if ((displayOrder != null) && (!displayOrder.equals("")))
-			{
-	            if (displayOrder.equals(questionIndex))
-	            {
-	                break;
-	            }
-	            
-			}
-	    }
-	    
-	    logger.debug("mcQuestionContentDTOLocal found:" + mcQuestionContentDTOLocal);
-	    
-	    if (mcQuestionContentDTOLocal != null)
-	    {
-		    mcQuestionContentDTOLocal.setListCandidateAnswersDTO(caList);
-		    mcQuestionContentDTOLocal.setCaCount(new Integer(caList.size()).toString());
-	    }
-			
-		
-		logger.debug("listQuestionContentDTO after repopulating data: " + listQuestionContentDTO);
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-	    logger.debug("activeModule: " + activeModule);
-		if (activeModule.equals(AUTHORING))
-		{
-	        String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-	        logger.debug("onlineInstructions: " + onlineInstructions);
-		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-	        String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-	        logger.debug("offlineInstructions: " + offlineInstructions);
-		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-		    
-		    
-	        List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-		    logger.debug("attachmentList: " + attachmentList);
-		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, true);
+	McAction.logger.debug("repopulated caList: " + caList);
 
-		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-		    
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOnlineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	int caCount = caList.size();
+	McAction.logger.debug("caCount: " + caCount);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+
+	String passmark = request.getParameter("passmark");
+	McAction.logger.debug("passmark: " + passmark);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+
+	int currentQuestionCount = listQuestionContentDTO.size();
+	McAction.logger.debug("currentQuestionCount: " + currentQuestionCount);
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	McQuestionContentDTO mcQuestionContentDTOLocal = null;
+	Iterator listIterator = listQuestionContentDTO.iterator();
+	while (listIterator.hasNext()) {
+	    mcQuestionContentDTOLocal = (McQuestionContentDTO) listIterator.next();
+	    McAction.logger.debug("mcQuestionContentDTOLocal:" + mcQuestionContentDTOLocal);
+	    McAction.logger.debug("mcQuestionContentDTOLocal question:" + mcQuestionContentDTOLocal.getQuestion());
+
+	    String question = mcQuestionContentDTOLocal.getQuestion();
+	    String displayOrder = mcQuestionContentDTOLocal.getDisplayOrder();
+	    McAction.logger.debug("displayOrder:" + displayOrder);
+
+	    if ((displayOrder != null) && (!displayOrder.equals(""))) {
+		if (displayOrder.equals(questionIndex)) {
+		    break;
 		}
-	    
-		
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("mcQuestionContentDTOLocal now: " + mcQuestionContentDTOLocal);
-	    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-	    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-	
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+	    }
+	}
 
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	McAction.logger.debug("mcQuestionContentDTOLocal found:" + mcQuestionContentDTOLocal);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+	if (mcQuestionContentDTOLocal != null) {
+	    mcQuestionContentDTOLocal.setListCandidateAnswersDTO(caList);
+	    mcQuestionContentDTOLocal.setCaCount(new Integer(caList.size()).toString());
+	}
 
+	McAction.logger.debug("listQuestionContentDTO after repopulating data: " + listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
 
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
 
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
-		
-		request.setAttribute("requestNewEditableQuestionBox",new Boolean(true).toString());
-		return newEditableQuestionBox(mapping, form,  request, response);
-    }
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
 
-    
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-    public ActionForward updateMarksList(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching updateMarksList");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		String questionIndex=request.getParameter("questionIndex");
-		logger.debug("questionIndex: " + questionIndex);
-		mcAuthoringForm.setQuestionIndex(questionIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	    
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-		logger.debug("activeModule: " + activeModule);
-  		if (activeModule.equals(AUTHORING))
-  		{
-  		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("onlineInstructions: " + onlineInstructions);
-  		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-  		
-  		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("offlineInstructions: " + offlineInstructions);
-  		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-  		    
-  		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-  		    logger.debug("attachmentList: " + attachmentList);
-  		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-  		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-  		
-  		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-  		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
-  			String strOnlineInstructions= request.getParameter("onlineInstructions");
-  			String strOfflineInstructions= request.getParameter("offlineInstructions");
-  			logger.debug("onlineInstructions: " + strOnlineInstructions);
-  			logger.debug("offlineInstructions: " + strOnlineInstructions);
-  			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-  			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-  		}
-	    
-		AuthoringUtil authoringUtil= new AuthoringUtil();
-	    
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("2");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
 
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		
-		logger.debug("fwd ing to LOAD_QUESTIONS: " + LOAD_QUESTIONS);
-	    return (mapping.findForward(LOAD_QUESTIONS));
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("mcQuestionContentDTOLocal now: " + mcQuestionContentDTOLocal);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	request.setAttribute("requestNewEditableQuestionBox", new Boolean(true).toString());
+	return newEditableQuestionBox(mapping, form, request, response);
     }
 
-    
-    
-    public ActionForward moveAddedCandidateUp(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching moveAddedCandidateUp");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+    public ActionForward updateMarksList(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching updateMarksList");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		AuthoringUtil authoringUtil = new AuthoringUtil();
-		
-		boolean validateCandidateAnswersNotBlank =authoringUtil.validateCandidateAnswersNotBlank(request);
-		logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-		ActionMessages errors = new ActionMessages();
-		
-        if (!validateCandidateAnswersNotBlank)
-        {
-            ActionMessage error = new ActionMessage("candidates.blank");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	 	if(!errors.isEmpty()){
-			saveErrors(request, errors);
-	        logger.debug("errors saved: " + errors);
-		}
-		
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
+	String questionIndex = request.getParameter("questionIndex");
+	McAction.logger.debug("questionIndex: " + questionIndex);
+	mcAuthoringForm.setQuestionIndex(questionIndex);
 
-		
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-	    
-		List listAddableQuestionContentDTO = (List)sessionMap.get(NEW_ADDABLE_QUESTION_CONTENT_KEY);
-		logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
-		
-		
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
 
-	 	if (errors.isEmpty())
-	 	{
-		    List candidates =new LinkedList();
-		    List listCandidates =new LinkedList();
-		    
-		    Iterator listIterator=listAddableQuestionContentDTO.iterator();
-		    /*there is only 1 question dto*/
-		    while (listIterator.hasNext())
-		    {
-		        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-		        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-		        
-	            candidates=mcQuestionContentDTO.getListCandidateAnswersDTO();
-	            logger.debug("candidates found :" + candidates);
-	            logger.debug("but we are using the repopulated caList here: " + caList);
-	            
-	            listCandidates=AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "up");
-	            logger.debug("swapped candidates :" + listCandidates);
-	            
-	            mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
-		    }
-	 	}
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
 
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	    logger.debug("listAddableQuestionContentDTO after swapping (up) candidates: " + listAddableQuestionContentDTO);
-		request.setAttribute(NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
-		sessionMap.put(NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-	    
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-		logger.debug("activeModule: " + activeModule);
-  		if (activeModule.equals(AUTHORING))
-  		{
-  		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("onlineInstructions: " + onlineInstructions);
-  		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-  		
-  		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("offlineInstructions: " + offlineInstructions);
-  		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-  		    
-  		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-  		    logger.debug("attachmentList: " + attachmentList);
-  		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-  		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-  		
-  		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-  		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
 
-  			String strOnlineInstructions= request.getParameter("onlineInstructions");
-  			String strOfflineInstructions= request.getParameter("offlineInstructions");
-  			logger.debug("onlineInstructions: " + strOnlineInstructions);
-  			logger.debug("offlineInstructions: " + strOnlineInstructions);
-  			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-  			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-  		}
-	    
-		mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
 
-        
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
 
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
 
-		return newQuestionBox(mapping, form,  request, response);
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-    }
-    
-    
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
 
-    public ActionForward moveAddedCandidateDown(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching moveAddedCandidateDown");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
-		
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
 
-		AuthoringUtil authoringUtil = new AuthoringUtil();
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
 
-		boolean validateCandidateAnswersNotBlank =authoringUtil.validateCandidateAnswersNotBlank(request);
-		logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
 
-		ActionMessages errors = new ActionMessages();
-		
-        if (!validateCandidateAnswersNotBlank)
-        {
-            ActionMessage error = new ActionMessage("candidates.blank");
-			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-        }
-        
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
 
-	 	if(!errors.isEmpty()){
-			saveErrors(request, errors);
-	        logger.debug("errors saved: " + errors);
-		}
+	AuthoringUtil authoringUtil = new AuthoringUtil();
 
-		
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
 
-		
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
+	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-		List listAddableQuestionContentDTO = (List)sessionMap.get(NEW_ADDABLE_QUESTION_CONTENT_KEY);
-		logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
 
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("2");
 
-		if (errors.isEmpty())
-		{
-		    List candidates =new LinkedList();
-		    List listCandidates =new LinkedList();
-		    
-		    Iterator listIterator=listAddableQuestionContentDTO.iterator();
-		    /*there is only 1 question dto*/
-		    while (listIterator.hasNext())
-		    {
-		        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-		        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-		        
-	            candidates=mcQuestionContentDTO.getListCandidateAnswersDTO();
-	            logger.debug("candidates found :" + candidates);
-	            logger.debug("but we are using the repopulated caList here: " + caList);
-	            
-	            listCandidates=AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "down");
-	            logger.debug("swapped candidates :" + listCandidates);
-	            
-	            mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
-		    }
-		}
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
 
-	    logger.debug("listAddableQuestionContentDTO after moving down candidates: ");
-		request.setAttribute(NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
-		sessionMap.put(NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
-	    
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-		logger.debug("activeModule: " + activeModule);
-  		if (activeModule.equals(AUTHORING))
-  		{
-  		    String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("onlineInstructions: " + onlineInstructions);
-  		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
-  		
-  		    String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-  		    logger.debug("offlineInstructions: " + offlineInstructions);
-  		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-  		    
-  		    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-  		    logger.debug("attachmentList: " + attachmentList);
-  		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-  		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
-  		
-  		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-  		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
 
-  			String strOnlineInstructions= request.getParameter("onlineInstructions");
-  			String strOfflineInstructions= request.getParameter("offlineInstructions");
-  			logger.debug("onlineInstructions: " + strOnlineInstructions);
-  			logger.debug("offlineInstructions: " + strOnlineInstructions);
-  			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-  			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-  		}
-	    
-	    
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-		mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
 
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
-	    
-	    
-	    
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
-	    
-	    
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-	
-		
-		String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
 
-		return newQuestionBox(mapping, form,  request, response);
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("fwd ing to LOAD_QUESTIONS: " + McAppConstants.LOAD_QUESTIONS);
+	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
     }
 
-    
-    
-    public ActionForward removeAddedCandidate(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching removeAddedCandidate");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-		
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
+    public ActionForward moveAddedCandidateUp(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching moveAddedCandidateUp");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
-		
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	    AuthoringUtil authoringUtil = new AuthoringUtil();
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, false);
-	    logger.debug("repopulated caList: " + caList);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	    
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    
-		List listAddableQuestionContentDTO = (List)sessionMap.get(NEW_ADDABLE_QUESTION_CONTENT_KEY);
-		logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
 
-	    
-	    List candidates =new LinkedList();
-	    List listCandidates =new LinkedList();
-	    
-	    Iterator listIterator=listAddableQuestionContentDTO.iterator();
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+
+	boolean validateCandidateAnswersNotBlank = authoringUtil.validateCandidateAnswersNotBlank(request);
+	McAction.logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
+
+	ActionMessages errors = new ActionMessages();
+
+	if (!validateCandidateAnswersNotBlank) {
+	    ActionMessage error = new ActionMessage("candidates.blank");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    McAction.logger.debug("errors saved: " + errors);
+	}
+
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	List listAddableQuestionContentDTO = (List) sessionMap.get(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY);
+	McAction.logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+
+	if (errors.isEmpty()) {
+	    List candidates = new LinkedList();
+	    List listCandidates = new LinkedList();
+
+	    Iterator listIterator = listAddableQuestionContentDTO.iterator();
 	    /*there is only 1 question dto*/
-	    while (listIterator.hasNext())
-	    {
-	        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        
-            candidates=mcQuestionContentDTO.getListCandidateAnswersDTO();
-            logger.debug("candidates found :" + candidates);
-            
-    	    logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
-    	    logger.debug("setting caList for the content:");
-    	    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-    	    
-    	    List candidateAnswers=mcQuestionContentDTO.getListCandidateAnswersDTO();
-    	    logger.debug("candidateAnswers:" + candidateAnswers);
-    	    
-    	    McCandidateAnswersDTO mcCandidateAnswersDTO= null;
-    	    Iterator listCaIterator=candidateAnswers.iterator();
-    	    int caIndex=0;
-    	    while (listCaIterator.hasNext())
-    	    {
-    	        caIndex ++;
-    	        logger.debug("caIndex:" + caIndex);
-    	        mcCandidateAnswersDTO= (McCandidateAnswersDTO)listCaIterator.next();
-    	        logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
-    	        logger.debug("mcCandidateAnswersDTO question:" + mcCandidateAnswersDTO.getCandidateAnswer());
-    	        
-    	        if (caIndex == new Integer(candidateIndex).intValue())
-    	        {
-    	            logger.debug("candidateIndex found");
-    	            mcCandidateAnswersDTO.setCandidateAnswer("");
-    	            
-    	            
-    	            break;
-    	        }
-    	    }
-    		logger.debug("candidateAnswers after resetting answer" + candidateAnswers);
-    	    
-    		candidateAnswers=AuthoringUtil.reorderListCandidatesDTO(candidateAnswers);
-    		logger.debug("candidateAnswers after reordering candidate nodes" + candidateAnswers);
+	    while (listIterator.hasNext()) {
+		McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+		McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
 
-    		mcQuestionContentDTO.setListCandidateAnswersDTO(candidateAnswers);
-    		mcQuestionContentDTO.setCaCount(new Integer(candidateAnswers.size()).toString());
-    		
-    		logger.debug("listQuestionContentDTO after remove: " + listQuestionContentDTO);
+		candidates = mcQuestionContentDTO.getListCandidateAnswersDTO();
+		McAction.logger.debug("candidates found :" + candidates);
+		McAction.logger.debug("but we are using the repopulated caList here: " + caList);
+
+		listCandidates = AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "up");
+		McAction.logger.debug("swapped candidates :" + listCandidates);
+
+		mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
 	    }
+	}
 
-	    
-	    logger.debug("listAddableQuestionContentDTO : " + listAddableQuestionContentDTO);
-		request.setAttribute(NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
-		sessionMap.put(NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
+	McAction.logger.debug("listAddableQuestionContentDTO after swapping (up) candidates: "
+		+ listAddableQuestionContentDTO);
+	request.setAttribute(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
+	sessionMap.put(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
 
-		
-	    
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
-		logger.debug("mcContent: " + mcContent);
-		
-		if (mcContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			mcContent=mcService.retrieveMc(new Long(defaultContentIdStr));
-		}
-		logger.debug("final mcContent: " + mcContent);
-	
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-	    logger.debug("activeModule: " + activeModule);
-		if (activeModule.equals(AUTHORING))
-		{
-	        String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-	        logger.debug("onlineInstructions: " + onlineInstructions);
-		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-	        String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-	        logger.debug("offlineInstructions: " + offlineInstructions);
-		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-		    
-		    
-	        List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-		    logger.debug("attachmentList: " + attachmentList);
-		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
 
-		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-		    
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOnlineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
-		}
-	    
-		mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-	    logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-	    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-	
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-	    
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
 
-        
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
-	    
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-		String mark=request.getParameter("mark");
-		logger.debug("mark: " + mark);
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
 
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		
-		String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
 
-		return newQuestionBox(mapping, form,  request, response);
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
 
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	return newQuestionBox(mapping, form, request, response);
+
     }
 
+    public ActionForward moveAddedCandidateDown(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching moveAddedCandidateDown");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
-    public ActionForward newAddedCandidateBox(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-    throws IOException, ServletException {
-		logger.debug("dispatching newAddedCandidateBox");
-		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-	    
-		IMcService mcService =McServiceProxy.getMcService(getServlet().getServletContext());
-		logger.debug("mcService: " + mcService);
-	
-		String httpSessionID=mcAuthoringForm.getHttpSessionID();
-		logger.debug("httpSessionID: " + httpSessionID);
-		
-		SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID);
-		logger.debug("sessionMap: " + sessionMap);
-		
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
 
-		String candidateIndex=request.getParameter("candidateIndex");
-		logger.debug("candidateIndex: " + candidateIndex);
-		mcAuthoringForm.setCandidateIndex(candidateIndex);
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
 
-	    String totalMarks=request.getParameter("totalMarks");
-		logger.debug("totalMarks: " + totalMarks);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
 
-	    
-	    List listQuestionContentDTO=(List)sessionMap.get(LIST_QUESTION_CONTENT_DTO_KEY);
-	    logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
-	
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
 
-		AuthoringUtil authoringUtil = new AuthoringUtil();
-	    List caList=authoringUtil.repopulateCandidateAnswersBox(request, true);
-	    logger.debug("repopulated caList: " + caList);
-	    
-	    int caCount=caList.size();
-	    logger.debug("caCount: " + caCount);
-	    
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
 
-	    String newQuestion=request.getParameter("newQuestion");
-	    logger.debug("newQuestion: " + newQuestion);
-	    
-	    String mark=request.getParameter("mark");
-	    logger.debug("mark: " + mark);
+	AuthoringUtil authoringUtil = new AuthoringUtil();
 
-	    String passmark=request.getParameter("passmark");
-	    logger.debug("passmark: " + passmark);
+	boolean validateCandidateAnswersNotBlank = authoringUtil.validateCandidateAnswersNotBlank(request);
+	McAction.logger.debug("validateCandidateAnswersNotBlank: " + validateCandidateAnswersNotBlank);
 
-	    
-	    String feedback=request.getParameter("feedback");
-	    logger.debug("feedback: " + feedback);
-	    
-	    int currentQuestionCount= listQuestionContentDTO.size();
-	    logger.debug("currentQuestionCount: " + currentQuestionCount);
-	    
-	    
-	    String editQuestionBoxRequest=request.getParameter("editQuestionBoxRequest");
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
-		
-		
-		
-		List listAddableQuestionContentDTO = (List)sessionMap.get(NEW_ADDABLE_QUESTION_CONTENT_KEY);
-		logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+	ActionMessages errors = new ActionMessages();
 
-	    
-	    List candidates =new LinkedList();
-	    List listCandidates =new LinkedList();
-	    
-	    Iterator listIterator=listAddableQuestionContentDTO.iterator();
+	if (!validateCandidateAnswersNotBlank) {
+	    ActionMessage error = new ActionMessage("candidates.blank");
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	}
+
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    McAction.logger.debug("errors saved: " + errors);
+	}
+
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	List listAddableQuestionContentDTO = (List) sessionMap.get(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY);
+	McAction.logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+
+	if (errors.isEmpty()) {
+	    List candidates = new LinkedList();
+	    List listCandidates = new LinkedList();
+
+	    Iterator listIterator = listAddableQuestionContentDTO.iterator();
 	    /*there is only 1 question dto*/
-	    while (listIterator.hasNext())
-	    {
-	        McQuestionContentDTO mcQuestionContentDTO= (McQuestionContentDTO)listIterator.next();
-	        logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
-	        
-	        logger.debug("caList:" + caList);
-	        logger.debug("caList size:" + caList.size());
-	        mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
-	        mcQuestionContentDTO.setCaCount(new Integer(caList.size()).toString());
+	    while (listIterator.hasNext()) {
+		McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+		McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+
+		candidates = mcQuestionContentDTO.getListCandidateAnswersDTO();
+		McAction.logger.debug("candidates found :" + candidates);
+		McAction.logger.debug("but we are using the repopulated caList here: " + caList);
+
+		listCandidates = AuthoringUtil.swapCandidateNodes(caList, candidateIndex, "down");
+		McAction.logger.debug("swapped candidates :" + listCandidates);
+
+		mcQuestionContentDTO.setListCandidateAnswersDTO(listCandidates);
 	    }
-	    
+	}
 
-	    logger.debug("listAddableQuestionContentDTO after swapping (up) candidates: ");
-		request.setAttribute(NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
-		sessionMap.put(NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
-		
-		
-		
-		logger.debug("listQuestionContentDTO after repopulating data: " + listQuestionContentDTO);
-	    sessionMap.put(LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
-	    
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		logger.debug("contentFolderID: " + contentFolderID);
-		mcAuthoringForm.setContentFolderID(contentFolderID);
-	
-		
-		String activeModule=request.getParameter(ACTIVE_MODULE);
-		logger.debug("activeModule: " + activeModule);
-	
-		String richTextTitle = request.getParameter(TITLE);
-		logger.debug("richTextTitle: " + richTextTitle);
-	    
-		String richTextInstructions = request.getParameter(INSTRUCTIONS);
-	    logger.debug("richTextInstructions: " + richTextInstructions);
-	    
-		
-	    sessionMap.put(ACTIVITY_TITLE_KEY, richTextTitle);
-	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
-	
-	
-		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-		logger.debug("strToolContentID: " + strToolContentID);
-		
-		String defaultContentIdStr=new Long(mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE)).toString();;
-		logger.debug("defaultContentIdStr: " + defaultContentIdStr);
-		
-		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
-		logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
-		
-	    mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
-	    mcAuthoringForm.setTitle(richTextTitle);
-	    
-		mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
-	
-	    logger.debug("activeModule: " + activeModule);
-		if (activeModule.equals(AUTHORING))
-		{
-	        String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-	        logger.debug("onlineInstructions: " + onlineInstructions);
-		    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	McAction.logger.debug("listAddableQuestionContentDTO after moving down candidates: ");
+	request.setAttribute(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
+	sessionMap.put(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
 
-	        String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-	        logger.debug("offlineInstructions: " + offlineInstructions);
-		    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-		    
-		    
-	        List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
-		    logger.debug("attachmentList: " + attachmentList);
-		    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
-		    logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
-		    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
-		    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
-		    
-			String strOnlineInstructions= request.getParameter("onlineInstructions");
-			String strOfflineInstructions= request.getParameter("offlineInstructions");
-			logger.debug("onlineInstructions: " + strOnlineInstructions);
-			logger.debug("offlineInstructions: " + strOnlineInstructions);
-			mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
-			mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
+
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
+
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	return newQuestionBox(mapping, form, request, response);
+    }
+
+    public ActionForward removeAddedCandidate(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching removeAddedCandidate");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
+
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
+
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
+
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
+
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
+
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, false);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	List listAddableQuestionContentDTO = (List) sessionMap.get(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY);
+	McAction.logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+
+	List candidates = new LinkedList();
+	List listCandidates = new LinkedList();
+
+	Iterator listIterator = listAddableQuestionContentDTO.iterator();
+	/*there is only 1 question dto*/
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+
+	    candidates = mcQuestionContentDTO.getListCandidateAnswersDTO();
+	    McAction.logger.debug("candidates found :" + candidates);
+
+	    McAction.logger.debug("mcQuestionContentDTO found:" + mcQuestionContentDTO);
+	    McAction.logger.debug("setting caList for the content:");
+	    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+
+	    List candidateAnswers = mcQuestionContentDTO.getListCandidateAnswersDTO();
+	    McAction.logger.debug("candidateAnswers:" + candidateAnswers);
+
+	    McCandidateAnswersDTO mcCandidateAnswersDTO = null;
+	    Iterator listCaIterator = candidateAnswers.iterator();
+	    int caIndex = 0;
+	    while (listCaIterator.hasNext()) {
+		caIndex++;
+		McAction.logger.debug("caIndex:" + caIndex);
+		mcCandidateAnswersDTO = (McCandidateAnswersDTO) listCaIterator.next();
+		McAction.logger.debug("mcCandidateAnswersDTO:" + mcCandidateAnswersDTO);
+		McAction.logger.debug("mcCandidateAnswersDTO question:" + mcCandidateAnswersDTO.getCandidateAnswer());
+
+		if (caIndex == new Integer(candidateIndex).intValue()) {
+		    McAction.logger.debug("candidateIndex found");
+		    mcCandidateAnswersDTO.setCandidateAnswer("");
+
+		    break;
 		}
-	    
-		
-	    mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
-	    
-	    request.getSession().setAttribute(httpSessionID, sessionMap);
-	
-		McUtils.setFormProperties(request, mcService,  
-	             mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
-	
-		
-		mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
-		mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
-		mcGeneralAuthoringDTO.setActiveModule(activeModule);
-		mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setToolContentID(strToolContentID);
-		mcAuthoringForm.setHttpSessionID(httpSessionID);
-		mcAuthoringForm.setActiveModule(activeModule);
-		mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
-		mcAuthoringForm.setCurrentTab("1");
-	
-	    request.setAttribute(LIST_QUESTION_CONTENT_DTO,listQuestionContentDTO);
-		logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
-	
-	    mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-	
-	    Map marksMap=authoringUtil.buildMarksMap();
-	    logger.debug("marksMap: " + marksMap);
-	    mcGeneralAuthoringDTO.setMarksMap(marksMap);
+	    }
+	    McAction.logger.debug("candidateAnswers after resetting answer" + candidateAnswers);
 
-	    logger.debug("generating dyn pass map using listQuestionContentDTO: " +listQuestionContentDTO);
-	    Map passMarksMap=authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
-	    logger.debug("passMarksMap: " + passMarksMap);
-	    mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
-	    
-        String totalMark=AuthoringUtil.getTotalMark(listQuestionContentDTO);
-        logger.debug("totalMark: " + totalMark);
-        mcAuthoringForm.setTotalMarks(totalMark);
-        mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+	    candidateAnswers = AuthoringUtil.reorderListCandidatesDTO(candidateAnswers);
+	    McAction.logger.debug("candidateAnswers after reordering candidate nodes" + candidateAnswers);
 
-	    
-	    Map correctMap=authoringUtil.buildCorrectMap();
-	    logger.debug("correctMap: " + correctMap);
-	    mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+	    mcQuestionContentDTO.setListCandidateAnswersDTO(candidateAnswers);
+	    mcQuestionContentDTO.setCaCount(new Integer(candidateAnswers.size()).toString());
 
-	    mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
-	    
-	    mcAuthoringForm.setFeedback(feedback);
-	    
-	    mcGeneralAuthoringDTO.setMarkValue(mark);
+	    McAction.logger.debug("listQuestionContentDTO after remove: " + listQuestionContentDTO);
+	}
 
-	    
-		logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
-		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
-	
-		request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-		
-		logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+	McAction.logger.debug("listAddableQuestionContentDTO : " + listAddableQuestionContentDTO);
+	request.setAttribute(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
+	sessionMap.put(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
 
-		return newQuestionBox(mapping, form,  request, response);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
 
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
+
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
+
+	McContent mcContent = mcService.retrieveMc(new Long(strToolContentID));
+	McAction.logger.debug("mcContent: " + mcContent);
+
+	if (mcContent == null) {
+	    McAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
+	    mcContent = mcService.retrieveMc(new Long(defaultContentIdStr));
+	}
+	McAction.logger.debug("final mcContent: " + mcContent);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+	mcAuthoringForm.setFeedback(feedback);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	return newQuestionBox(mapping, form, request, response);
+
     }
-    
-    
-    
+
+    public ActionForward newAddedCandidateBox(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	McAction.logger.debug("dispatching newAddedCandidateBox");
+	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
+
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	McAction.logger.debug("mcService: " + mcService);
+
+	String httpSessionID = mcAuthoringForm.getHttpSessionID();
+	McAction.logger.debug("httpSessionID: " + httpSessionID);
+
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+	McAction.logger.debug("sessionMap: " + sessionMap);
+
+	String candidateIndex = request.getParameter("candidateIndex");
+	McAction.logger.debug("candidateIndex: " + candidateIndex);
+	mcAuthoringForm.setCandidateIndex(candidateIndex);
+
+	String totalMarks = request.getParameter("totalMarks");
+	McAction.logger.debug("totalMarks: " + totalMarks);
+
+	List listQuestionContentDTO = (List) sessionMap.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+	McAction.logger.debug("listQuestionContentDTO: " + listQuestionContentDTO);
+
+	AuthoringUtil authoringUtil = new AuthoringUtil();
+	List caList = authoringUtil.repopulateCandidateAnswersBox(request, true);
+	McAction.logger.debug("repopulated caList: " + caList);
+
+	int caCount = caList.size();
+	McAction.logger.debug("caCount: " + caCount);
+
+	String newQuestion = request.getParameter("newQuestion");
+	McAction.logger.debug("newQuestion: " + newQuestion);
+
+	String mark = request.getParameter("mark");
+	McAction.logger.debug("mark: " + mark);
+
+	String passmark = request.getParameter("passmark");
+	McAction.logger.debug("passmark: " + passmark);
+
+	String feedback = request.getParameter("feedback");
+	McAction.logger.debug("feedback: " + feedback);
+
+	int currentQuestionCount = listQuestionContentDTO.size();
+	McAction.logger.debug("currentQuestionCount: " + currentQuestionCount);
+
+	String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	List listAddableQuestionContentDTO = (List) sessionMap.get(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY);
+	McAction.logger.debug("listAddableQuestionContentDTO: " + listAddableQuestionContentDTO);
+
+	List candidates = new LinkedList();
+	List listCandidates = new LinkedList();
+
+	Iterator listIterator = listAddableQuestionContentDTO.iterator();
+	/*there is only 1 question dto*/
+	while (listIterator.hasNext()) {
+	    McQuestionContentDTO mcQuestionContentDTO = (McQuestionContentDTO) listIterator.next();
+	    McAction.logger.debug("mcQuestionContentDTO:" + mcQuestionContentDTO);
+
+	    McAction.logger.debug("caList:" + caList);
+	    McAction.logger.debug("caList size:" + caList.size());
+	    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
+	    mcQuestionContentDTO.setCaCount(new Integer(caList.size()).toString());
+	}
+
+	McAction.logger.debug("listAddableQuestionContentDTO after swapping (up) candidates: ");
+	request.setAttribute(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_LIST, listAddableQuestionContentDTO);
+	sessionMap.put(McAppConstants.NEW_ADDABLE_QUESTION_CONTENT_KEY, listAddableQuestionContentDTO);
+
+	McAction.logger.debug("listQuestionContentDTO after repopulating data: " + listQuestionContentDTO);
+	sessionMap.put(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
+
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	McAction.logger.debug("contentFolderID: " + contentFolderID);
+	mcAuthoringForm.setContentFolderID(contentFolderID);
+
+	String activeModule = request.getParameter(McAppConstants.ACTIVE_MODULE);
+	McAction.logger.debug("activeModule: " + activeModule);
+
+	String richTextTitle = request.getParameter(McAppConstants.TITLE);
+	McAction.logger.debug("richTextTitle: " + richTextTitle);
+
+	String richTextInstructions = request.getParameter(McAppConstants.INSTRUCTIONS);
+	McAction.logger.debug("richTextInstructions: " + richTextInstructions);
+
+	sessionMap.put(McAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
+	sessionMap.put(McAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
+
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McAction.logger.debug("strToolContentID: " + strToolContentID);
+
+	String defaultContentIdStr = new Long(mcService.getToolDefaultContentIdBySignature(McAppConstants.MY_SIGNATURE))
+		.toString();
+	;
+	McAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
+
+	McGeneralAuthoringDTO mcGeneralAuthoringDTO = new McGeneralAuthoringDTO();
+	McAction.logger.debug("mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setContentFolderID(contentFolderID);
+
+	mcGeneralAuthoringDTO.setActivityTitle(richTextTitle);
+	mcAuthoringForm.setTitle(richTextTitle);
+
+	mcGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
+
+	McAction.logger.debug("activeModule: " + activeModule);
+	if (activeModule.equals(McAppConstants.AUTHORING)) {
+	    String onlineInstructions = (String) sessionMap.get(McAppConstants.ONLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("onlineInstructions: " + onlineInstructions);
+	    mcGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+
+	    String offlineInstructions = (String) sessionMap.get(McAppConstants.OFFLINE_INSTRUCTIONS_KEY);
+	    McAction.logger.debug("offlineInstructions: " + offlineInstructions);
+	    mcGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+	    List attachmentList = (List) sessionMap.get(McAppConstants.ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("attachmentList: " + attachmentList);
+	    List deletedAttachmentList = (List) sessionMap.get(McAppConstants.DELETED_ATTACHMENT_LIST_KEY);
+	    McAction.logger.debug("deletedAttachmentList: " + deletedAttachmentList);
+
+	    mcGeneralAuthoringDTO.setAttachmentList(attachmentList);
+	    mcGeneralAuthoringDTO.setDeletedAttachmentList(deletedAttachmentList);
+
+	    String strOnlineInstructions = request.getParameter("onlineInstructions");
+	    String strOfflineInstructions = request.getParameter("offlineInstructions");
+	    McAction.logger.debug("onlineInstructions: " + strOnlineInstructions);
+	    McAction.logger.debug("offlineInstructions: " + strOnlineInstructions);
+	    mcAuthoringForm.setOnlineInstructions(strOnlineInstructions);
+	    mcAuthoringForm.setOfflineInstructions(strOfflineInstructions);
+	}
+
+	mcGeneralAuthoringDTO.setEditActivityEditMode(new Boolean(true).toString());
+
+	request.getSession().setAttribute(httpSessionID, sessionMap);
+
+	McUtils.setFormProperties(request, mcService, mcAuthoringForm, mcGeneralAuthoringDTO, strToolContentID,
+		defaultContentIdStr, activeModule, sessionMap, httpSessionID);
+
+	mcGeneralAuthoringDTO.setToolContentID(strToolContentID);
+	mcGeneralAuthoringDTO.setHttpSessionID(httpSessionID);
+	mcGeneralAuthoringDTO.setActiveModule(activeModule);
+	mcGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setToolContentID(strToolContentID);
+	mcAuthoringForm.setHttpSessionID(httpSessionID);
+	mcAuthoringForm.setActiveModule(activeModule);
+	mcAuthoringForm.setDefaultContentIdStr(defaultContentIdStr);
+	mcAuthoringForm.setCurrentTab("1");
+
+	request.setAttribute(McAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	McAction.logger.debug("listQuestionContentDTO now: " + listQuestionContentDTO);
+
+	mcGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+	Map marksMap = authoringUtil.buildMarksMap();
+	McAction.logger.debug("marksMap: " + marksMap);
+	mcGeneralAuthoringDTO.setMarksMap(marksMap);
+
+	McAction.logger.debug("generating dyn pass map using listQuestionContentDTO: " + listQuestionContentDTO);
+	Map passMarksMap = authoringUtil.buildDynamicPassMarkMap(listQuestionContentDTO, false);
+	McAction.logger.debug("passMarksMap: " + passMarksMap);
+	mcGeneralAuthoringDTO.setPassMarksMap(passMarksMap);
+
+	String totalMark = AuthoringUtil.getTotalMark(listQuestionContentDTO);
+	McAction.logger.debug("totalMark: " + totalMark);
+	mcAuthoringForm.setTotalMarks(totalMark);
+	mcGeneralAuthoringDTO.setTotalMarks(totalMark);
+
+	Map correctMap = authoringUtil.buildCorrectMap();
+	McAction.logger.debug("correctMap: " + correctMap);
+	mcGeneralAuthoringDTO.setCorrectMap(correctMap);
+
+	mcGeneralAuthoringDTO.setEditableQuestionText(newQuestion);
+
+	mcAuthoringForm.setFeedback(feedback);
+
+	mcGeneralAuthoringDTO.setMarkValue(mark);
+
+	McAction.logger.debug("before saving final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
+	request.setAttribute(McAppConstants.MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
+
+	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
+
+	McAction.logger.debug("editQuestionBoxRequest: " + editQuestionBoxRequest);
+
+	return newQuestionBox(mapping, form, request, response);
+
+    }
+
     /**
      * boolean existsContent(long toolContentID, IMcService mcService)
      * 
      * @param toolContentID
      * @param mcService
      * @return
      */
-	protected boolean existsContent(long toolContentID, IMcService mcService)
-	{
-		McContent mcContent=mcService.retrieveMc(new Long(toolContentID));
-	    if (mcContent == null) 
-	    	return false;
-	    
-		return true;	
+    protected boolean existsContent(long toolContentID, IMcService mcService) {
+	McContent mcContent = mcService.retrieveMc(new Long(toolContentID));
+	if (mcContent == null) {
+	    return false;
 	}
-	
+
+	return true;
+    }
+
 }
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r877e20f893a1e5accb8a70a37b20ea2bea102349 -r65ed4da382b320542dcd88cb1375662dcfac8769
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 877e20f893a1e5accb8a70a37b20ea2bea102349)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
@@ -69,6 +69,16 @@
 		var messageAreaFrame = document.getElementById("messageArea");
 		messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 	}
+        
+    function importQTI(){
+    	window.open('<lams:LAMSURL/>questionFile.jsp?chooseAnswers=true',
+    			    'QuestionFile','width=500,height=200,scrollbars=yes');
+    }
+    
+    function saveQTI(queryString) {
+    	window.location.href = '<html:rewrite page="/authoring.do?dispatch=saveQTI&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}"/>&'
+    				           + queryString;
+    }
 
 </script>
 
@@ -113,6 +123,8 @@
 			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.save.question" /> </a>
+		<a href="#" onClick="javascript:importQTI()" style="margin-left: 40px"><fmt:message
+				key="label.authoring.import.qti" /></a>
 	</c:if>
 	<c:if
 		test="${mcGeneralAuthoringDTO.activeModule != 'authoring' && mcGeneralAuthoringDTO.activeModule != 'defineLater'}">