Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -399,4 +399,11 @@
 label.questions.choice.title =Choose questions
 label.questions.choice.select.all =Select all
 label.questions.choice.missing =Please check at least one question.
+label.questions.choice.type.mc =Multiple Choice
+label.questions.choice.type.tf =True-False
+label.questions.choice.type.mt =Matching
+label.questions.choice.type.mr =Multiple Response
+label.questions.choice.type.fb =Fill-in-Blank
+label.questions.choice.type.es =Essay
+label.questions.choice.type.unknown =Unknown
 #======= End labels: Exported 345 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java	(.../QuestionsAction.java)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java	(.../QuestionsAction.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -1,7 +1,10 @@
 package org.lamsfoundation.lams.web;
 
 import java.io.InputStream;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,22 +42,22 @@
 	List<FileItem> formFields = formParser.parseRequest(request);
 
 	String returnURL = null;
-	Boolean chooseAnswers = null;
+	String limitTypeParam = 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 ("limitType".equals(fieldName)) {
+		limitTypeParam = formField.getString();
 	    } else if ("file".equals(fieldName) && !StringUtils.isBlank(formField.getName())) {
 		packageFileStream = formField.getInputStream();
 	    }
 	}
 
 	request.setAttribute("returnURL", returnURL);
-	request.setAttribute("chooseAnswers", chooseAnswers);
+	request.setAttribute("limitType", limitTypeParam);
 
 	// user did not choose a file
 	if (packageFileStream == null) {
@@ -64,7 +67,14 @@
 	    return mapping.findForward("questionFile");
 	}
 
-	Question[] questions = QuestionParser.parseQTIPackage(packageFileStream);
+	Set<String> limitType = null;
+	if (!StringUtils.isBlank(limitTypeParam)) {
+	    limitType = new TreeSet<String>();
+	    // comma delimited acceptable question types, for example "mc,fb"
+	    Collections.addAll(limitType, limitTypeParam.split(","));
+	}
+
+	Question[] questions = QuestionParser.parseQTIPackage(packageFileStream, limitType);
 	request.setAttribute("questions", questions);
 
 	return mapping.findForward("questionChoice");
Index: lams_central/web/questionChoice.jsp
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -12,7 +12,7 @@
 	<lams:css/>	
 	<style type="text/css">
 		div.answerDiv {
-			padding-left: 20px;
+			padding-left: 25px;
 			display: none;
 		}
 		
@@ -21,6 +21,10 @@
 			margin: 10px 10px 0px 15px;
 		}
 		
+		.questionText {
+			margin-left: 43px;
+		}
+		
 		div.answerDiv input {
 			margin-top: 5px;
 		}
@@ -44,7 +48,6 @@
 		window.resizeTo(800, 600);
 	
 		var returnURL = '${returnURL}';
-		var chooseAnswers = '${chooseAnswers}';
 		
 		function submitForm() {
 			var anyQuestionsSelected = false;
@@ -72,44 +75,45 @@
 		}
 		
 		$(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);
-					}
-				});
-			}
+			$('.question').change(function(){
+				var checked = $(this).is(':checked');
+				var selector = '#' + $(this).attr('id');
+				var answerDiv = $(selector + 'answerDiv');
+				var answersVisible = answerDiv.find('input[type="checkbox"]').length > 0;
+				// enable/disable answers and feedback fields
+				// so they do not get posted when not needed
+				if (answersVisible) {
+					// if this was not tested, there would be a tiny,
+					// but annoying movement when question checkbox is clicked 
+					answerDiv.toggle('slow');
+				}
+				$('input', answerDiv).add(selector + 'feedback').add(selector + 'type').add(selector + 'text')
+				                     .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');
+				$('.questionAttribute').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');
-					}
+				if (checked) {
+					$('.answerDiv').show('slow')
+					  .find('input').attr('disabled', null);
+				} else {
+					$('.answerDiv').hide('slow')
+					   .find('input').attr('disabled', 'disabled');
 				}
 			});
 		});
@@ -127,33 +131,88 @@
 	<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 -->
+			<%-- Question itself --%>
 			<input id="question${questionStatus.index}" name="question${questionStatus.index}"
+			       value="<c:out value='${question.title}' />"
+			       class="question" type="checkbox" />${questionStatus.index + 1}.
+     		<c:choose>
+				<c:when test="${question.type eq 'mc'}">
+					(<fmt:message key="label.questions.choice.type.mc" />)
+				</c:when>
+				<c:when test="${question.type eq 'mr'}">
+					(<fmt:message key="label.questions.choice.type.mr" />)
+				</c:when>
+				<c:when test="${question.type eq 'mt'}">
+					(<fmt:message key="label.questions.choice.type.mt" />)
+				</c:when>
+				<c:when test="${question.type eq 'fb'}">
+					(<fmt:message key="label.questions.choice.type.fb" />)
+				</c:when>
+				<c:when test="${question.type eq 'es'}">
+					(<fmt:message key="label.questions.choice.type.es" />)
+				</c:when>
+				<c:when test="${question.type eq 'tf'}">
+					(<fmt:message key="label.questions.choice.type.tf" />)
+				</c:when>
+				<c:otherwise>
+					(<fmt:message key="label.questions.choice.type.unknown" />)
+				</c:otherwise>
+			</c:choose>
+			<c:out value='${question.title}' /><br />
+			<input id="question${questionStatus.index}text" name="question${questionStatus.index}text"
 			       value="<c:out value='${question.text}' />"
-			       class="question" type="checkbox" />${questionStatus.index + 1}. <c:out value='${question.text}' /><br />
-			<!-- Question feedback -->
+			       class="questionAttribute" type="hidden" disabled="disabled" />
+			       <span class="questionText"><c:out value='${question.text}' /></span><br />
+			<input type="hidden" id="question${questionStatus.index}type" name="question${questionStatus.index}type"
+		           value="${question.type}"
+		           class="questionAttribute" disabled="disabled" />
+			<%-- 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}">
+		           class="questionAttribute" disabled="disabled" />
+		    <%-- Answers, if required and exist --%>
+			<c:if test="${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)}" />
+					<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 -->
+						<%-- Answer itself --%>
+						<c:choose>
+							<c:when test="${question.type eq 'mc' or question.type eq 'mr' or question.type eq 'fb'}">
+								<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 />
+			       			</c:when>
+			       			<c:otherwise>
+			       				<%-- Do not display answers if management is too difficult or pointless --%>
+								<input name="question${questionStatus.index}answer${answerStatus.index}"
+					       			   value="<c:out value='${answer.text}' />"
+					       			   type="hidden" disabled="disabled" />
+							</c:otherwise>
+						</c:choose>
+			       		<%-- 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>
+					<c:if test="${question.type eq 'mt'}">
+						<input type="hidden" name="matchAnswerCount${questionStatus.index}" 
+						       value="${fn:length(question.matchAnswers)}" />
+						<c:forEach var="matchAnswer" items="${question.matchAnswers}" varStatus="matchAnswerStatus">
+							<input name="question${questionStatus.index}matchAnswer${matchAnswerStatus.index}"
+					       		   value="<c:out value='${matchAnswer.text}' />"
+					       		   type="hidden" disabled="disabled" />
+						</c:forEach>
+						<c:forEach var="entry" items="${question.matchMap}">
+				       		<input name="question${questionStatus.index}match${entry.key}"
+				       		   	   value="${entry.value}"
+				       		   	   type="hidden" disabled="disabled" />
+					    </c:forEach>
+					</c:if>
 				</div>
 			</c:if>
 		</c:forEach>
