Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46 -ra1e990f3ee5ec7091752683571061da802f58bb2
Binary files differ
Index: lams_central/web/questionChoice.jsp
===================================================================
diff -u -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46 -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
+++ lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -44,7 +44,6 @@
 		}
 	</style>
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript">
 		window.resizeTo(800, 600);
 	
@@ -60,16 +59,23 @@
 			});
 			
 			if (anyQuestionsSelected) {
+				var form = $("#questionForm");
 				if (returnURL == '') {
-					var queryString = $('#questionForm').formSerialize();
-					window.opener.saveQTI(queryString);
+					form.css('visibility', 'hidden');
+					window.opener.saveQTI(form[0].outerHTML, 'questionForm');
+					window.close();
 				} else {
-					$('#questionForm').ajaxSubmit({
-						'success' : function(){
-							window.opener.location.reload();	
-					}});
+					// this code is not really used at the moment, but it's available
+					$.ajax({
+						type: "POST",
+						url: returnURL,
+						data: form.serializeArray(),
+						success: function(response) {
+							window.opener.location.reload();
+							window.close();
+						}
+					});
 				}
-				window.close();
 			} else {
 				$('#errorArea').show();
 			}
@@ -132,7 +138,7 @@
 	
 	<input id="selectAll" type="checkbox" /><fmt:message key="label.questions.choice.select.all" /><br /><br />
 			       
-	<form id="questionForm" action="${returnURL}">
+	<form id="questionForm" method="POST">
 		<input type="hidden" name="questionCount" value="${fn:length(questions)}" />
 		
 		<c:forEach var="question" items="${questions}" varStatus="questionStatus">
