Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -rc2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0 -r72af36328cce2e7260d7466f9276fc2982ce3195
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 72af36328cce2e7260d7466f9276fc2982ce3195)
@@ -55,6 +55,8 @@
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
+import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.questions.Answer;
 import org.lamsfoundation.lams.questions.Question;
 import org.lamsfoundation.lams.questions.QuestionExporter;
@@ -85,6 +87,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -105,6 +108,9 @@
     @Qualifier("laasseAssessmentService")
     private IAssessmentService service;
 
+    @Autowired
+    private IQbService qbService;
+
     /**
      * Read assessment data from database and put them into HttpSession. It will redirect to init.do directly after this
      * method run successfully.
@@ -139,7 +145,6 @@
      */
     private String readDatabaseData(AssessmentForm assessmentForm, HttpServletRequest request, ToolAccessMode mode)
 	    throws ServletException {
-	// save toolContentID into HTTPSession
 	Long contentId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_TOOL_CONTENT_ID);
 
 	List<AssessmentQuestion> questions = null;
@@ -446,7 +451,63 @@
 	    return "pages/authoring/parts/questionlist";
 	}
     }
+    
+    /**
+     * QB callback handler which adds selected QbQuestion into question list.
+     */
+    @SuppressWarnings("unchecked")
+    @RequestMapping(value = "/importQbQuestion", method = RequestMethod.POST)
+    private String importQbQuestion(HttpServletRequest request) {
+	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
+	
+	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
+	QbQuestion qbQuestion = qbService.getQbQuestionByUid(qbQuestionUid);
+	
+	
+	
+//	// check whether it is "edit(old Question)" or "add(new Question)"
+//	extractFormToAssessmentQuestion(request, questionList, questionForm, isAuthoringRestricted);
+//
+//	reinitializeAvailableQuestions(sessionMap);
+//	
+//	
+//	
+//	
+//	//create new ScratchieItem and assign imported qbQuestion to it
+//	ScratchieItem item = new ScratchieItem();
+//	item.setQbQuestion(qbQuestion);
+//	int maxSeq = 1;
+//	if (itemList != null && itemList.size() > 0) {
+//	    ScratchieItem last = itemList.last();
+//	    maxSeq = last.getDisplayOrder() + 1;
+//	}
+//	item.setDisplayOrder(maxSeq);
+//	item.setQbQuestionModified(IQbService.QUESTION_MODIFIED_NONE);
+//	itemList.add(item);
+	
+	
+	
+	
+	
+	
 
+
+	// evict everything manually as we do not use DTOs, just real entities
+	// without eviction changes would be saved immediately into DB
+//	scratchieService.releaseFromCache(item);
+//	scratchieService.releaseFromCache(item);
+//	scratchieService.releaseFromCache(item.getQbQuestion());
+	
+//	request.setAttribute("qbQuestionModified", item.getQbQuestionModified());
+
+	// set session map ID so that itemlist.jsp can get sessionMAP
+	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return "pages/authoring/parts/questionlist";
+    }
+
     /**
      * Parses questions extracted from IMS QTI file and adds them as new items.
      */