Index: lams_central/web/questionFile.jsp
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_central/web/questionFile.jsp	(.../questionFile.jsp)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_central/web/questionFile.jsp	(.../questionFile.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -48,9 +48,9 @@
  
 	<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="hidden" name="limitType" value="${empty param.limitType ? limitType : param.limitType}" />
 		
-		<input type="file" name="file" size="55"/>
+		<input type="file" name="file" size="53"/>
 		<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" />
Index: lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java	(.../Answer.java)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/Answer.java	(.../Answer.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -23,7 +23,9 @@
 /* $Id$ */
 package org.lamsfoundation.lams.questions;
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
 
+
 public class Answer {
     private String text;
     private String feedback;
@@ -52,4 +54,31 @@
     public void setScore(Float score) {
 	this.score = score;
     }
+
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(text).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+	if (this == obj) {
+	    return true;
+	}
+	if (obj == null) {
+	    return false;
+	}
+	if (!(obj instanceof Answer)) {
+	    return false;
+	}
+	Answer other = (Answer) obj;
+	if (text == null) {
+	    if (other.text != null) {
+		return false;
+	    }
+	} else if (!text.equals(other.text)) {
+	    return false;
+	}
+	return true;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/questions/Question.java
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(.../Question.java)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(.../Question.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -23,13 +23,50 @@
 /* $Id$ */
 package org.lamsfoundation.lams.questions;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
 public class Question {
+    public static final String QUESTION_TYPE_MULTIPLE_CHOICE = "mc";
+    public static final String QUESTION_TYPE_MULTIPLE_RESPONSE = "mr";
+    public static final String QUESTION_TYPE_TRUE_FALSE = "tf";
+    public static final String QUESTION_TYPE_ESSAY = "es";
+    public static final String QUESTION_TYPE_MATCHING = "mt";
+    public static final String QUESTION_TYPE_FILL_IN_BLANK = "fb";
+    public static final Set<String> QUESTION_TYPES = new TreeSet<String>(Arrays.asList(new String[] {
+	    Question.QUESTION_TYPE_MULTIPLE_CHOICE, Question.QUESTION_TYPE_MULTIPLE_RESPONSE,
+	    Question.QUESTION_TYPE_TRUE_FALSE, Question.QUESTION_TYPE_ESSAY, Question.QUESTION_TYPE_MATCHING,
+	    Question.QUESTION_TYPE_FILL_IN_BLANK }));
+
+    private String type;
+    private String title;
     private String text;
     private String feedback;
     private List<Answer> answers;
+    private List<Answer> matchAnswers;
+    private Map<Integer, Integer> matchMap;
 
+    public String getType() {
+	return type;
+    }
+
+    public void setType(String type) {
+	this.type = type;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getText() {
 	return text;
     }
@@ -53,4 +90,47 @@
     public void setAnswers(List<Answer> answers) {
 	this.answers = answers;
     }
+
+    public List<Answer> getMatchAnswers() {
+	return matchAnswers;
+    }
+
+    public void setMatchAnswers(List<Answer> matchAnswers) {
+	this.matchAnswers = matchAnswers;
+    }
+
+    public Map<Integer, Integer> getMatchMap() {
+	return matchMap;
+    }
+
+    public void setMatchMap(Map<Integer, Integer> matchMap) {
+	this.matchMap = matchMap;
+    }
+
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(text).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+	if (this == obj) {
+	    return true;
+	}
+	if (obj == null) {
+	    return false;
+	}
+	if (!(obj instanceof Question)) {
+	    return false;
+	}
+	Question other = (Question) obj;
+	if (text == null) {
+	    if (other.text != null) {
+		return false;
+	    }
+	} else if (!text.equals(other.text)) {
+	    return false;
+	}
+	return true;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
===================================================================
diff -u -rf9b2102cf2cabf9b832a4d5cd002bd0618ce4050 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision f9b2102cf2cabf9b832a4d5cd002bd0618ce4050)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -34,6 +34,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -72,8 +73,8 @@
     /**
      * Extracts questions from IMS QTI zip file.
      */
-    public static Question[] parseQTIPackage(InputStream packageFileStream) throws SAXParseException, IOException,
-	    SAXException, ParserConfigurationException, ZipFileUtilException {
+    public static Question[] parseQTIPackage(InputStream packageFileStream, Set<String> limitType)
+	    throws SAXParseException, IOException, SAXException, ParserConfigurationException, ZipFileUtilException {
 	List<Question> result = new ArrayList<Question>();
 
 	// unique folder name
@@ -86,7 +87,7 @@
 	    } else {
 		// extract from every XML file; usually there is just one
 		for (File resourceFile : resourceFiles) {
-		    Question[] fileQuestions = QuestionParser.parseQTIFile(resourceFile);
+		    Question[] fileQuestions = QuestionParser.parseQTIFile(resourceFile, limitType);
 		    if (fileQuestions != null) {
 			Collections.addAll(result, fileQuestions);
 		    }
@@ -103,7 +104,8 @@
     /**
      * Extracts questions from IMS QTI xml file.
      */
-    public static Question[] parseQTIFile(File xmlFile) throws ParserConfigurationException, SAXException, IOException {
+    public static Question[] parseQTIFile(File xmlFile, Set<String> limitType) throws ParserConfigurationException,
+	    SAXException, IOException {
 	List<Question> result = new ArrayList<Question>();
 	DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
 	Document doc = docBuilder.parse(xmlFile);
@@ -115,13 +117,18 @@
 	    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
+	    Question question = new Question();
+	    // check if it is "matching" question type
+	    if ("Matching".equalsIgnoreCase(questionItemType)
+		    && !QuestionParser.isQuestionTypeAcceptable(Question.QUESTION_TYPE_MATCHING, limitType, question)) {
 		continue;
 	    }
+	    String questionTitle = questionItem.getAttribute("title");
+	    question.setTitle(questionTitle);
 
-	    Question question = new Question();
 	    Map<String, Answer> answerMap = new TreeMap<String, Answer>();
+	    Map<String, Answer> matchAnswerMap = null;
+	    boolean textBasedQuestion = false;
 
 	    Element presentation = (Element) questionItem.getElementsByTagName("presentation").item(0);
 	    NodeList presentationChildrenList = presentation.getChildNodes();
@@ -134,49 +141,152 @@
 			    .item(0);
 		    String questionText = ((CDATASection) questionElement.getChildNodes().item(0)).getData();
 		    if (questionText.trim().startsWith("<!--")) {
-			// do not support algorithmic question type
+			// do not support Algorithmic question type
 			continue questionLoop;
 		    }
 		    question.setText(WebUtil.removeHTMLtags(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(WebUtil.removeHTMLtags(answerText));
-			if (question.getAnswers() == null) {
+		    if (question.getAnswers() == null) {
+			boolean multipleAnswersAllowed = "multiple".equalsIgnoreCase(((Element) presentationChild)
+				.getAttribute("rcardinality"));
+			NodeList answerList = ((Element) presentationChild).getElementsByTagName("response_label");
+			// parse answers
+			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();
+
+			    // if there are answers different thatn true/false,
+			    // it is Multiple Choice or Multiple Answers
+			    if ((question.getType() == null)
+				    && !"true".equalsIgnoreCase(answerText)
+				    && !"false".equalsIgnoreCase(answerText)
+				    && !QuestionParser.isQuestionTypeAcceptable(
+					    multipleAnswersAllowed ? Question.QUESTION_TYPE_MULTIPLE_RESPONSE
+						    : Question.QUESTION_TYPE_MULTIPLE_CHOICE, limitType, question)) {
+				continue questionLoop;
+			    }
+
+			    Answer answer = new Answer();
+			    answer.setText(WebUtil.removeHTMLtags(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);
+			}
+
+			// if there are only true/false answers, set the question type
+			if ((question.getType() == null)
+				&& (question.getAnswers() != null)
+				&& (question.getAnswers().size() == 2)
+				&& !multipleAnswersAllowed
+				&& !QuestionParser.isQuestionTypeAcceptable(Question.QUESTION_TYPE_TRUE_FALSE,
+					limitType, question)) {
+			    continue questionLoop;
+			}
+		    }
+
+		    if (Question.QUESTION_TYPE_MATCHING.equals(question.getType())) {
+			if (question.getMatchAnswers() == null) {
+			    // the parsed answers are actually the second part of matching
+			    // move collections accordingly
+			    question.setMatchAnswers(question.getAnswers());
 			    question.setAnswers(new ArrayList<Answer>());
+
+			    matchAnswerMap = answerMap;
+			    answerMap = new TreeMap<String, Answer>();
 			}
-			question.getAnswers().add(answer);
 
-			// for other metadata parts to find Answer object
-			String answerId = answerElement.getAttribute("ident");
-			answerMap.put(answerId, answer);
+			NodeList responseLidChildrenList = presentationChild.getChildNodes();
+			for (int responseLidChildIndex = 0; responseLidChildIndex < responseLidChildrenList.getLength(); responseLidChildIndex++) {
+			    // parse answers for first part of matching
+			    Node responseLidChild = responseLidChildrenList.item(responseLidChildIndex);
+			    if ("material".equals(responseLidChild.getNodeName())) {
+				Element answerElement = (Element) ((Element) presentationChild).getElementsByTagName(
+					"mattext").item(0);
+				String answerText = ((CDATASection) answerElement.getChildNodes().item(0)).getData();
+
+				Answer answer = new Answer();
+				answer.setText(WebUtil.removeHTMLtags(answerText));
+				question.getAnswers().add(answer);
+
+				String answerId = ((Element) presentationChild).getAttribute("ident");
+				answerMap.put(answerId, answer);
+			    }
+			}
 		    }
+		} else if ("response_str".equals(presentationChild.getNodeName())) {
+		    // Essay or Fill-in-Blank question types
+		    textBasedQuestion = true;
 		}
 	    }
 
 	    // extract score and feedback
 	    Map<String, String> feedbackMap = new TreeMap<String, String>();
-	    if (!answerMap.isEmpty()) {
+	    if (textBasedQuestion || !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) {
+			// no answers at all, so it is Essay type
+			if ((question.getType() == null)
+				&& textBasedQuestion
+				&& !QuestionParser.isQuestionTypeAcceptable(Question.QUESTION_TYPE_ESSAY, limitType,
+					question)) {
+			    continue questionLoop;
+			}
+		    } else {
+			if ((question.getType() == null)
+				&& textBasedQuestion
+				&& !QuestionParser.isQuestionTypeAcceptable(Question.QUESTION_TYPE_FILL_IN_BLANK,
+					limitType, question)) {
+			    continue questionLoop;
+			}
 
-		    if (answerId != null) {
+			Answer answer = null;
+			if (textBasedQuestion) {
+			    // for Fill-in-Blank answer parsing can be done only here
+			    answer = new Answer();
+			    answer.setText(WebUtil.removeHTMLtags(answerId));
+			    if (question.getAnswers() == null) {
+				question.setAnswers(new ArrayList<Answer>());
+			    }
+			    question.getAnswers().add(answer);
+			}
 			// extract score
-			String score = ((Text) answerMetadata.getElementsByTagName("setvar").item(0).getChildNodes()
-				.item(0)).getData();
+			Element setVarElement = (Element) answerMetadata.getElementsByTagName("setvar").item(0);
+			String score = ((Text) setVarElement.getChildNodes().item(0)).getData();
 			if (!StringUtils.isBlank(score)) {
-			    Answer answer = answerMap.get(answerId);
-			    answer.setScore(Float.parseFloat(score));
+			    if (Question.QUESTION_TYPE_MATCHING.equals(question.getType())) {
+				// map matching answers to each other, plus set the score
+				if (setVarElement.getAttribute("varname").endsWith("_Correct")) {
+				    Answer matchAnswer = matchAnswerMap.get(answerId);
+				    answerId = ((Element) scoreReference.item(0)).getAttribute("respident");
+				    answer = answerMap.get(answerId);
+				    answer.setScore(Float.parseFloat(score));
+
+				    if (question.getMatchMap() == null) {
+					question.setMatchMap(new TreeMap<Integer, Integer>());
+				    }
+				    Integer answerIndex = question.getAnswers().indexOf(answer);
+				    Integer matchAnswerIndex = question.getMatchAnswers().indexOf(matchAnswer);
+				    question.getMatchMap().put(answerIndex, matchAnswerIndex);
+				}
+			    } else {
+				if (answer == null) {
+				    // for all types except Matching and Fill-in-Blank
+				    answer = answerMap.get(answerId);
+				}
+				answer.setScore(Float.parseFloat(score));
+			    }
 			}
 
 			// extract question and answer feedback references
@@ -210,7 +320,9 @@
 			String answerId = feedbackMap.get(feedbackId);
 			if (answerId != null) {
 			    Answer answer = answerMap.get(answerId);
-			    answer.setFeedback(WebUtil.removeHTMLtags(feedbackText));
+			    if (answer != null) {
+				answer.setFeedback(WebUtil.removeHTMLtags(feedbackText));
+			    }
 			}
 		    }
 		}
@@ -228,49 +340,89 @@
     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 questionType = WebUtil.extractParameterValue(queryString, "question" + questionIndex + "type");
+	    Question question = new Question();
+	    // if question was not checked on the form, type is NULL and it is not accepted
+	    if (QuestionParser.isQuestionTypeAcceptable(questionType, null, question)) {
+		String questionTitle = WebUtil.extractParameterValue(queryString, "question" + questionIndex);
+		if (!StringUtils.isBlank(questionTitle)) {
+		    question.setTitle(URLDecoder.decode(questionTitle, "UTF8"));
+		}
+		String questionText = WebUtil.extractParameterValue(queryString, "question" + questionIndex + "text");
+		if (!StringUtils.isBlank(questionText)) {
+		    question.setText(URLDecoder.decode(questionText, "UTF8"));
+		}
 		String questionFeedback = WebUtil.extractParameterValue(queryString, "question" + questionIndex
 			+ "feedback");
 		// can be blank
 		if (!StringUtils.isBlank(questionFeedback)) {
 		    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
-				if (!StringUtils.isBlank(answerFeedback)) {
-				    answer.setFeedback(URLDecoder.decode(answerFeedback, "UTF8"));
+		boolean isMatching = Question.QUESTION_TYPE_MATCHING.equals(question.getType());
+
+		// extract answers
+		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
+			    if (!StringUtils.isBlank(answerFeedback)) {
+				answer.setFeedback(URLDecoder.decode(answerFeedback, "UTF8"));
+			    }
+			    question.getAnswers().add(answer);
+
+			    if (isMatching) {
+				// map indexes of answers
+				String matchAnswerIndex = WebUtil.extractParameterValue(queryString, "question"
+					+ questionIndex + "match" + answerIndex);
+				if (!StringUtils.isBlank(matchAnswerIndex)) {
+				    if (question.getMatchMap() == null) {
+					question.setMatchMap(new TreeMap<Integer, Integer>());
+				    }
+				    question.getMatchMap().put(answerIndex, Integer.valueOf(matchAnswerIndex));
 				}
-				question.getAnswers().add(answer);
 			    }
 			}
 		    }
 		}
 
+		// extract match answers
+		if (isMatching) {
+		    String matchAnswerCountParam = WebUtil.extractParameterValue(queryString, "matchAnswerCount"
+			    + questionIndex);
+		    int matchAnswerCount = matchAnswerCountParam == null ? 0 : Integer.parseInt(matchAnswerCountParam);
+		    if (matchAnswerCount > 0) {
+			question.setMatchAnswers(new ArrayList<Answer>());
+			for (int matchAnswerIndex = 0; matchAnswerIndex < matchAnswerCount; matchAnswerIndex++) {
+			    String matchAnswerId = "question" + questionIndex + "matchAnswer" + matchAnswerIndex;
+			    String matchAnswerText = WebUtil.extractParameterValue(queryString, matchAnswerId);
+
+			    if (!StringUtils.isBlank(matchAnswerText)) {
+				Answer matchAnswer = new Answer();
+				matchAnswer.setText(URLDecoder.decode(matchAnswerText, "UTF8"));
+
+				question.getMatchAnswers().add(matchAnswer);
+			    }
+			}
+		    }
+		}
+
 		result.add(question);
 	    }
 	}
@@ -308,4 +460,15 @@
 	}
 	return resourceFiles;
     }
+
+    /**
+     * Checks if given type has a correct value and should be processed. Also sets question property for convenience.
+     */
+    private static boolean isQuestionTypeAcceptable(String type, Set<String> limitType, Question question) {
+	if (type == null || !Question.QUESTION_TYPES.contains(type)) {
+	    return false;
+	}
+	question.setType(type);
+	return (limitType == null) || limitType.isEmpty() || limitType.contains(type);
+    }
 }
\ No newline at end of file
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -272,6 +272,6 @@
 label.authoring.basic.import.questions  =Import questions
 label.authoring.basic.export.questions  =Export questions
 label.authoring.advance.display.summary  =Display all questions and answers once the student finishes.
+label.authoring.basic.import.qti =Import IMS QTI
 
-
 #======= End labels: Exported 266 labels for en AU =====
Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -111,6 +111,15 @@
 			validate="false">
 			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
 		</action>
+				
+		<action path="/authoring/saveQTI"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
+			scope="request" 
+			parameter="saveQTI" 
+			validate="false">
+			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
+		</action>
+		
 		<action path="/authoring/removeQuestion"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
 			parameter="removeQuestion">
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -63,6 +63,9 @@
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
+import org.lamsfoundation.lams.questions.Answer;
+import org.lamsfoundation.lams.questions.Question;
+import org.lamsfoundation.lams.questions.QuestionParser;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.model.Assessment;
@@ -98,6 +101,7 @@
 
     private static Logger log = Logger.getLogger(AuthoringAction.class);
 
+    @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -106,10 +110,11 @@
 	if (param.equals("start")) {
 	    ToolAccessMode mode = getAccessMode(request);
 	    // teacher mode "check for new" button enter.
-	    if (mode != null)
+	    if (mode != null) {
 		request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
-	    else
+	    } else {
 		request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString());
+	    }
 	    return start(mapping, form, request, response);
 	}
 	if (param.equals("definelater")) {
@@ -152,6 +157,9 @@
 	if (param.equals("saveOrUpdateQuestion")) {
 	    return saveOrUpdateQuestion(mapping, form, request, response);
 	}
+	if (param.equals("saveQTI")) {
+	    return saveQTI(mapping, form, request, response);
+	}
 	if (param.equals("removeQuestion")) {
 	    return removeQuestion(mapping, form, request, response);
 	}
@@ -167,7 +175,7 @@
 	}
 	if (param.equals("downQuestionReference")) {
 	    return downQuestionReference(mapping, form, request, response);
-	}	
+	}
 	// ----------------------- Import/Export Questions functions ---------------------------
 	if (param.equals("importInit")) {
 	    return importInit(mapping, form, request, response);
@@ -177,7 +185,7 @@
 	}
 	if (param.equals("exportQuestions")) {
 	    return exportQuestions(mapping, form, request, response);
-	}	
+	}
 	// -----------------------Assessment Answer Option functions ---------------------------
 	if (param.equals("addOption")) {
 	    return addOption(mapping, form, request, response);
@@ -191,21 +199,21 @@
 	if (param.equals("downOption")) {
 	    return downOption(mapping, form, request, response);
 	}
-	// -----------------------Assessment Unit functions ---------------------------	
+	// -----------------------Assessment Unit functions ---------------------------
 	if (param.equals("newUnit")) {
 	    return newUnit(mapping, form, request, response);
 	}
 	// -----------------------Assessment Overall Feedback functions ---------------------------
 	if (param.equals("initOverallFeedback")) {
 	    return initOverallFeedback(mapping, form, request, response);
-	}	
+	}
 	if (param.equals("newOverallFeedback")) {
 	    return newOverallFeedback(mapping, form, request, response);
 	}
-	
+
 	return mapping.findForward(AssessmentConstants.ERROR);
     }
-    
+
     /**
      * Read assessment data from database and put them into HttpSession. It will redirect to init.do directly after this
      * method run successfully.
@@ -232,7 +240,7 @@
 	SessionMap sessionMap = new SessionMap();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	assessmentForm.setSessionMapID(sessionMap.getSessionID());
-	
+
 	// Get contentFolderID and save to form.
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
@@ -245,10 +253,12 @@
 		assessment = service.getDefaultContent(contentId);
 		if (assessment.getQuestions() != null) {
 		    questions = new ArrayList<AssessmentQuestion>(assessment.getQuestions());
-		} else
+		} else {
 		    questions = null;
-	    } else
+		}
+	    } else {
 		questions = service.getAuthoredQuestions(assessment.getUid());
+	    }
 
 	    assessmentForm.setAssessment(assessment);
 
@@ -257,14 +267,14 @@
 	    attachmentList.clear();
 	    attachmentList.addAll(assessment.getAttachments());
 	} catch (Exception e) {
-	    log.error(e);
+	    AuthoringAction.log.error(e);
 	    throw new ServletException(e);
 	}
 
 	// init it to avoid null exception in following handling
-	if (questions == null)
+	if (questions == null) {
 	    questions = new ArrayList<AssessmentQuestion>();
-	else {
+	} else {
 	    AssessmentUser assessmentUser = null;
 	    // handle system default question: createBy is null, now set it to current user
 	    for (AssessmentQuestion question : questions) {
@@ -283,21 +293,21 @@
 	SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
 	questionList.clear();
 	questionList.addAll(questions);
-	
+
 	// init question references
 	SortedSet<QuestionReference> references = getQuestionReferences(sessionMap);
 	references.clear();
 	if (assessment.getQuestionReferences() != null) {
 	    references.addAll(assessment.getQuestionReferences());
 	}
-	
+
 	// init available questions
 	reinitializeAvailableQuestions(sessionMap);
-	
+
 	sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT_FORM, assessmentForm);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Display same entire authoring page content from HttpSession variable.
      * 
@@ -313,7 +323,7 @@
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	AssessmentForm existForm = (AssessmentForm) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT_FORM);
-	
+
 	AssessmentForm assessmentForm = (AssessmentForm) form;
 	try {
 	    PropertyUtils.copyProperties(assessmentForm, existForm);
@@ -322,14 +332,16 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor())
+	if (mode.isAuthor()) {
 	    return mapping.findForward(AssessmentConstants.SUCCESS);
-	else
+	} else {
 	    return mapping.findForward(AssessmentConstants.DEFINE_LATER);
+	}
     }
 
     /**
-     * This method will persist all inforamtion in this authoring page, include all assessment question, information etc.
+     * This method will persist all inforamtion in this authoring page, include all assessment question, information
+     * etc.
      * 
      * @param mapping
      * @param form
@@ -389,8 +401,9 @@
 	// merge attachment info
 	// so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
 	Set attPOSet = assessmentPO.getAttachments();
-	if (attPOSet == null)
+	if (attPOSet == null) {
 	    attPOSet = new HashSet();
+	}
 	List attachmentList = getAttachmentList(sessionMap);
 	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
 
@@ -434,44 +447,46 @@
 	    }
 	}
 	assessmentPO.setQuestions(questions);
-	
+
 	// delete References from database.
 	List<QuestionReference> deletedReferences = getDeletedQuestionReferences(sessionMap);
 	iter = deletedReferences.iterator();
 	while (iter.hasNext()) {
 	    QuestionReference reference = (QuestionReference) iter.next();
 	    iter.remove();
-	    if (reference.getUid() != null)
+	    if (reference.getUid() != null) {
 		service.deleteQuestionReference(reference.getUid());
+	    }
 	}
-	
+
 	// delete Questions from database.
 	List deletedQuestionList = getDeletedQuestionList(sessionMap);
 	iter = deletedQuestionList.iterator();
 	while (iter.hasNext()) {
 	    AssessmentQuestion question = (AssessmentQuestion) iter.next();
 	    iter.remove();
-	    if (question.getUid() != null)
+	    if (question.getUid() != null) {
 		service.deleteAssessmentQuestion(question.getUid());
+	    }
 	}
-	
+
 	// Handle question references
 	Set<QuestionReference> questionReferences = updateQuestionReferencesGrades(request, sessionMap, true);
 	assessmentPO.setQuestionReferences(questionReferences);
-	
+
 	// handle assessment question attachment file:
 	List delQuestionAttList = getDeletedQuestionAttachmentList(sessionMap);
 	iter = delQuestionAttList.iterator();
 	while (iter.hasNext()) {
 	    AssessmentQuestion delAtt = (AssessmentQuestion) iter.next();
 	    iter.remove();
 	}
-	
+
 	// ************************* Handle assessment overall feedbacks *******************
-	 if (mode.isAuthor()) {
-	     TreeSet<AssessmentOverallFeedback> overallFeedbackList = getOverallFeedbacksFromForm(request, true);
-	     assessmentPO.setOverallFeedbacks(overallFeedbackList);
-	 }
+	if (mode.isAuthor()) {
+	    TreeSet<AssessmentOverallFeedback> overallFeedbackList = getOverallFeedbacksFromForm(request, true);
+	    assessmentPO.setOverallFeedbacks(overallFeedbackList);
+	}
 
 	// **********************************************
 	// finally persist assessmentPO again
@@ -485,8 +500,7 @@
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	if (mode.isAuthor()) {
 	    return mapping.findForward("author");
-	}
-	else {
+	} else {
 	    return mapping.findForward("monitor");
 	}
     }
@@ -540,13 +554,15 @@
 	updateQuestionReferencesGrades(request, sessionMap, true);
 
 	FormFile file;
-	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type))
-	    file = (FormFile) assessmentForm.getOfflineFile();
-	else
-	    file = (FormFile) assessmentForm.getOnlineFile();
+	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
+	    file = assessmentForm.getOfflineFile();
+	} else {
+	    file = assessmentForm.getOnlineFile();
+	}
 
-	if (file == null || StringUtils.isBlank(file.getFileName()))
+	if ((file == null) || StringUtils.isBlank(file.getFileName())) {
 	    return mapping.findForward(AssessmentConstants.SUCCESS);
+	}
 
 	// validate file size
 	ActionMessages errors = new ActionMessages();
@@ -648,7 +664,7 @@
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Display empty page for new assessment question.
      * 
@@ -664,40 +680,40 @@
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	updateQuestionReferencesGrades(request, sessionMap, false);
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	AssessmentQuestionForm questionForm = (AssessmentQuestionForm) form; 
+	AssessmentQuestionForm questionForm = (AssessmentQuestionForm) form;
 	questionForm.setSessionMapID(sessionMapID);
 	questionForm.setContentFolderID(contentFolderID);
 	questionForm.setDefaultGrade("1");
 	questionForm.setPenaltyFactor("0");
-	
+
 	List<AssessmentQuestionOption> optionList = new ArrayList<AssessmentQuestionOption>();
 	for (int i = 0; i < AssessmentConstants.INITIAL_OPTIONS_NUMBER; i++) {
 	    AssessmentQuestionOption option = new AssessmentQuestionOption();
-	    option.setSequenceId(i+1);
+	    option.setSequenceId(i + 1);
 	    option.setGrade(0);
 	    optionList.add(option);
 	}
 	request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);
-	
+
 	List<AssessmentUnit> unitList = new ArrayList<AssessmentUnit>();
 	AssessmentUnit unit = new AssessmentUnit();
 	unit.setSequenceId(1);
 	unit.setMultiplier(1);
-	unitList.add(unit);	
+	unitList.add(unit);
 	for (int i = 1; i < AssessmentConstants.INITIAL_UNITS_NUMBER; i++) {
 	    unit = new AssessmentUnit();
-	    unit.setSequenceId(i+1);
+	    unit.setSequenceId(i + 1);
 	    unit.setMultiplier(0);
 	    unitList.add(unit);
 	}
-	request.setAttribute(AssessmentConstants.ATTR_UNIT_LIST, unitList);	
+	request.setAttribute(AssessmentConstants.ATTR_UNIT_LIST, unitList);
 
 	short type = (short) NumberUtils.stringToInt(request.getParameter(AssessmentConstants.ATTR_QUESTION_TYPE));
 	sessionMap.put(AssessmentConstants.ATTR_QUESTION_TYPE, type);
-	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);	
+	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 	return findForward(type, mapping);
     }
-    
+
     /**
      * Display edit page for existed assessment question.
      * 
@@ -715,15 +731,15 @@
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	updateQuestionReferencesGrades(request, sessionMap, false);
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	
+
 	int questionIdx = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_QUESTION_INDEX), -1);
 	AssessmentQuestion question = null;
 	if (questionIdx != -1) {
 	    SortedSet<AssessmentQuestion> assessmentList = getQuestionList(sessionMap);
 	    List<AssessmentQuestion> rList = new ArrayList<AssessmentQuestion>(assessmentList);
 	    question = rList.get(questionIdx);
 	    if (question != null) {
-		AssessmentQuestionForm questionForm = (AssessmentQuestionForm) form; 
+		AssessmentQuestionForm questionForm = (AssessmentQuestionForm) form;
 		populateQuestionToForm(questionIdx, question, questionForm, request);
 		questionForm.setContentFolderID(contentFolderID);
 	    }
@@ -741,17 +757,17 @@
      * 
      * @param mapping
      * @param form
-     * @param request	
+     * @param request
      * @param response
      * @return
      * @throws ServletException
      */
     private ActionForward saveOrUpdateQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	
+
 	AssessmentQuestionForm questionForm = (AssessmentQuestionForm) form;
 	extractFormToAssessmentQuestion(request, questionForm);
-	
+
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(questionForm.getSessionMapID());
 	reinitializeAvailableQuestions(sessionMap);
 
@@ -761,9 +777,217 @@
     }
 
     /**
-     * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only happen
-     * when user submit whole page. So this remove is just impact HttpSession values.
+     * Parses questions extracted from IMS QTI file and adds them as new items.
      * 
+     * @throws UnsupportedEncodingException
+     */
+    @SuppressWarnings("rawtypes")
+    private ActionForward saveQTI(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws UnsupportedEncodingException {
+	String sessionMapId = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapId);
+	SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
+
+	Question[] questions = QuestionParser.parseQuestionChoiceForm(request.getQueryString());
+	for (Question question : questions) {
+	    AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
+	    assessmentQuestion.setCreateDate(new Timestamp(new Date().getTime()));
+	    int maxSeq = 1;
+	    if ((questionList != null) && (questionList.size() > 0)) {
+		AssessmentQuestion last = questionList.last();
+		maxSeq = last.getSequenceId() + 1;
+	    }
+	    assessmentQuestion.setSequenceId(maxSeq);
+	    assessmentQuestion.setTitle(question.getTitle());
+	    assessmentQuestion.setQuestion(question.getText());
+	    assessmentQuestion.setGeneralFeedback(question.getFeedback());
+	    assessmentQuestion.setPenaltyFactor(0);
+
+	    int questionGrade = 1;
+
+	    // options are different depending on the type
+	    if (Question.QUESTION_TYPE_MULTIPLE_CHOICE.equals(question.getType())
+		    || Question.QUESTION_TYPE_FILL_IN_BLANK.equals(question.getType())) {
+		// setting answers is very similar in both types, so they were put together here
+		if (Question.QUESTION_TYPE_MULTIPLE_CHOICE.equals(question.getType())) {
+		    assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE);
+		    assessmentQuestion.setMultipleAnswersAllowed(false);
+		    assessmentQuestion.setShuffle(false);
+		} else {
+		    assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER);
+		    assessmentQuestion.setCaseSensitive(false);
+		}
+
+		String correctAnswer = null;
+		if (question.getAnswers() != null) {
+		    TreeSet<AssessmentQuestionOption> optionList = new TreeSet<AssessmentQuestionOption>(
+			    new SequencableComparator());
+		    int orderId = 1;
+		    for (Answer answer : question.getAnswers()) {
+			String answerText = answer.getText();
+			if ((correctAnswer != null) && correctAnswer.equals(answerText)) {
+			    AuthoringAction.log.warn("Skipping an answer with same text as the correct answer: "
+				    + answerText);
+			    continue;
+			}
+			AssessmentQuestionOption assessmentAnswer = new AssessmentQuestionOption();
+			assessmentAnswer.setOptionString(answerText);
+			assessmentAnswer.setSequenceId(orderId++);
+			assessmentAnswer.setFeedback(answer.getFeedback());
+
+			if ((answer.getScore() != null) && (answer.getScore() > 0)) {
+			    if (correctAnswer == null) {
+				// whatever the correct answer holds, it becomes the question score
+				questionGrade = new Double(Math.ceil(answer.getScore())).intValue();
+				// 100% goes to single correct answer
+				assessmentAnswer.setGrade(1);
+				correctAnswer = answerText;
+			    } else {
+				AuthoringAction.log
+					.warn("Choosing only first correct answer, despite another one was found: "
+						+ answerText);
+				assessmentAnswer.setGrade(0);
+			    }
+			} else {
+			    assessmentAnswer.setGrade(0);
+			}
+
+			optionList.add(assessmentAnswer);
+		    }
+
+		    assessmentQuestion.setQuestionOptions(optionList);
+		}
+
+		if (correctAnswer == null) {
+		    AuthoringAction.log.warn("No correct answer found for question: " + question.getText());
+		    continue;
+		}
+
+	    } else if (Question.QUESTION_TYPE_MULTIPLE_RESPONSE.equals(question.getType())) {
+		assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE);
+		assessmentQuestion.setMultipleAnswersAllowed(true);
+		assessmentQuestion.setShuffle(false);
+
+		if (question.getAnswers() != null) {
+		    float totalScore = 0;
+		    for (Answer answer : question.getAnswers()) {
+			if ((answer.getScore() != null) && (answer.getScore() > 0)) {
+			    // the question score information is stored as sum of answer scores
+			    totalScore += answer.getScore();
+			}
+		    }
+		    questionGrade = new Double(Math.round(totalScore)).intValue();
+
+		    TreeSet<AssessmentQuestionOption> optionList = new TreeSet<AssessmentQuestionOption>(
+			    new SequencableComparator());
+		    int orderId = 1;
+		    for (Answer answer : question.getAnswers()) {
+			String answerText = answer.getText();
+			AssessmentQuestionOption assessmentAnswer = new AssessmentQuestionOption();
+			assessmentAnswer.setOptionString(answerText);
+			assessmentAnswer.setSequenceId(orderId++);
+			assessmentAnswer.setFeedback(answer.getFeedback());
+
+			if ((answer.getScore() != null) && (answer.getScore() > 0)) {
+			    // set the factor of score for correct answers
+			    assessmentAnswer.setGrade(answer.getScore() / totalScore);
+			} else {
+			    assessmentAnswer.setGrade(0);
+			}
+
+			optionList.add(assessmentAnswer);
+		    }
+
+		    assessmentQuestion.setQuestionOptions(optionList);
+		}
+
+	    } else if (Question.QUESTION_TYPE_TRUE_FALSE.equals(question.getType())) {
+		assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_TRUE_FALSE);
+
+		if (question.getAnswers() == null) {
+		    AuthoringAction.log.warn("Answers missing from true-false question: " + question.getText());
+		    continue;
+		} else {
+		    for (Answer answer : question.getAnswers()) {
+			if ((answer.getScore() != null) && (answer.getScore() > 0)) {
+			    assessmentQuestion.setCorrectAnswer(Boolean.parseBoolean(answer.getText()));
+			    questionGrade = new Double(Math.ceil(answer.getScore())).intValue();
+			}
+			if (!StringUtils.isBlank(answer.getFeedback())) {
+			    // set feedback for true/false answers
+			    if (Boolean.parseBoolean(answer.getText())) {
+				assessmentQuestion.setFeedbackOnCorrect(answer.getFeedback());
+			    } else {
+				assessmentQuestion.setFeedbackOnIncorrect(answer.getFeedback());
+			    }
+			}
+		    }
+		}
+	    } else if (Question.QUESTION_TYPE_MATCHING.equals(question.getType())) {
+		assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS);
+		assessmentQuestion.setShuffle(true);
+
+		if (question.getAnswers() != null) {
+		    // the question score information is stored as sum of answer scores
+		    float totalScore = 0;
+		    for (Answer answer : question.getAnswers()) {
+			if ((answer.getScore() != null) && (answer.getScore() > 0)) {
+			    totalScore += answer.getScore();
+			}
+		    }
+		    questionGrade = new Double(Math.round(totalScore)).intValue();
+
+		    TreeSet<AssessmentQuestionOption> optionList = new TreeSet<AssessmentQuestionOption>(
+			    new SequencableComparator());
+		    int orderId = 1;
+		    for (int answerIndex = 0; answerIndex < question.getAnswers().size(); answerIndex++) {
+			// QTI allows answers without a match, but LAMS assessment tool does not
+			Integer matchAnswerIndex = question.getMatchMap() == null ? null : question.getMatchMap().get(
+				answerIndex);
+			Answer matchAnswer = (matchAnswerIndex == null) || (question.getMatchAnswers() == null) ? null
+				: question.getMatchAnswers().get(matchAnswerIndex);
+			if (matchAnswer != null) {
+			    Answer answer = question.getAnswers().get(answerIndex);
+			    String answerText = answer.getText();
+			    AssessmentQuestionOption assessmentAnswer = new AssessmentQuestionOption();
+			    assessmentAnswer.setQuestion(answerText);
+			    assessmentAnswer.setOptionString(matchAnswer.getText());
+			    assessmentAnswer.setSequenceId(orderId++);
+			    assessmentAnswer.setFeedback(answer.getFeedback());
+
+			    optionList.add(assessmentAnswer);
+			}
+		    }
+
+		    assessmentQuestion.setQuestionOptions(optionList);
+		}
+	    } else if (Question.QUESTION_TYPE_ESSAY.equals(question.getType())) {
+		assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_ESSAY);
+		assessmentQuestion.setAllowRichEditor(false);
+	    } else {
+		AuthoringAction.log.warn("Unknow QTI question type: " + question.getType());
+		continue;
+	    }
+
+	    assessmentQuestion.setDefaultGrade(questionGrade);
+
+	    questionList.add(assessmentQuestion);
+	    if (AuthoringAction.log.isDebugEnabled()) {
+		AuthoringAction.log.debug("Added question: " + assessmentQuestion.getTitle());
+	    }
+	}
+
+	reinitializeAvailableQuestions(sessionMap);
+
+	// set session map ID so that questionlist.jsp can get sessionMAP
+	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapId);
+	return mapping.findForward(AssessmentConstants.SUCCESS);
+    }
+
+    /**
+     * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only
+     * happen when user submit whole page. So this remove is just impact HttpSession values.
+     * 
      * @param mapping
      * @param form
      * @param request
@@ -788,11 +1012,11 @@
 	    // add to delList
 	    List delList = getDeletedQuestionList(sessionMap);
 	    delList.add(question);
-	    
-	    //remove according questionReference, if exists
+
+	    // remove according questionReference, if exists
 	    SortedSet<QuestionReference> questionReferences = getQuestionReferences(sessionMap);
 	    QuestionReference questionReferenceToDelete = null;
-	    for (QuestionReference questionReference: questionReferences) {
+	    for (QuestionReference questionReference : questionReferences) {
 		if ((questionReference.getQuestion() != null)
 			&& (questionReference.getQuestion().getSequenceId() == question.getSequenceId())) {
 		    questionReferenceToDelete = questionReference;
@@ -809,47 +1033,47 @@
 	    }
 
 	}
-	
+
 	reinitializeAvailableQuestions(sessionMap);
 
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
-    * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only happen
-    * when user submit whole page. So this remove is just impact HttpSession values.
-    * 
-    * @param mapping
-    * @param form
-    * @param request
-    * @param response
-    * @return
-    */
-   private ActionForward addQuestionReference(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+     * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only
+     * happen when user submit whole page. So this remove is just impact HttpSession values.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward addQuestionReference(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	updateQuestionReferencesGrades(request, sessionMap, false);
-	
+
 	SortedSet<QuestionReference> references = getQuestionReferences(sessionMap);
 	int questionIdx = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_QUESTION_INDEX), -1);