Index: lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
===================================================================
diff -u -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46 -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -39,6 +39,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -254,6 +255,11 @@
 	    Map<String, String> feedbackMap = new TreeMap<String, String>();
 	    if (textBasedQuestion || !answerMap.isEmpty()) {
 		NodeList answerMetadatas = questionItem.getElementsByTagName("respcondition");
+		// if no answers at all, it is Essay type
+		if ((answerMetadatas.getLength() == 0) && (question.getType() == null) && textBasedQuestion
+			&& !QuestionParser.isQuestionTypeAcceptable(Question.QUESTION_TYPE_ESSAY, limitType, question)) {
+		    continue questionLoop;
+		}
 		for (int answerMetadataIndex = 0; answerMetadataIndex < answerMetadatas.getLength(); answerMetadataIndex++) {
 		    Element answerMetadata = (Element) answerMetadatas.item(answerMetadataIndex);
 		    NodeList scoreReference = answerMetadata.getElementsByTagName("varequal");
@@ -363,56 +369,56 @@
     /**
      * Parses query string (send by form submit or extracted otherwise) from questionChoice.jsp form.
      */
-    public static Question[] parseQuestionChoiceForm(String queryString) throws UnsupportedEncodingException {
+    public static Question[] parseQuestionChoiceForm(HttpServletRequest request) throws UnsupportedEncodingException {
 	List<Question> result = new ArrayList<Question>();
 
 	// to know where to stop searching for question entries (disabled/unchecked form fields are not sent)
-	int questionCount = Integer.parseInt(WebUtil.extractParameterValue(queryString, "questionCount"));
+
+	int questionCount = WebUtil.readIntParam(request, "questionCount");
 	for (int questionIndex = 0; questionIndex < questionCount; questionIndex++) {
-	    String questionType = WebUtil.extractParameterValue(queryString, "question" + questionIndex + "type");
+	    String questionType = request.getParameter("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);
+		String questionTitle = request.getParameter("question" + questionIndex);
 		if (!StringUtils.isBlank(questionTitle)) {
 		    question.setTitle(URLDecoder.decode(questionTitle, "UTF8"));
 		}
-		String questionText = WebUtil.extractParameterValue(queryString, "question" + questionIndex + "text");
+		String questionText = request.getParameter("question" + questionIndex + "text");
 		if (!StringUtils.isBlank(questionText)) {
 		    question.setText(URLDecoder.decode(questionText, "UTF8"));
 		}
-		String questionFeedback = WebUtil.extractParameterValue(queryString, "question" + questionIndex
-			+ "feedback");
+		String questionFeedback = request.getParameter("question" + questionIndex + "feedback");
 		// can be blank
 		if (!StringUtils.isBlank(questionFeedback)) {
 		    question.setFeedback(URLDecoder.decode(questionFeedback, "UTF8"));
 		}
 
-		String questionResourcesFolderPath = WebUtil.extractParameterValue(queryString, "question"
-			+ questionIndex + "resourcesFolder");
+		String questionResourcesFolderPath = request.getParameter("question" + questionIndex
+			+ "resourcesFolder");
 		if (!StringUtils.isBlank(questionResourcesFolderPath)) {
 		    question.setResourcesFolderPath(URLDecoder.decode(questionResourcesFolderPath, "UTF8"));
 		}
 
 		boolean isMatching = Question.QUESTION_TYPE_MATCHING.equals(question.getType());
 
 		// extract answers
-		String answerCountParam = WebUtil.extractParameterValue(queryString, "answerCount" + questionIndex);
+		String answerCountParam = request.getParameter("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");
+			String answerText = request.getParameter(answerId);
+			String answerScore = request.getParameter(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");
+			    String answerFeedback = request.getParameter(answerId + "feedback");
 			    // can be blank
 			    if (!StringUtils.isBlank(answerFeedback)) {
 				answer.setFeedback(URLDecoder.decode(answerFeedback, "UTF8"));
@@ -421,8 +427,8 @@
 
 			    if (isMatching) {
 				// map indexes of answers
-				String matchAnswerIndex = WebUtil.extractParameterValue(queryString, "question"
-					+ questionIndex + "match" + answerIndex);
+				String matchAnswerIndex = request.getParameter("question" + questionIndex + "match"
+					+ answerIndex);
 				if (!StringUtils.isBlank(matchAnswerIndex)) {
 				    if (question.getMatchMap() == null) {
 					question.setMatchMap(new TreeMap<Integer, Integer>());
@@ -436,14 +442,13 @@
 
 		// extract match answers
 		if (isMatching) {
-		    String matchAnswerCountParam = WebUtil.extractParameterValue(queryString, "matchAnswerCount"
-			    + questionIndex);
+		    String matchAnswerCountParam = request.getParameter("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);
+			    String matchAnswerText = request.getParameter(matchAnswerId);
 
 			    if (!StringUtils.isBlank(matchAnswerText)) {
 				Answer matchAnswer = new Answer();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46 -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -789,7 +789,7 @@
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
 
-	Question[] questions = QuestionParser.parseQuestionChoiceForm(request.getQueryString());
+	Question[] questions = QuestionParser.parseQuestionChoiceForm(request);
 	for (Question question : questions) {
 	    AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
 	    assessmentQuestion.setCreateDate(new Timestamp(new Date().getTime()));
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -154,17 +154,17 @@
     			    '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(){
+    function saveQTI(formHTML, formName) {
+    	var form = $($.parseHTML(formHTML));
+		$.ajax({
+			type: "POST",
+			url: '<c:url value="/authoring/saveQTI.do?sessionMapID=${sessionMapID}" />',
+			data: form.serializeArray(),
+			success: function(response) {
+				$(questionListTargetDiv).html(response);
 				refreshThickbox();
 			}
-		);
+		});
     }
 
 
@@ -229,4 +229,4 @@
 			<fmt:message key="label.authoring.basic.import.qti" /> 
 	</a>
 </p>
-<br>
+<br>
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46 -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -693,7 +693,7 @@
 	List<McQuestionContentDTO> listQuestionContentDTO = (List<McQuestionContentDTO>) sessionMap
 		.get(McAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
 	// proper parsing
-	Question[] questions = QuestionParser.parseQuestionChoiceForm(request.getQueryString());
+	Question[] questions = QuestionParser.parseQuestionChoiceForm(request);
 
 	for (Question question : questions) {
 	    // quietly do same verification as in other question-adding methods
@@ -780,7 +780,7 @@
 		defaultContentIdStr, mcService, httpSessionID, listQuestionContentDTO);
 
 	request.setAttribute(McAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
-	return (mapping.findForward(McAppConstants.LOAD_QUESTIONS));
+	return (mapping.findForward(McAppConstants.LOAD));
     }
 
     /**
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -75,10 +75,26 @@
     			    'QuestionFile','width=500,height=200,scrollbars=yes');
     }
     
-    function saveQTI(queryString) {
-    	window.location.href = '<html:rewrite page="/authoring.do?dispatch=saveQTI&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}"/>&'
-    				           + queryString;
+	
+    function saveQTI(formHTML, formName) {
+    	var form = $($.parseHTML(formHTML));
+		$.ajax({
+			type: "POST",
+			url: '<c:url value="/authoring/saveQTI.do?sessionMapID=${sessionMapID}" />',
+			data: form.serializeArray(),
+			success: function(response) {
+				$(questionListTargetDiv).html(response);
+				refreshThickbox();
+			}
+		});
     }
+    
+    function saveQTI(formHTML, formName) {
+    	document.body.innerHTML += formHTML;
+    	var form = document.getElementById(formName);
+    	form.action = '<html:rewrite page="/authoring.do?dispatch=saveQTI&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}"/>';
+    	form.submit();
+    }
 
 </script>
 
@@ -150,4 +166,4 @@
 		<a href="javascript:submitMethod('submitAllContent')" class="button">
 			<fmt:message key="label.save" /> </a>
 	</p>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
diff -u -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46 -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -694,7 +694,7 @@
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 
-	Question[] questions = QuestionParser.parseQuestionChoiceForm(request.getQueryString());
+	Question[] questions = QuestionParser.parseQuestionChoiceForm(request);
 	for (Question question : questions) {
 	    ScratchieItem item = new ScratchieItem();
 	    item.setCreateDate(new Timestamp(new Date().getTime()));
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -ra1e990f3ee5ec7091752683571061da802f58bb2
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a1e990f3ee5ec7091752683571061da802f58bb2)
@@ -88,19 +88,18 @@
     			    'QuestionFile','width=500,height=200,scrollbars=yes');
     }
 	
-    function saveQTI(queryString) {
-		var url = '<c:url value="/authoring/saveQTI.do" />?' + queryString;
-		$(itemTargetDiv).load(
-			url,
-			{
-				sessionMapID: "${sessionMapID}"
-			},
-			function(){
+    function saveQTI(formHTML, formName) {
+    	var form = $($.parseHTML(formHTML));
+		$.ajax({
+			type: "POST",
+			url: '<c:url value="/authoring/saveQTI.do?sessionMapID=${sessionMapID}" />',
+			data: form.serializeArray(),
+			success: function(response) {
+				$(itemTargetDiv).html(response);
 				refreshThickbox();
 			}
-		);
+		});
     }
-
 </script>
 <!-- Basic Tab Content -->
 <table class="space-bottom">
@@ -141,4 +140,4 @@
 			<fmt:message key="label.authoring.import.qti" /> 
 		</a>
 	</div>
-</div>
+</div>
\ No newline at end of file