-	
-	//set SequenceId
+
+	// set SequenceId
 	QuestionReference reference = new QuestionReference();
 	int maxSeq = 1;
-	if (references != null && references.size() > 0) {
+	if ((references != null) && (references.size() > 0)) {
 	    QuestionReference last = references.last();
 	    maxSeq = last.getSequenceId() + 1;
 	}
 	reference.setSequenceId(maxSeq);
-	
-	//set isRandomQuestion
+
+	// set isRandomQuestion
 	boolean isRandomQuestion = (questionIdx == -1);
 	reference.setRandomQuestion(isRandomQuestion);
-	    
-	if (isRandomQuestion) { 
+
+	if (isRandomQuestion) {
 	    reference.setDefaultGrade(1);
 	} else {
 	    SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
@@ -861,36 +1085,37 @@
 		}
 	    }
 	    reference.setQuestion(question);
-	    
+
 	    reference.setDefaultGrade(question.getDefaultGrade());
 	}
 	references.add(reference);
-	
+
 	reinitializeAvailableQuestions(sessionMap);
 
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
-   }
-   
-   /**
-    * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only happen
-    * when user submit whole page. So this remove is just impact HttpSession values.
-    * 
-    * @param mapping
-    * @param form
-    * @param request
-    * @param response
-    * @return
-    */
-   private ActionForward removeQuestionReference(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    }
+
+    /**
+     * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only
+     * happen when user submit whole page. So this remove is just impact HttpSession values.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward removeQuestionReference(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	updateQuestionReferencesGrades(request, sessionMap, false);
 
-	int questionReferenceIdx = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_QUESTION_REFERENCE_INDEX), -1);
+	int questionReferenceIdx = NumberUtils.stringToInt(
+		request.getParameter(AssessmentConstants.PARAM_QUESTION_REFERENCE_INDEX), -1);
 	if (questionReferenceIdx != -1) {
 	    SortedSet<QuestionReference> questionReferences = getQuestionReferences(sessionMap);
 	    List<QuestionReference> rList = new ArrayList<QuestionReference>(questionReferences);
@@ -901,26 +1126,26 @@
 	    List delList = getDeletedQuestionReferences(sessionMap);
 	    delList.add(questionReference);
 	}
-	
+
 	reinitializeAvailableQuestions(sessionMap);
 
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
-   }
-   
-   /**
-    * Move up current question reference.
-    * 
-    * @param mapping
-    * @param form
-    * @param request
-    * @param response
-    * @return
-    */
-   private ActionForward upQuestionReference(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    }
+
+    /**
+     * Move up current question reference.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward upQuestionReference(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	return switchQuestionReferences(mapping, request, true);
-   }
+    }
 
     /**
      * Move down current question reference.
@@ -942,17 +1167,19 @@
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	updateQuestionReferencesGrades(request, sessionMap, false);
 
-	int questionReferenceIdx = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_QUESTION_REFERENCE_INDEX), -1);
+	int questionReferenceIdx = NumberUtils.stringToInt(
+		request.getParameter(AssessmentConstants.PARAM_QUESTION_REFERENCE_INDEX), -1);
 	if (questionReferenceIdx != -1) {
 	    SortedSet<QuestionReference> references = getQuestionReferences(sessionMap);
 	    List<QuestionReference> rList = new ArrayList<QuestionReference>(references);
 	    // get current and the target item, and switch their sequnece
 	    QuestionReference reference = rList.get(questionReferenceIdx);
 	    QuestionReference repReference;
-	    if (up)
+	    if (up) {
 		repReference = rList.get(--questionReferenceIdx);
-	    else
+	    } else {
 		repReference = rList.get(++questionReferenceIdx);
+	    }
 	    int upSeqId = repReference.getSequenceId();
 	    repReference.setSequenceId(reference.getSequenceId());
 	    reference.setSequenceId(upSeqId);
@@ -965,18 +1192,18 @@
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Initializes import questions page.
      */
     private ActionForward importInit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	
+
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Imports questions into question bank from uploaded xml file.
      */
@@ -986,8 +1213,8 @@
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	AssessmentForm assessmentForm = (AssessmentForm) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT_FORM);
-	SortedSet<AssessmentQuestion> oldQuestions = getQuestionList(sessionMap);	
-	
+	SortedSet<AssessmentQuestion> oldQuestions = getQuestionList(sessionMap);
+
 	List<String> ldErrorMsgs = new ArrayList<String>();
 	List<String> toolsErrorMsgs = new ArrayList<String>();
 	try {
@@ -1008,9 +1235,9 @@
 	    while (iter.hasNext()) {
 		FileItem fi = (FileItem) iter.next();
 		// UPLOAD_FILE is input field from HTML page
-		if (!fi.getFieldName().equalsIgnoreCase("UPLOAD_FILE"))
+		if (!fi.getFieldName().equalsIgnoreCase("UPLOAD_FILE")) {
 		    params.put(fi.getFieldName(), fi.getString());
-		else {
+		} else {
 		    // filename on the client
 		    filename = FileUtil.getFileName(fi.getName());
 		    designFile = new File(uploadPath + filename);
@@ -1019,58 +1246,60 @@
 	    }
 
 	    String filename2 = designFile.getName();
-	    String fileExtension = filename2 != null && filename2.length() >= 4 ? filename2
-		    .substring(filename2.length() - 4) : "";
-	    if (! fileExtension.equalsIgnoreCase(".xml")) {
+	    String fileExtension = (filename2 != null) && (filename2.length() >= 4) ? filename2.substring(filename2
+		    .length() - 4) : "";
+	    if (!fileExtension.equalsIgnoreCase(".xml")) {
 		throw new RuntimeException("Wrong file extension. Xml is expected");
 	    }
-	    //String learningDesignPath = ZipFileUtil.expandZip(new FileInputStream(designFile), filename2);
+	    // String learningDesignPath = ZipFileUtil.expandZip(new FileInputStream(designFile), filename2);
 
 	    // import learning design
-	    String fullFilePath = designFile.getAbsolutePath();//FileUtil.getFullPath(learningDesignPath,   ExportToolContentService.LEARNING_DESIGN_FILE_NAME);
-	    List<AssessmentQuestion> questions = (List<AssessmentQuestion>) FileUtil.getObjectFromXML(null, fullFilePath);
+	    String fullFilePath = designFile.getAbsolutePath();// FileUtil.getFullPath(learningDesignPath,
+							       // ExportToolContentService.LEARNING_DESIGN_FILE_NAME);
+	    List<AssessmentQuestion> questions = (List<AssessmentQuestion>) FileUtil.getObjectFromXML(null,
+		    fullFilePath);
 	    if (questions != null) {
 		for (AssessmentQuestion question : questions) {
 		    question.setCreateDate(new Timestamp(new Date().getTime()));
 		    int maxSeq = 1;
-		    if (oldQuestions != null && oldQuestions.size() > 0) {
+		    if ((oldQuestions != null) && (oldQuestions.size() > 0)) {
 			AssessmentQuestion last = oldQuestions.last();
 			maxSeq = last.getSequenceId() + 1;
 		    }
 		    question.setSequenceId(maxSeq);
 		    oldQuestions.add(question);
 		}
 	    }
-	    
+
 	} catch (Exception e) {
-	    log.error("Error occured during import", e);
+	    AuthoringAction.log.error("Error occured during import", e);
 	    toolsErrorMsgs.add(e.getClass().getName() + " " + e.getMessage());
 	}
 
 	if (toolsErrorMsgs.size() > 0) {
 	    request.setAttribute("toolsErrorMessages", toolsErrorMsgs);
 	}
-	
+
 	reinitializeAvailableQuestions(sessionMap);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Exports xml format questions from question bank.
      */
     private ActionForward exportQuestions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	
+
 	AssessmentForm assessmentForm = (AssessmentForm) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT_FORM);
 	Assessment assessment = assessmentForm.getAssessment();
 
 	String errors = null;
 	if (assessment != null) {
 	    try {
 		ArrayList<AssessmentQuestion> questionsToExport = new ArrayList<AssessmentQuestion>();
-		
+
 		for (AssessmentQuestion question : getQuestionList(sessionMap)) {
 		    AssessmentQuestion clonedQuestion = (AssessmentQuestion) question.clone();
 		    clonedQuestion.setCreateBy(null);
@@ -1079,35 +1308,37 @@
 		// exporting XML
 		XStream designXml = new XStream();
 		String resultedXml = designXml.toXML(questionsToExport);
-		
+
 		response.setContentType("application/x-download");
-		response.setHeader("Content-Disposition", "attachment;filename=" + AssessmentConstants.EXPORT_QUESTIONS_FILENAME);
-		log.debug("Exporting assessment questions to an xml: " + assessment.getContentId());
+		response.setHeader("Content-Disposition", "attachment;filename="
+			+ AssessmentConstants.EXPORT_QUESTIONS_FILENAME);
+		AuthoringAction.log.debug("Exporting assessment questions to an xml: " + assessment.getContentId());
 
 		OutputStream out = null;
 		try {
 		    out = response.getOutputStream();
 		    out.write(resultedXml.getBytes());
 		    int count = resultedXml.getBytes().length;
-		    log.debug("Wrote out " + count + " bytes");
+		    AuthoringAction.log.debug("Wrote out " + count + " bytes");
 		    response.setContentLength(count);
 		    out.flush();
 		} catch (Exception e) {
-		    log.error("Exception occured writing out file:" + e.getMessage());
+		    AuthoringAction.log.error("Exception occured writing out file:" + e.getMessage());
 		    throw new ExportToolContentException(e);
 		} finally {
 		    try {
 			if (out != null) {
 			    out.close();
 			}
 		    } catch (Exception e) {
-			log.error("Error Closing file. File already written out - no exception being thrown.", e);
+			AuthoringAction.log.error(
+				"Error Closing file. File already written out - no exception being thrown.", e);
 		    }
 		}
 
 	    } catch (Exception e) {
 		errors = "Unable to export tool content: " + e.toString();
-		log.error(errors);
+		AuthoringAction.log.error(errors);
 	    }
 
 	}
@@ -1122,7 +1353,6 @@
 	return null;
     }
 
-    
     /**
      * Ajax call, will add one more input line for new resource item instruction.
      * 
@@ -1137,22 +1367,22 @@
 	TreeSet<AssessmentQuestionOption> optionList = getOptionsFromRequest(request, false);
 	AssessmentQuestionOption option = new AssessmentQuestionOption();
 	int maxSeq = 1;
-	if (optionList != null && optionList.size() > 0) {
+	if ((optionList != null) && (optionList.size() > 0)) {
 	    AssessmentQuestionOption last = optionList.last();
 	    maxSeq = last.getSequenceId() + 1;
 	}
 	option.setSequenceId(maxSeq);
 	option.setGrade(0);
 	optionList.add(option);
-	
-	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request,
-		AttributeNames.PARAM_CONTENT_FOLDER_ID));
-	request.setAttribute(AssessmentConstants.ATTR_QUESTION_TYPE, WebUtil.readIntParam(request,
-		AssessmentConstants.ATTR_QUESTION_TYPE));
+
+	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID,
+		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
+	request.setAttribute(AssessmentConstants.ATTR_QUESTION_TYPE,
+		WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_TYPE));
 	request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
- 
+
     /**
      * Ajax call, remove the given line of instruction of resource item.
      * 
@@ -1173,14 +1403,14 @@
 	    optionList.addAll(rList);
 	}
 
-	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request,
-		AttributeNames.PARAM_CONTENT_FOLDER_ID));
-	request.setAttribute(AssessmentConstants.ATTR_QUESTION_TYPE, WebUtil.readIntParam(request,
-		AssessmentConstants.ATTR_QUESTION_TYPE));
+	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID,
+		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
+	request.setAttribute(AssessmentConstants.ATTR_QUESTION_TYPE,
+		WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_TYPE));
 	request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Move up current option.
      * 
@@ -1211,11 +1441,11 @@
 
     private ActionForward switchOption(ActionMapping mapping, HttpServletRequest request, boolean up) {
 	Set<AssessmentQuestionOption> optionList = getOptionsFromRequest(request, false);
-	
+
 	int optionIndex = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_OPTION_INDEX), -1);
 	if (optionIndex != -1) {
 	    List<AssessmentQuestionOption> rList = new ArrayList<AssessmentQuestionOption>(optionList);
-	    
+
 	    // get current and the target item, and switch their sequnece
 	    AssessmentQuestionOption option = rList.get(optionIndex);
 	    AssessmentQuestionOption repOption;
@@ -1224,7 +1454,7 @@
 	    } else {
 		repOption = rList.get(++optionIndex);
 	    }
-		
+
 	    int upSeqId = repOption.getSequenceId();
 	    repOption.setSequenceId(option.getSequenceId());
 	    option.setSequenceId(upSeqId);
@@ -1234,14 +1464,14 @@
 	    optionList.addAll(rList);
 	}
 
-	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request,
-		AttributeNames.PARAM_CONTENT_FOLDER_ID));
-	request.setAttribute(AssessmentConstants.ATTR_QUESTION_TYPE, WebUtil.readIntParam(request,
-		AssessmentConstants.ATTR_QUESTION_TYPE));
+	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID,
+		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
+	request.setAttribute(AssessmentConstants.ATTR_QUESTION_TYPE,
+		WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_TYPE));
 	request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Ajax call, will add one more input line for new Unit.
      * 
@@ -1256,17 +1486,17 @@
 	TreeSet<AssessmentUnit> unitList = getUnitsFromRequest(request, false);
 	AssessmentUnit unit = new AssessmentUnit();
 	int maxSeq = 1;
-	if (unitList != null && unitList.size() > 0) {
+	if ((unitList != null) && (unitList.size() > 0)) {
 	    AssessmentUnit last = unitList.last();
 	    maxSeq = last.getSequenceId() + 1;
 	}
 	unit.setSequenceId(maxSeq);
 	unitList.add(unit);
-	
+
 	request.setAttribute(AssessmentConstants.ATTR_UNIT_LIST, unitList);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Ajax call, will add one more input line for new resource item instruction.
      * 
@@ -1279,7 +1509,7 @@
     private ActionForward initOverallFeedback(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);	
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	AssessmentForm assessmentForm = (AssessmentForm) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT_FORM);
 	Assessment assessment = assessmentForm.getAssessment();
 
@@ -1299,10 +1529,10 @@
 	    }
 	}
 
-	request.setAttribute(AssessmentConstants.ATTR_OVERALL_FEEDBACK_LIST, overallFeedbackList);	
+	request.setAttribute(AssessmentConstants.ATTR_OVERALL_FEEDBACK_LIST, overallFeedbackList);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     /**
      * Ajax call, will add one more input line for new OverallFeedback.
      * 
@@ -1317,13 +1547,13 @@
 	TreeSet<AssessmentOverallFeedback> overallFeedbackList = getOverallFeedbacksFromRequest(request, false);
 	AssessmentOverallFeedback overallFeedback = new AssessmentOverallFeedback();
 	int maxSeq = 1;
-	if (overallFeedbackList != null && overallFeedbackList.size() > 0) {
+	if ((overallFeedbackList != null) && (overallFeedbackList.size() > 0)) {
 	    AssessmentOverallFeedback last = overallFeedbackList.last();
 	    maxSeq = last.getSequenceId() + 1;
 	}
 	overallFeedback.setSequenceId(maxSeq);
 	overallFeedbackList.add(overallFeedback);
-	
+
 	request.setAttribute(AssessmentConstants.ATTR_OVERALL_FEEDBACK_LIST, overallFeedbackList);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
@@ -1332,7 +1562,7 @@
     // Private method
     // *************************************************************************************
     /**
-     * refreshes set of all available questions for adding to question list 
+     * refreshes set of all available questions for adding to question list
      * 
      * @param sessionMap
      */
@@ -1343,14 +1573,13 @@
 	for (QuestionReference reference : references) {
 	    questionsFromList.add(reference.getQuestion());
 	}
-	
+
 	Set<AssessmentQuestion> availableQuestions = new TreeSet<AssessmentQuestion>(new SequencableComparator());
 	availableQuestions.addAll(CollectionUtils.subtract(bankQuestions, questionsFromList));
-	
+
 	sessionMap.put(AssessmentConstants.ATTR_AVAILABLE_QUESTIONS, availableQuestions);
     }
 
-    
     /**
      * Return AssessmentService bean.
      */
@@ -1391,7 +1620,7 @@
 	}
 	return list;
     }
-    
+
     /**
      * List save current question references.
      * 
@@ -1417,7 +1646,7 @@
     private List getDeletedQuestionList(SessionMap sessionMap) {
 	return getListFromSession(sessionMap, AssessmentConstants.ATTR_DELETED_QUESTION_LIST);
     }
-    
+
     /**
      * List save deleted assessment questions, which could be persisted or non-persisted questions.
      * 
@@ -1429,9 +1658,9 @@
     }
 
     /**
-     * If a assessment question has attahment file, and the user edit this question and change the attachment to new file, then
-     * the old file need be deleted when submitting the whole authoring page. Save the file uuid and version id into
-     * Assessmentquestion object for temporarily use.
+     * If a assessment question has attahment file, and the user edit this question and change the attachment to new
+     * file, then the old file need be deleted when submitting the whole authoring page. Save the file uuid and version
+     * id into Assessmentquestion object for temporarily use.
      * 
      * @param request
      * @return
@@ -1486,7 +1715,7 @@
 	    break;
 	case AssessmentConstants.QUESTION_TYPE_ORDERING:
 	    forward = mapping.findForward("ordering");
-	    break;	    
+	    break;
 	default:
 	    forward = null;
 	    break;
@@ -1504,7 +1733,7 @@
      */
     private void populateQuestionToForm(int questionIdx, AssessmentQuestion question, AssessmentQuestionForm form,
 	    HttpServletRequest request) {
-	form.setTitle(question.getTitle());	
+	form.setTitle(question.getTitle());
 	form.setQuestion(question.getQuestion());
 	form.setDefaultGrade(String.valueOf(question.getDefaultGrade()));
 	form.setPenaltyFactor(String.valueOf(question.getPenaltyFactor()));
@@ -1521,7 +1750,7 @@
 	if (questionIdx >= 0) {
 	    form.setQuestionIndex(new Integer(questionIdx).toString());
 	}
-	
+
 	short questionType = question.getType();
 	if ((questionType == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING)
@@ -1533,7 +1762,7 @@
 	}
 	if (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
 	    Set<AssessmentUnit> unitList = question.getUnits();
-	    request.setAttribute(AssessmentConstants.ATTR_UNIT_LIST, unitList);	    
+	    request.setAttribute(AssessmentConstants.ATTR_UNIT_LIST, unitList);
 	}
     }
 
@@ -1561,7 +1790,7 @@
 	    question = new AssessmentQuestion();
 	    question.setCreateDate(new Timestamp(new Date().getTime()));
 	    int maxSeq = 1;
-	    if (questionList != null && questionList.size() > 0) {
+	    if ((questionList != null) && (questionList.size() > 0)) {
 		AssessmentQuestion last = questionList.last();
 		maxSeq = last.getSequenceId() + 1;
 	    }
@@ -1576,10 +1805,10 @@
 
 	question.setTitle(questionForm.getTitle());
 	question.setQuestion(questionForm.getQuestion());
-	
+
 	question.setDefaultGrade(Integer.parseInt(questionForm.getDefaultGrade()));
 	question.setGeneralFeedback(questionForm.getGeneralFeedback());
-	
+
 	if (type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
 	    question.setMultipleAnswersAllowed(questionForm.isMultipleAnswersAllowed());
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
@@ -1599,15 +1828,15 @@
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setCorrectAnswer(questionForm.isCorrectAnswer());
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
-	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());	    
+	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	} else if ((type == AssessmentConstants.QUESTION_TYPE_ESSAY)) {
 	    question.setAllowRichEditor(questionForm.isAllowRichEditor());
 	} else if (type == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
 	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	}
-	
+
 	// set options
 	if ((type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)
 		|| (type == AssessmentConstants.QUESTION_TYPE_ORDERING)
@@ -1634,7 +1863,7 @@
 	    }
 	    question.setUnits(units);
 	}
-	
+
     }
 
     /**
@@ -1646,48 +1875,53 @@
     private ToolAccessMode getAccessMode(HttpServletRequest request) {
 	ToolAccessMode mode;
 	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString()))
+	if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) {
 	    mode = ToolAccessMode.TEACHER;
-	else
+	} else {
 	    mode = ToolAccessMode.AUTHOR;
+	}
 	return mode;
     }
-    
-    private Set<QuestionReference> updateQuestionReferencesGrades(HttpServletRequest request, SessionMap sessionMap, boolean isFormSubmit) {
-	Map<String, String> paramMap = splitRequestParameter(request, AssessmentConstants.ATTR_QUESTION_REFERENCES_GRADES);
-	
+
+    private Set<QuestionReference> updateQuestionReferencesGrades(HttpServletRequest request, SessionMap sessionMap,
+	    boolean isFormSubmit) {
+	Map<String, String> paramMap = splitRequestParameter(request,
+		AssessmentConstants.ATTR_QUESTION_REFERENCES_GRADES);
+
 	SortedSet<QuestionReference> questionReferences = getQuestionReferences(sessionMap);
 	for (QuestionReference questionReference : questionReferences) {
 	    try {
 		int grade;
 		if (isFormSubmit) {
-		    grade = WebUtil.readIntParam(request, AssessmentConstants.PARAM_GRADE + questionReference.getSequenceId());
+		    grade = WebUtil.readIntParam(request,
+			    AssessmentConstants.PARAM_GRADE + questionReference.getSequenceId());
 		} else {
 		    String gradeStr = paramMap.get(AssessmentConstants.PARAM_GRADE + questionReference.getSequenceId());
 		    grade = new Integer(gradeStr);
 		}
-		
+
 		questionReference.setDefaultGrade(grade);
 	    } catch (Exception e) {
-		log.debug(e.getMessage());
+		AuthoringAction.log.debug(e.getMessage());
 	    }
 	}
-	
+
 	return questionReferences;
     }
-    
+
     /**
      * Get answer options from <code>HttpRequest</code>
      * 
      * @param request
-     * @param isForSaving whether the blank options will be preserved or not 
+     * @param isForSaving
+     *            whether the blank options will be preserved or not
      * 
      */
     private TreeSet<AssessmentQuestionOption> getOptionsFromRequest(HttpServletRequest request, boolean isForSaving) {
 	Map<String, String> paramMap = splitRequestParameter(request, AssessmentConstants.ATTR_OPTION_LIST);
 
 	int count = NumberUtils.stringToInt(paramMap.get(AssessmentConstants.ATTR_OPTION_COUNT));
-	int questionType = WebUtil.readIntParam(request,AssessmentConstants.ATTR_QUESTION_TYPE);
+	int questionType = WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_TYPE);
 	TreeSet<AssessmentQuestionOption> optionList = new TreeSet<AssessmentQuestionOption>(
 		new SequencableComparator());
 	for (int i = 0; i < count; i++) {
@@ -1704,46 +1938,47 @@
 		option.setOptionString(optionString);
 		float grade = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i));
 		option.setGrade(grade);
-		option.setFeedback((String) paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
+		option.setFeedback(paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
 		optionList.add(option);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
 		String question = paramMap.get(AssessmentConstants.ATTR_OPTION_QUESTION_PREFIX + i);
 		if ((question == null) && isForSaving) {
 		    continue;
 		}
-		
+
 		AssessmentQuestionOption option = new AssessmentQuestionOption();
-		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);		
+		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);
 		option.setSequenceId(NumberUtils.stringToInt(sequenceId));
-		option.setOptionString((String) paramMap.get(AssessmentConstants.ATTR_OPTION_STRING_PREFIX + i));
+		option.setOptionString(paramMap.get(AssessmentConstants.ATTR_OPTION_STRING_PREFIX + i));
 		option.setQuestion(question);
 		optionList.add(option);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
 		String optionFloatStr = paramMap.get(AssessmentConstants.ATTR_OPTION_FLOAT_PREFIX + i);
 		String acceptedErrorStr = paramMap.get(AssessmentConstants.ATTR_OPTION_ACCEPTED_ERROR_PREFIX + i);
 		String gradeStr = paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i);
-		if (optionFloatStr.equals("0.0") && optionFloatStr.equals("0.0") && gradeStr.equals("0.0") && isForSaving) {
+		if (optionFloatStr.equals("0.0") && optionFloatStr.equals("0.0") && gradeStr.equals("0.0")
+			&& isForSaving) {
 		    continue;
 		}
-		
+
 		AssessmentQuestionOption option = new AssessmentQuestionOption();
 		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);
 		option.setSequenceId(NumberUtils.stringToInt(sequenceId));
 		try {
 		    float optionFloat = Float.valueOf(optionFloatStr);
-		    option.setOptionFloat(optionFloat);		    
+		    option.setOptionFloat(optionFloat);
 		} catch (Exception e) {
 		    option.setOptionFloat(0);
 		}
 		try {
 		    float acceptedError = Float.valueOf(acceptedErrorStr);
-		    option.setAcceptedError(acceptedError);	    
+		    option.setAcceptedError(acceptedError);
 		} catch (Exception e) {
 		    option.setAcceptedError(0);
-		}		
+		}
 		float grade = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i));
-		option.setGrade(grade);    
-		option.setFeedback((String) paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
+		option.setGrade(grade);
+		option.setFeedback(paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
 		optionList.add(option);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 		String optionString = paramMap.get(AssessmentConstants.ATTR_OPTION_STRING_PREFIX + i);
@@ -1761,7 +1996,7 @@
 	}
 	return optionList;
     }
-    
+
     /**
      * Get units from <code>HttpRequest</code>
      * 
@@ -1777,25 +2012,26 @@
 	    if (StringUtils.isBlank(unitStr) && isForSaving) {
 		continue;
 	    }
-	    
+
 	    AssessmentUnit unit = new AssessmentUnit();
-	    String sequenceId = paramMap.get(AssessmentConstants.ATTR_UNIT_SEQUENCE_ID_PREFIX + i);	    
+	    String sequenceId = paramMap.get(AssessmentConstants.ATTR_UNIT_SEQUENCE_ID_PREFIX + i);
 	    unit.setSequenceId(NumberUtils.stringToInt(sequenceId));
 	    unit.setUnit(unitStr);
 	    float multiplier = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_UNIT_MULTIPLIER_PREFIX + i));
 	    unit.setMultiplier(multiplier);
 	    unitList.add(unit);
 	}
-	
+
 	return unitList;
     }
-    
+
     /**
      * Get overall feedbacks from <code>HttpRequest</code>
      * 
      * @param request
      */
-    private TreeSet<AssessmentOverallFeedback> getOverallFeedbacksFromRequest(HttpServletRequest request, boolean skipBlankOverallFeedbacks) {
+    private TreeSet<AssessmentOverallFeedback> getOverallFeedbacksFromRequest(HttpServletRequest request,
+	    boolean skipBlankOverallFeedbacks) {
 	int count = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.ATTR_OVERALL_FEEDBACK_COUNT));
 	TreeSet<AssessmentOverallFeedback> overallFeedbackList = new TreeSet<AssessmentOverallFeedback>(
 		new SequencableComparator());
@@ -1820,21 +2056,21 @@
 	}
 	return overallFeedbackList;
     }
-    
+
     /**
      * Get overall feedbacks from <code>HttpRequest</code>
      * 
      * @param request
      */
-    private TreeSet<AssessmentOverallFeedback> getOverallFeedbacksFromForm(HttpServletRequest request, boolean skipBlankOverallFeedbacks) {
+    private TreeSet<AssessmentOverallFeedback> getOverallFeedbacksFromForm(HttpServletRequest request,
+	    boolean skipBlankOverallFeedbacks) {
 	Map<String, String> paramMap = splitRequestParameter(request, AssessmentConstants.ATTR_OVERALL_FEEDBACK_LIST);
-	
+
 	int count = NumberUtils.stringToInt(paramMap.get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_COUNT));
 	TreeSet<AssessmentOverallFeedback> overallFeedbackList = new TreeSet<AssessmentOverallFeedback>(
 		new SequencableComparator());
 	for (int i = 0; i < count; i++) {
-	    String gradeBoundaryStr = paramMap
-		    .get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i);
+	    String gradeBoundaryStr = paramMap.get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i);
 	    String feedback = paramMap.get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_FEEDBACK_PREFIX + i);
 	    String sequenceId = paramMap.get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_SEQUENCE_ID_PREFIX + i);
 
@@ -1853,30 +2089,32 @@
 	}
 	return overallFeedbackList;
     }
-    
+
     /**
      * Split Request Parameter from <code>HttpRequest</code>
      * 
      * @param request
-     * @param parameterName parameterName
+     * @param parameterName
+     *            parameterName
      */
     private Map<String, String> splitRequestParameter(HttpServletRequest request, String parameterName) {
 	String list = request.getParameter(parameterName);
 	if (list == null) {
 	    return null;
 	}
-	
+
 	String[] params = list.split("&");
 	Map<String, String> paramMap = new HashMap<String, String>();
 	String[] pair;
 	for (String item : params) {
 	    pair = item.split("=");
-	    if (pair == null || pair.length != 2)
+	    if ((pair == null) || (pair.length != 2)) {
 		continue;
+	    }
 	    try {
 		paramMap.put(pair[0], URLDecoder.decode(pair[1], "UTF-8"));
 	    } catch (UnsupportedEncodingException e) {
-		log.error("Error occurs when decode instruction string:" + e.toString());
+		AuthoringAction.log.error("Error occurs when decode instruction string:" + e.toString());
 	    }
 	}
 	return paramMap;
@@ -1902,7 +2140,7 @@
 		    option.setQuestion(questionStr.replaceAll("[\n\r\f]", ""));
 		}
 	    }
-	    
+
 	}
     }
 }
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rbcbb7535afbed8b0c8bef17e309fd431ae77ec08 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision bcbb7535afbed8b0c8bef17e309fd431ae77ec08)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -148,6 +148,24 @@
 		    $('#passingMark').append( new Option(i, i, isSelected, isSelected) );
 		}
 	};	
+	
+    function importQTI(){
+    	window.open('<lams:LAMSURL/>questionFile.jsp',
+    			    'QuestionFile','width=500,height=200,scrollbars=yes');
+    }
+	
+    function saveQTI(queryString) {
+		var url = '<c:url value="/authoring/saveQTI.do" />?' + queryString;
+		$(questionListTargetDiv).load(
+			url,
+			{
+				sessionMapID: "${sessionMapID}"
+			},
+			function(){
+				refreshThickbox();
+			}
+		);
+    }
 
 
 </script>
@@ -206,5 +224,9 @@
 	<a onclick="javascript:exportQuestions();" class="button space-right" id="exportButton" style="float: right;">  
 		<fmt:message key="label.authoring.basic.export.questions" />
 	</a>
+	
+	<a href="#" onClick="javascript:importQTI()" style="float: right; margin-right: 50px">
+			<fmt:message key="label.authoring.basic.import.qti" /> 
+	</a>
 </p>
 <br>
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -71,7 +71,7 @@
 	}
         
     function importQTI(){
-    	window.open('<lams:LAMSURL/>questionFile.jsp?chooseAnswers=true',
+    	window.open('<lams:LAMSURL/>questionFile.jsp?limitType=mc',
     			    'QuestionFile','width=500,height=200,scrollbars=yes');
     }
     
Fisheye: Tag a43256ee6435f1cd14f46c235e4d507957a86a5b refers to a dead (removed) revision in file `lams_tool_scratchie/conf/language/rams/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a43256ee6435f1cd14f46c235e4d507957a86a5b refers to a dead (removed) revision in file `lams_tool_scratchie/conf/language/rams/ApplicationResources_en_AU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
diff -u -r4b178984cfb2aebc0e9c1e9e586c06a1c6ea40bc -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4b178984cfb2aebc0e9c1e9e586c06a1c6ea40bc)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -703,7 +703,8 @@
 		maxSeq = last.getOrderId() + 1;
 	    }
 	    item.setOrderId(maxSeq);
-	    item.setTitle(question.getText());
+	    item.setTitle(question.getTitle());
+	    item.setDescription(question.getText());
 
 	    TreeSet<ScratchieAnswer> answerList = new TreeSet<ScratchieAnswer>(new ScratchieAnswerComparator());
 	    String correctAnswer = null;
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -r4b178984cfb2aebc0e9c1e9e586c06a1c6ea40bc -ra43256ee6435f1cd14f46c235e4d507957a86a5b
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 4b178984cfb2aebc0e9c1e9e586c06a1c6ea40bc)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
@@ -84,7 +84,7 @@
 	};
 	
     function importQTI(){
-    	window.open('<lams:LAMSURL/>questionFile.jsp?chooseAnswers=true',
+    	window.open('<lams:LAMSURL/>questionFile.jsp?limitType=mc',
     			    'QuestionFile','width=500,height=200,scrollbars=yes');
     }
 	
@@ -94,6 +94,9 @@
 			url,
 			{
 				sessionMapID: "${sessionMapID}"
+			},
+			function(){
+				refreshThickbox();
 			}
 		);
     }