Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -116,16 +116,46 @@
 			parameter="removeQuestion">
 			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
 		</action>
-		<action path="/authoring/upQuestion"
+		
+		<!-- ==========  Authroing Definitions: Question References methods ========== -->
+		
+		<action path="/authoring/addQuestionReference"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
-			parameter="upQuestion">
+			parameter="addQuestionReference">
 			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
 		</action>
-		<action path="/authoring/downQuestion"
+		<action path="/authoring/removeQuestionReference"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
-			parameter="downQuestion">
+			parameter="removeQuestionReference">
 			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
 		</action>
+		<action path="/authoring/upQuestionReference"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
+			parameter="upQuestionReference">
+			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
+		</action>
+		<action path="/authoring/downQuestionReference"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
+			parameter="downQuestionReference">
+			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
+		</action>
+		
+		<!-- ==========  Authroing Definitions: Export/Import questions methods ========== -->
+		
+		<action path="/authoring/importInit"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
+			parameter="importInit">
+			<forward name="success" path="/pages/authoring/importQuestions.jsp" />
+		</action>
+		<action path="/authoring/importQuestions"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
+			parameter="importQuestions">
+			<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
+		</action>
+		<action path="/authoring/exportQuestions"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
+			parameter="exportQuestions">
+		</action>
 	
 		<!-- ==========  Authroing Definitions: Assessment Answer Option methods ========== -->
 		
Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
diff -u -rc7ffb298078fad531d8a90d4bc12e588b16db93b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -72,6 +72,17 @@
    session_uid bigint,
    primary key (uid)
 )type=innodb;
+create table tl_laasse10_question_reference (
+   uid bigint not null auto_increment,
+   question_uid bigint,
+   question_type smallint,
+   title varchar(255),
+   sequence_id integer,
+   default_grade integer DEFAULT 1,
+   random_question tinyint DEFAULT 0,
+   assessment_uid bigint,
+   primary key (uid)
+)type=innodb;
 create table tl_laasse10_question_option (
    uid bigint not null unique auto_increment,
    question_uid bigint,
@@ -158,6 +169,8 @@
 alter table tl_laasse10_assessment_question add index FK_NEW_1720029621_F52D1F93758092FB (create_by), add constraint FK_NEW_1720029621_F52D1F93758092FB foreign key (create_by) references tl_laasse10_user (uid);
 alter table tl_laasse10_assessment_question add index FK_NEW_1720029621_F52D1F9330E79035 (assessment_uid), add constraint FK_NEW_1720029621_F52D1F9330E79035 foreign key (assessment_uid) references tl_laasse10_assessment (uid);
 alter table tl_laasse10_assessment_question add index FK_NEW_1720029621_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_1720029621_F52D1F93EC0D3147 foreign key (session_uid) references tl_laasse10_session (uid);
+alter table tl_laasse10_question_reference add index FK_tl_laasse10_question_reference_1 (question_uid), add constraint FK_tl_laasse10_question_reference_1 foreign key (question_uid) references tl_laasse10_assessment_question (uid);
+alter table tl_laasse10_question_reference add index FK_tl_laasse10_question_reference_2 (assessment_uid), add constraint FK_tl_laasse10_question_reference_2 foreign key (assessment_uid) references tl_laasse10_assessment (uid);
 alter table tl_laasse10_question_option add index FK_tl_laasse10_question_option_1 (question_uid), add constraint FK_tl_laasse10_question_option_1 foreign key (question_uid) references tl_laasse10_assessment_question (uid);
 alter table tl_laasse10_assessment_overall_feedback add index FK_tl_laasse10_assessment_overall_feedback_1 (assessment_uid), add constraint FK_tl_laasse10_assessment_overall_feedback_1 foreign key (assessment_uid) references tl_laasse10_assessment (uid);
 alter table tl_laasse10_assessment_unit add index FK_tl_laasse10_assessment_unit_1 (question_uid), add constraint FK_tl_laasse10_assessment_unit_1 foreign key (question_uid) references tl_laasse10_assessment_question (uid);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -37,6 +37,8 @@
     public static final int INITIAL_UNITS_NUMBER = 2;
     
     public static final int INITIAL_OVERALL_FEEDBACK_NUMBER = 3;
+    
+    public static final String EXPORT_QUESTIONS_FILENAME = "questions.xml";
 
     // question type;
     public static final short QUESTION_TYPE_MULTIPLE_CHOICE = 1;
@@ -70,6 +72,8 @@
     public static final String PARAM_FILE_UUID = "fileUuid";
 
     public static final String PARAM_QUESTION_INDEX = "questionIndex";
+    
+    public static final String PARAM_QUESTION_REFERENCE_INDEX = "questionReferenceIndex";
 
     public static final String PARAM_QUESTION_UID = "questionUid";
     
@@ -117,17 +121,25 @@
     public static final String ATTR_QUESTION_TYPE = "questionType";
 
     public static final String ATTR_QUESTION_LIST = "questionList";
+    
+    public static final String ATTR_QUESTION_REFERENCES = "questionReferences";
+    
+    public static final String ATTR_AVAILABLE_QUESTIONS = "availableQuestions";
 
     public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
 
     public static final String ATTR_DELETED_QUESTION_LIST = "deleteAssessmentList";
+    
+    public static final String ATTR_DELETED_QUESTION_REFERENCES = "deleteQuestionReferences";
 
     public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
 
     public static final String ATTR_DELETED_QUESTION_ATTACHMENT_LIST = "deletedQuestionAttachmmentList";
     
     public static final String ATTR_UNIT_LIST = "unitList";
     
+    public static final String ATTR_QUESTION_REFERENCES_GRADES = "referenceGrades";
+    
     public static final String ATTR_UNIT_COUNT = "unitCount";
     
     public static final String ATTR_UNIT_UNIT_PREFIX = "unitUnit";
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
===================================================================
diff -u -rc7ffb298078fad531d8a90d4bc12e588b16db93b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql	(.../patch20110413_updateTo236.sql)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql	(.../patch20110413_updateTo236.sql)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -9,9 +9,21 @@
 ALTER TABLE tl_laasse10_assessment ADD COLUMN submission_deadline DATETIME DEFAULT null;
 
 -- LDEV-2684 Option for not displaying answers summary
-
 ALTER TABLE tl_laasse10_assessment ADD COLUMN display_summary tinyint DEFAULT false;
 
+-- LDEV-2714 Pool of questions for assessment tool 
+create table tl_laasse10_question_reference (
+   uid bigint not null auto_increment,
+   question_uid bigint,
+   question_type smallint,
+   title varchar(255),
+   sequence_id integer,
+   default_grade integer DEFAULT 1,
+   random_question tinyint DEFAULT 0,
+   assessment_uid bigint,
+   primary key (uid)
+)type=innodb;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -148,6 +148,26 @@
         </set>
 
         <set
+            name="questionReferences"
+            lazy="true"
+            inverse="false"
+            cascade="all"
+            sort="unsorted"
+            order-by="sequence_id asc"
+        >
+
+            <key
+                column="assessment_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.assessment.model.QuestionReference"
+            />
+
+        </set>
+
+        <set
             name="overallFeedbacks"
             lazy="false"
             cascade="all"
@@ -240,6 +260,14 @@
         />
 
         <property
+            name="displaySummary"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="display_summary"
+        />
+
+        <property
             name="questionsPerPage"
             type="int"
             update="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -rc7ffb298078fad531d8a90d4bc12e588b16db93b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision c7ffb298078fad531d8a90d4bc12e588b16db93b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -107,9 +107,12 @@
 
     private AssessmentUser createdBy;
 
-    // assessment questions
+    // Question bank questions
     private Set questions;
     
+    // assessment questions references that form question list
+    private Set questionReferences;
+    
     private Set overallFeedbacks;
 
     // *************** NON Persist Fields ********************
@@ -126,6 +129,7 @@
     public Assessment() {
 	attachments = new TreeSet();
 	questions = new TreeSet(new SequencableComparator());
+	questionReferences = new TreeSet(new SequencableComparator());
 	overallFeedbacks = new TreeSet(new SequencableComparator());
     }
 
@@ -146,6 +150,12 @@
 	    for (AssessmentQuestion question : questions) {
 		question.setCreateBy(toContent.getCreatedBy());
 	    }
+	    Set<QuestionReference> questionReferences = toContent.getQuestionReferences();
+	    for (QuestionReference questionReference : questionReferences) {
+		if (questionReference.getQuestion() != null) {
+		    questionReference.getQuestion().setCreateBy(toContent.getCreatedBy());
+		}
+	    }
 	}
 	return toContent;
     }
@@ -157,9 +167,11 @@
 	try {
 	    assessment = (Assessment) super.clone();
 	    assessment.setUid(null);
+	    
+	    // clone questions
 	    if (questions != null) {
 		Iterator iter = questions.iterator();
-		Set<AssessmentQuestion> set = new TreeSet<AssessmentQuestion>(new SequencableComparator());
+		TreeSet<AssessmentQuestion> set = new TreeSet<AssessmentQuestion>(new SequencableComparator());
 		while (iter.hasNext()) {
 		    AssessmentQuestion question = (AssessmentQuestion) iter.next();
 		    AssessmentQuestion newQuestion = (AssessmentQuestion) question.clone();
@@ -168,6 +180,30 @@
 		}
 		assessment.questions = set;
 	    }
+	    
+	    // clone questionReferences
+	    if (questionReferences != null) {
+		Iterator iter = questionReferences.iterator();
+		Set<QuestionReference> set = new TreeSet<QuestionReference>(new SequencableComparator());
+		while (iter.hasNext()) {
+		    QuestionReference questionReference = (QuestionReference) iter.next();
+		    QuestionReference newQuestionReference = (QuestionReference) questionReference.clone();
+		    
+		    // update questionReferences with new cloned question
+		    if (newQuestionReference.getQuestion() != null) {
+			for (AssessmentQuestion newQuestion : (Set<AssessmentQuestion>) assessment.questions) {
+			    if (newQuestion.getSequenceId() == newQuestionReference.getQuestion().getSequenceId()) {
+				newQuestionReference.setQuestion(newQuestion);
+				break;
+			    }
+			}
+		    }
+		    
+		    set.add(newQuestionReference);
+		}
+		assessment.questionReferences = set;
+	    }
+	    
 	    // clone OverallFeedbacks
 	    if (overallFeedbacks != null) {
 		Iterator iter = overallFeedbacks.iterator();
@@ -469,12 +505,28 @@
 	return questions;
     }
 
-    public void setQuestions(Set assessmentQuestions) {
-	this.questions = assessmentQuestions;
+    public void setQuestions(Set questions) {
+	this.questions = questions;
     }
     
     /**
      * 
+     * @hibernate.set lazy="true" inverse="false" cascade="all" order-by="sequence_id asc"
+     * @hibernate.collection-key column="assessment_uid"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.assessment.model.QuestionReference"
+     * 
+     * @return
+     */
+    public Set getQuestionReferences() {
+	return questionReferences;
+    }
+
+    public void setQuestionReferences(Set questionReferences) {
+	this.questionReferences = questionReferences;
+    }
+    
+    /**
+     * 
      * @hibernate.set cascade="all" order-by="sequence_id asc"
      * @hibernate.collection-key column="assessment_uid"
      * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.assessment.model.AssessmentOverallFeedback"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
diff -u -r0913693693b87a26905b6b8057969e18d7c15d8f -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision 0913693693b87a26905b6b8057969e18d7c15d8f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -29,6 +29,9 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
 
@@ -40,7 +43,7 @@
  * @hibernate.class table="tl_laasse10_assessment_question"
  * 
  */
-public class AssessmentQuestion implements Cloneable, Sequencable {
+public class AssessmentQuestion implements Cloneable, Sequencable, Comparable {
     private static final Logger log = Logger.getLogger(AssessmentQuestion.class);
 
     private Long uid;
@@ -139,17 +142,45 @@
 		obj.units = set;
 	    }
 	    
-	    // clone AssessmentUser as well
-	    if (this.createBy != null) {
-		((AssessmentQuestion) obj).setCreateBy((AssessmentUser) this.createBy.clone());
-	    }
 	} catch (CloneNotSupportedException e) {
 	    log.error("When clone " + AssessmentQuestion.class + " failed");
 	}
 
 	return obj;
     }
+    
+    @Override
+    public boolean equals(Object o) {
+	if (this == o)
+	    return true;
+	if (!(o instanceof AssessmentQuestion))
+	    return false;
 
+	final AssessmentQuestion genericEntity = (AssessmentQuestion) o;
+
+	return new EqualsBuilder().append(this.getUid(), genericEntity.getUid()).append(this.getSequenceId(), genericEntity.getSequenceId()).isEquals();
+    }
+    
+    @Override
+    public int compareTo(Object o) {
+	if ((o != null) && o instanceof AssessmentQuestion) {
+	    AssessmentQuestion anotherQuestion = (AssessmentQuestion) o;
+	    return (int) (sequenceId - anotherQuestion.getSequenceId());
+	} else {
+	    return 1;
+	}
+    }
+    
+    @Override
+    public String toString() {
+	return new ToStringBuilder(this).append("uid", getUid()).toString();
+    }
+
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(getUid()).append(getSequenceId()).toHashCode();
+    }
+
     // **********************************************************
     // Get/Set methods
     // **********************************************************
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
===================================================================
diff -u -r3fdcee6fa67ca8bbbf112bb01a95873fc76a6b0f -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java	(.../AssessmentQuestionOption.java)	(revision 3fdcee6fa67ca8bbbf112bb01a95873fc76a6b0f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java	(.../AssessmentQuestionOption.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -68,7 +68,7 @@
 	return uid;
     }
 
-    private void setUid(Long uuid) {
+    public void setUid(Long uuid) {
 	uid = uuid;
     }
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.java
===================================================================
diff -u -r1e41e09dbff6a9d1165cd1c7a1eb8e874a2b0776 -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.java	(.../AssessmentUnit.java)	(revision 1e41e09dbff6a9d1165cd1c7a1eb8e874a2b0776)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.java	(.../AssessmentUnit.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -55,7 +55,7 @@
 	return uid;
     }
 
-    private void setUid(Long uuid) {
+    public void setUid(Long uuid) {
 	uid = uuid;
     }
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.assessment.model.QuestionReference"
+        table="tl_laasse10_question_reference"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-QuestionReference.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <many-to-one
+            name="question"
+            class="org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion"
+            cascade="save-update"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="question_uid"
+        />
+
+        <property
+            name="type"
+            type="short"
+            update="true"
+            insert="true"
+            column="question_type"
+        />
+
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+            length="255"
+        />
+
+        <property
+            name="sequenceId"
+            type="int"
+            update="true"
+            insert="true"
+            column="sequence_id"
+        />
+
+        <property
+            name="defaultGrade"
+            type="int"
+            update="true"
+            insert="true"
+            column="default_grade"
+        />
+
+        <property
+            name="randomQuestion"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="random_question"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-QuestionReference.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -0,0 +1,178 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.assessment.model;
+
+import org.apache.log4j.Logger;
+
+/**
+ * Reference to the Question
+ * 
+ * @author Andrey Balan
+ * 
+ * @hibernate.class table="tl_laasse10_question_reference"
+ * 
+ */
+public class QuestionReference implements Cloneable, Sequencable {
+    private static final Logger log = Logger.getLogger(QuestionReference.class);
+
+    private Long uid;
+    
+    private AssessmentQuestion question;
+
+    private short type;
+
+    private String title;
+
+    private int sequenceId;
+
+    private int defaultGrade;
+    
+    private boolean randomQuestion;
+    
+    // ***********************************************
+    // Non persistant fields:
+    
+    public Object clone() {
+	QuestionReference obj = null;
+	try {
+	    obj = (QuestionReference) super.clone();
+	    ((QuestionReference) obj).setUid(null);
+	    
+//	    // clone AssessmentQuestion as well
+//	    if (this.question != null) {
+//		obj.setQuestion((AssessmentQuestion) this.question.clone());
+//	    }
+	    
+	} catch (CloneNotSupportedException e) {
+	    log.error("When clone " + QuestionReference.class + " failed");
+	}
+
+	return obj;
+    }
+
+    // **********************************************************
+    // Get/Set methods
+    // **********************************************************
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * @return Returns the uid.
+     */
+    public Long getUid() {
+	return uid;
+    }
+
+    /**
+     * @param uid
+     *            The uid to set.
+     */
+    public void setUid(Long userID) {
+	this.uid = userID;
+    }
+    
+    /**
+     * @hibernate.many-to-one cascade="save-update" column="question_uid"
+     * 
+     * @return
+     */
+    public AssessmentQuestion getQuestion() {
+	return question;
+    }
+
+    public void setQuestion(AssessmentQuestion question) {
+	this.question = question;
+    }
+    
+    /**
+     * @hibernate.property column="question_type"
+     * @return
+     */
+    public short getType() {
+	return type;
+    }
+
+    public void setType(short type) {
+	this.type = type;
+    }
+    
+    /**
+     * @hibernate.property column="title" length="255"
+     * @return
+     */
+    public String getTitle() {
+	return title;
+    }
+
+    public void setTitle(String title) {
+	this.title = title;
+    }
+    
+    /**
+     * Returns image sequence number.
+     * 
+     * @return image sequence number
+     * 
+     * @hibernate.property column="sequence_id"
+     */
+    public int getSequenceId() {
+	return sequenceId;
+    }
+
+    /**
+     * Sets image sequence number.
+     * 
+     * @param sequenceId
+     *                image sequence number
+     */
+    public void setSequenceId(int sequenceId) {
+	this.sequenceId = sequenceId;
+    }
+
+    /**
+     * @hibernate.property column="default_grade"
+     * 
+     * @return
+     */
+    public int getDefaultGrade() {
+	return defaultGrade;
+    }
+
+    public void setDefaultGrade(int defaultGrade) {
+	this.defaultGrade = defaultGrade;
+    }
+
+   
+    /**
+     * @hibernate.property column="random_question"
+     * @return
+     */
+    public boolean isRandomQuestion() {
+	return randomQuestion;
+    }
+
+    public void setRandomQuestion(boolean randomQuestion) {
+	this.randomQuestion = randomQuestion;
+    }
+
+}
+
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r3668b9140ab8a068884fbdd4b895cbbdfd62b35b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 3668b9140ab8a068884fbdd4b895cbbdfd62b35b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -87,6 +87,7 @@
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUnit;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
+import org.lamsfoundation.lams.tool.assessment.model.QuestionReference;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentQuestionResultComparator;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentSessionComparator;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentToolContentHandler;
@@ -212,7 +213,7 @@
     public Assessment getAssessmentByContentId(Long contentId) {
 	Assessment rs = assessmentDao.getByContentId(contentId);
 	if (rs == null) {
-	    AssessmentServiceImpl.log.error("Could not find the content by given ID:" + contentId);
+	    AssessmentServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
 	}
 	return rs;
     }
@@ -293,6 +294,10 @@
     public void deleteAssessmentQuestion(Long uid) {
 	assessmentQuestionDao.removeObject(AssessmentQuestion.class, uid);
     }
+    
+    public void deleteQuestionReference(Long uid) {
+	assessmentQuestionDao.removeObject(QuestionReference.class, uid);
+    }
 
     public List<AssessmentQuestion> getAssessmentQuestionsBySessionId(Long sessionId) {
 	AssessmentSession session = assessmentSessionDao.getSessionBySessionId(sessionId);
@@ -408,7 +413,7 @@
 		    pattern = Pattern.compile(optionString, java.util.regex.Pattern.CASE_INSENSITIVE
 			    | java.util.regex.Pattern.UNICODE_CASE);
 		}
-		boolean isAnswerCorrect = question.getAnswerString() != null ? pattern.matcher(
+		boolean isAnswerCorrect = (question.getAnswerString() != null) ? pattern.matcher(
 			question.getAnswerString()).matches() : false;
 
 		if (isAnswerCorrect) {
@@ -424,8 +429,8 @@
 		    boolean isAnswerCorrect = false;
 		    try {
 			float answerFloat = Float.valueOf(question.getAnswerString());
-			isAnswerCorrect = answerFloat >= option.getOptionFloat() - option.getAcceptedError()
-				&& answerFloat <= option.getOptionFloat() + option.getAcceptedError();
+			isAnswerCorrect = ((answerFloat >= (option.getOptionFloat() - option.getAcceptedError())) && (answerFloat <= (option
+				.getOptionFloat() + option.getAcceptedError())));
 		    } catch (Exception e) {
 		    }
 
@@ -440,9 +445,9 @@
 				try {
 				    float answerFloat = Float.valueOf(answerFloatStr);
 				    answerFloat = answerFloat / unit.getMultiplier();
-				    isAnswerCorrect = answerFloat >= option.getOptionFloat()
-					    - option.getAcceptedError()
-					    && answerFloat <= option.getOptionFloat() + option.getAcceptedError();
+				    isAnswerCorrect = ((answerFloat >= (option.getOptionFloat() - option
+					    .getAcceptedError())) && (answerFloat <= (option.getOptionFloat() + option
+					    .getAcceptedError())));
 				    if (isAnswerCorrect) {
 					break;
 				    }
@@ -609,10 +614,15 @@
 			break;
 		    }
 		}
-
 	    }
-	    userSummaryItem.setQuestionResults(questionResultsForSummary);
-	    userSummaryItems.add(userSummaryItem);
+	    
+	    //skip questions without answers
+	    if (questionResultsForSummary.isEmpty()) {
+		continue;
+	    } else {
+		userSummaryItem.setQuestionResults(questionResultsForSummary);
+		userSummaryItems.add(userSummaryItem);
+	    }
 	}
 	userSummary.setUserSummaryItems(userSummaryItems);
 
@@ -649,6 +659,9 @@
 			    break;
 			}
 		    }
+		    if (questionResult == null) {
+			continue;
+		    }
 		}
 		questionResult.setUser(user);
 		sessionQuestionResults.add(questionResult);
@@ -667,7 +680,7 @@
 		}
 	    }
 	}
-	float averageMark = count == 0 ? 0 : total / count;
+	float averageMark = (count == 0) ? 0 : total / count;
 	questionSummary.setAverageMark(averageMark);
 
 	escapeQuotes(questionSummary);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -r56a5f8af58bd37b41623b4613fed7b494f76a891 -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 56a5f8af58bd37b41623b4613fed7b494f76a891)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -134,6 +134,8 @@
      * @param uid
      */
     void deleteAssessmentQuestion(Long uid);
+    
+    void deleteQuestionReference(Long uid);
 
     /**
      * Return all reource questions within the given toolSessionID.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r6a354319198eb0836d4aab2180a42466c71744ba -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6a354319198eb0836d4aab2180a42466c71744ba)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -23,6 +23,10 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.assessment.web.action;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.sql.Timestamp;
@@ -44,6 +48,9 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.fileupload.DiskFileUpload;
+import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
@@ -55,6 +62,7 @@
 import org.apache.struts.upload.FormFile;
 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.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.model.Assessment;
@@ -64,13 +72,15 @@
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionOption;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUnit;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
+import org.lamsfoundation.lams.tool.assessment.model.QuestionReference;
 import org.lamsfoundation.lams.tool.assessment.service.AssessmentApplicationException;
 import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
 import org.lamsfoundation.lams.tool.assessment.service.UploadAssessmentFileException;
 import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
 import org.lamsfoundation.lams.tool.assessment.web.form.AssessmentForm;
 import org.lamsfoundation.lams.tool.assessment.web.form.AssessmentQuestionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -79,6 +89,8 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.thoughtworks.xstream.XStream;
+
 /**
  * @author Andrey Balan
  */
@@ -143,12 +155,29 @@
 	if (param.equals("removeQuestion")) {
 	    return removeQuestion(mapping, form, request, response);
 	}
-	if (param.equals("upQuestion")) {
-	    return upQuestion(mapping, form, request, response);
+	// ----------------------- Question Reference functions ---------------------------
+	if (param.equals("addQuestionReference")) {
+	    return addQuestionReference(mapping, form, request, response);
 	}
-	if (param.equals("downQuestion")) {
-	    return downQuestion(mapping, form, request, response);
+	if (param.equals("removeQuestionReference")) {
+	    return removeQuestionReference(mapping, form, request, response);
+	}
+	if (param.equals("upQuestionReference")) {
+	    return upQuestionReference(mapping, form, request, response);
+	}
+	if (param.equals("downQuestionReference")) {
+	    return downQuestionReference(mapping, form, request, response);
 	}	
+	// ----------------------- Import/Export Questions functions ---------------------------
+	if (param.equals("importInit")) {
+	    return importInit(mapping, form, request, response);
+	}
+	if (param.equals("importQuestions")) {
+	    return importQuestions(mapping, form, request, response);
+	}
+	if (param.equals("exportQuestions")) {
+	    return exportQuestions(mapping, form, request, response);
+	}	
 	// -----------------------Assessment Answer Option functions ---------------------------
 	if (param.equals("addOption")) {
 	    return addOption(mapping, form, request, response);
@@ -176,7 +205,7 @@
 	
 	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.
@@ -255,10 +284,20 @@
 	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.
      * 
@@ -382,7 +421,7 @@
 	assessmentPO.setAttachments(attPOSet);
 	// ************************* Handle assessment questions *******************
 	// Handle assessment questions
-	Set questionList = new LinkedHashSet();
+	Set questions = new LinkedHashSet();
 	SortedSet topics = getQuestionList(sessionMap);
 	iter = topics.iterator();
 	while (iter.hasNext()) {
@@ -391,11 +430,22 @@
 		// This flushs user UID info to message if this user is a new user.
 		question.setCreateBy(assessmentUser);
 		removeNewLineCharacters(question);
-		questionList.add(question);
+		questions.add(question);
 	    }
 	}
-	assessmentPO.setQuestions(questionList);
-	// delete instructino file from database.
+	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)
+		service.deleteQuestionReference(reference.getUid());
+	}
+	
+	// delete Questions from database.
 	List deletedQuestionList = getDeletedQuestionList(sessionMap);
 	iter = deletedQuestionList.iterator();
 	while (iter.hasNext()) {
@@ -404,6 +454,11 @@
 	    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();
@@ -482,6 +537,7 @@
 	AssessmentForm assessmentForm = (AssessmentForm) form;
 	// get back sessionMAP
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(assessmentForm.getSessionMapID());
+	updateQuestionReferencesGrades(request, sessionMap, true);
 
 	FormFile file;
 	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type))
@@ -606,6 +662,7 @@
 	    HttpServletResponse response) {
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	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; 
 	questionForm.setSessionMapID(sessionMapID);
@@ -656,6 +713,7 @@
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	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);
@@ -693,6 +751,9 @@
 	
 	AssessmentQuestionForm questionForm = (AssessmentQuestionForm) form;
 	extractFormToAssessmentQuestion(request, questionForm);
+	
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(questionForm.getSessionMapID());
+	reinitializeAvailableQuestions(sessionMap);
 
 	// set session map ID so that questionlist.jsp can get sessionMAP
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, questionForm.getSessionMapID());
@@ -715,6 +776,7 @@
 	// 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 questionIdx = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_QUESTION_INDEX), -1);
 	if (questionIdx != -1) {
@@ -726,70 +788,342 @@
 	    // add to delList
 	    List delList = getDeletedQuestionList(sessionMap);
 	    delList.add(question);
+	    
+	    //remove according questionReference, if exists
+	    SortedSet<QuestionReference> questionReferences = getQuestionReferences(sessionMap);
+	    QuestionReference questionReferenceToDelete = null;
+	    for (QuestionReference questionReference: questionReferences) {
+		if ((questionReference.getQuestion() != null)
+			&& (questionReference.getQuestion().getSequenceId() == question.getSequenceId())) {
+		    questionReferenceToDelete = questionReference;
+		}
+	    }
+	    if (questionReferenceToDelete != null) {
+		List<QuestionReference> rRefList = new ArrayList<QuestionReference>(questionReferences);
+		rRefList.remove(questionReferenceToDelete.getSequenceId() - 1);
+		questionReferences.clear();
+		questionReferences.addAll(rRefList);
+		// add to delList
+		List<QuestionReference> delReferencesList = getDeletedQuestionReferences(sessionMap);
+		delReferencesList.add(questionReferenceToDelete);
+	    }
+
 	}
+	
+	reinitializeAvailableQuestions(sessionMap);
 
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
     
     /**
-     * Move up current question.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward upQuestion(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) {
-	return switchQuestion(mapping, request, true);
-    }
+	// 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
+	QuestionReference reference = new QuestionReference();
+	int maxSeq = 1;
+	if (references != null && references.size() > 0) {
+	    QuestionReference last = references.last();
+	    maxSeq = last.getSequenceId() + 1;
+	}
+	reference.setSequenceId(maxSeq);
+	
+	//set isRandomQuestion
+	boolean isRandomQuestion = (questionIdx == -1);
+	reference.setRandomQuestion(isRandomQuestion);
+	    
+	if (isRandomQuestion) { 
+	    reference.setDefaultGrade(1);
+	} else {
+	    SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
+	    AssessmentQuestion question = null;
+	    for (AssessmentQuestion questionFromList : questionList) {
+		if (questionFromList.getSequenceId() == questionIdx) {
+		    question = questionFromList;
+		    break;
+		}
+	    }
+	    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,
+	    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);
+	if (questionReferenceIdx != -1) {
+	    SortedSet<QuestionReference> questionReferences = getQuestionReferences(sessionMap);
+	    List<QuestionReference> rList = new ArrayList<QuestionReference>(questionReferences);
+	    QuestionReference questionReference = rList.remove(questionReferenceIdx);
+	    questionReferences.clear();
+	    questionReferences.addAll(rList);
+	    // add to delList
+	    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,
+	    HttpServletResponse response) {
+	return switchQuestionReferences(mapping, request, true);
+   }
+
     /**
-     * Move down current question.
+     * Move down current question reference.
      * 
      * @param mapping
      * @param form
      * @param request
      * @param response
      * @return
      */
-    private ActionForward downQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    private ActionForward downQuestionReference(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	return switchQuestion(mapping, request, false);
+	return switchQuestionReferences(mapping, request, false);
     }
 
-    private ActionForward switchQuestion(ActionMapping mapping, HttpServletRequest request, boolean up) {
+    private ActionForward switchQuestionReferences(ActionMapping mapping, HttpServletRequest request, boolean up) {
 	// 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 questionIdx = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_QUESTION_INDEX), -1);
-	if (questionIdx != -1) {
-	    SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
-	    List<AssessmentQuestion> rList = new ArrayList<AssessmentQuestion>(questionList);
+	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
-	    AssessmentQuestion question = rList.get(questionIdx);
-	    AssessmentQuestion repQuestion;
+	    QuestionReference reference = rList.get(questionReferenceIdx);
+	    QuestionReference repReference;
 	    if (up)
-		repQuestion = rList.get(--questionIdx);
+		repReference = rList.get(--questionReferenceIdx);
 	    else
-		repQuestion = rList.get(++questionIdx);
-	    int upSeqId = repQuestion.getSequenceId();
-	    repQuestion.setSequenceId(question.getSequenceId());
-	    question.setSequenceId(upSeqId);
+		repReference = rList.get(++questionReferenceIdx);
+	    int upSeqId = repReference.getSequenceId();
+	    repReference.setSequenceId(reference.getSequenceId());
+	    reference.setSequenceId(upSeqId);
 
 	    // put back list, it will be sorted again
-	    questionList.clear();
-	    questionList.addAll(rList);
+	    references.clear();
+	    references.addAll(rList);
 	}
 
 	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.
+     */
+    private ActionForward importQuestions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	AssessmentForm assessmentForm = (AssessmentForm) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT_FORM);
+	SortedSet<AssessmentQuestion> oldQuestions = getQuestionList(sessionMap);	
+	
+	List<String> ldErrorMsgs = new ArrayList<String>();
+	List<String> toolsErrorMsgs = new ArrayList<String>();
+	try {
+	    File designFile = null;
+	    Map<String, String> params = new HashMap<String, String>();
+	    String filename = null;
+
+	    String uploadPath = FileUtil.createTempDirectory("_uploaded_2questions_xml");
+
+	    DiskFileUpload fu = new DiskFileUpload();
+	    // maximum size that will be stored in memory
+	    fu.setSizeThreshold(4096);
+	    // the location for saving data that is larger than getSizeThreshold()
+	    // fu.setRepositoryPath(uploadPath);
+
+	    List fileItems = fu.parseRequest(request);
+	    Iterator iter = fileItems.iterator();
+	    while (iter.hasNext()) {
+		FileItem fi = (FileItem) iter.next();
+		// UPLOAD_FILE is input field from HTML page
+		if (!fi.getFieldName().equalsIgnoreCase("UPLOAD_FILE"))
+		    params.put(fi.getFieldName(), fi.getString());
+		else {
+		    // filename on the client
+		    filename = FileUtil.getFileName(fi.getName());
+		    designFile = new File(uploadPath + filename);
+		    fi.write(designFile);
+		}
+	    }
+
+	    String filename2 = designFile.getName();
+	    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);
+
+	    // import learning design
+	    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) {
+			AssessmentQuestion last = oldQuestions.last();
+			maxSeq = last.getSequenceId() + 1;
+		    }
+		    question.setSequenceId(maxSeq);
+		    oldQuestions.add(question);
+		}
+	    }
+	    
+	} catch (Exception e) {
+	    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);
+		    questionsToExport.add(clonedQuestion);
+		}
+		// 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());
+
+		OutputStream out = null;
+		try {
+		    out = response.getOutputStream();
+		    out.write(resultedXml.getBytes());
+		    int count = resultedXml.getBytes().length;
+		    log.debug("Wrote out " + count + " bytes");
+		    response.setContentLength(count);
+		    out.flush();
+		} catch (Exception e) {
+		    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);
+		    }
+		}
+
+	    } catch (Exception e) {
+		errors = "Unable to export tool content: " + e.toString();
+		log.error(errors);
+	    }
+
+	}
+	if (errors != null) {
+	    try {
+		PrintWriter out = response.getWriter();
+		out.write(errors);
+		out.flush();
+	    } catch (IOException e) {
+	    }
+	}
+	return null;
+    }
+
+    
+    /**
      * Ajax call, will add one more input line for new resource item instruction.
      * 
      * @param mapping
@@ -998,6 +1332,26 @@
     // Private method
     // *************************************************************************************
     /**
+     * refreshes set of all available questions for adding to question list 
+     * 
+     * @param sessionMap
+     */
+    private void reinitializeAvailableQuestions(SessionMap sessionMap) {
+	SortedSet<AssessmentQuestion> bankQuestions = getQuestionList(sessionMap);
+	SortedSet<QuestionReference> references = getQuestionReferences(sessionMap);
+	Set<AssessmentQuestion> questionsFromList = new LinkedHashSet<AssessmentQuestion>();
+	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.
      */
     private IAssessmentService getAssessmentService() {
@@ -1037,6 +1391,22 @@
 	}
 	return list;
     }
+    
+    /**
+     * List save current question references.
+     * 
+     * @param request
+     * @return
+     */
+    private SortedSet<QuestionReference> getQuestionReferences(SessionMap sessionMap) {
+	SortedSet<QuestionReference> list = (SortedSet<QuestionReference>) sessionMap
+		.get(AssessmentConstants.ATTR_QUESTION_REFERENCES);
+	if (list == null) {
+	    list = new TreeSet<QuestionReference>(new SequencableComparator());
+	    sessionMap.put(AssessmentConstants.ATTR_QUESTION_REFERENCES, list);
+	}
+	return list;
+    }
 
     /**
      * List save deleted assessment questions, which could be persisted or non-persisted questions.
@@ -1047,6 +1417,16 @@
     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.
+     * 
+     * @param request
+     * @return
+     */
+    private List getDeletedQuestionReferences(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, AssessmentConstants.ATTR_DELETED_QUESTION_REFERENCES);
+    }
 
     /**
      * If a assessment question has attahment file, and the user edit this question and change the attachment to new file, then
@@ -1273,6 +1653,29 @@
 	return mode;
     }
     
+    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());
+		} else {
+		    String gradeStr = paramMap.get(AssessmentConstants.PARAM_GRADE + questionReference.getSequenceId());
+		    grade = new Integer(gradeStr);
+		}
+		
+		questionReference.setDefaultGrade(grade);
+	    } catch (Exception e) {
+		log.debug(e.getMessage());
+	    }
+	}
+	
+	return questionReferences;
+    }
+    
     /**
      * Get answer options from <code>HttpRequest</code>
      * 
@@ -1459,6 +1862,10 @@
      */
     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;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -26,10 +26,14 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.TreeSet;
@@ -39,6 +43,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
@@ -58,6 +63,7 @@
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
+import org.lamsfoundation.lams.tool.assessment.model.QuestionReference;
 import org.lamsfoundation.lams.tool.assessment.service.AssessmentApplicationException;
 import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
 import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
@@ -145,8 +151,34 @@
 	    assessmentUser = getCurrentUser(service, toolSessionId);
 	}
 
-	List<AssessmentQuestion> questionsFromDB = service.getAssessmentQuestionsBySessionId(toolSessionId);
 	Assessment assessment = service.getAssessmentBySessionId(toolSessionId);
+	Set<QuestionReference> questionReferences = new TreeSet<QuestionReference>(new SequencableComparator());
+	questionReferences.addAll(assessment.getQuestionReferences());
+	HashMap<Long, AssessmentQuestion> questionToReferenceMap = new HashMap<Long, AssessmentQuestion>();
+	ArrayList<AssessmentQuestion> takenQuestion = new ArrayList<AssessmentQuestion>();
+	
+	//add non-random questions
+	for (QuestionReference questionReference : questionReferences) {
+	    if (!questionReference.isRandomQuestion()) {
+		AssessmentQuestion question = questionReference.getQuestion();
+		takenQuestion.add(question);
+		questionToReferenceMap.put(questionReference.getUid(), question);
+	    }
+	}
+	
+	Set<AssessmentQuestion> allQuestions = assessment.getQuestions();
+	Collection<AssessmentQuestion> availableQuestions = CollectionUtils.subtract(allQuestions, takenQuestion);
+	//add random questions (actually replacing them with real ones)
+	for (QuestionReference questionReference : questionReferences) {
+	    if (questionReference.isRandomQuestion()) {
+		//pick a random element
+		Random rand = new Random(System.currentTimeMillis());
+		AssessmentQuestion question = (AssessmentQuestion) availableQuestions.toArray()[rand.nextInt(availableQuestions.size())];
+		takenQuestion.add(question);
+		questionToReferenceMap.put(questionReference.getUid(), question);
+		availableQuestions.remove(question);
+	    }
+	}
 
 	int dbResultCount = service.getAssessmentResultCount(assessment.getUid(), assessmentUser.getUserId());
 	int attemptsAllowed = assessment.getAttemptsAllowed();
@@ -200,24 +232,22 @@
 	    }
 	}
 	
-	Set<AssessmentQuestion> questionList = new TreeSet<AssessmentQuestion>(new SequencableComparator());
-	if (questionsFromDB != null) {
-	    // remove hidden questions.
-	    for (AssessmentQuestion question : questionsFromDB) {
-		// becuase in webpage will use this login name. Here is just
-		// initialize it to avoid session close error in proxy object.
-		if (question.getCreateBy() != null) {
-		    question.getCreateBy().getLoginName();
-		}
-		questionList.add(question);
+	//sort questions
+	LinkedList<AssessmentQuestion> questionList = new LinkedList<AssessmentQuestion>();
+	for (QuestionReference questionReference : questionReferences) {
+	    AssessmentQuestion question = questionToReferenceMap.get(questionReference.getUid());
+	    // becuase in webpage will use this login name. Here is just initialize it to avoid session close error in proxy object.
+	    if (question.getCreateBy() != null) {
+		question.getCreateBy().getLoginName();
 	    }
+	    questionList.add(question);
 	}
 
 	// shuffling
 	if (assessment.isShuffled()) {
 	    ArrayList<AssessmentQuestion> shuffledList = new ArrayList<AssessmentQuestion>(questionList);
 	    Collections.shuffle(shuffledList);
-	    questionList = new LinkedHashSet<AssessmentQuestion>(shuffledList);
+	    questionList = new LinkedList<AssessmentQuestion>(shuffledList);
 	}
 	for (AssessmentQuestion question : questionList) {
 	    if (question.isShuffle() || (question.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING)) {
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -65,13 +65,25 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<c:set var="unableToSaveMsgKey" value="authoring.msg.one.question.to.be.saved" scope="request"/>
+
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-    	document.getElementById("${formID}").submit();
+    	var amountOfQuestions = $('#questionTable tr').size();
+    	var amountOfReferences = $('#referencesTable tr').size();
+
+		if( amountOfQuestions <= 1 ) {
+        	alert("<fmt:message key='${unableToSaveMsgKey}'/>");
+		} else if (amountOfReferences > amountOfQuestions) {
+			alert("<fmt:message key='label.authoring.basic.warning.too.many.questions'/>");
+		} else {
+	    	$("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
+	    	document.getElementById("${formID}").submit();
+		}
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -147,7 +147,7 @@
 	
 	<servlet-mapping>
 	    <servlet-name>Connector</servlet-name>
-	    <url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
 	
 	<servlet-mapping>
@@ -199,6 +199,13 @@
 		    <taglib-uri>tags-xml</taglib-uri>
 		    <taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
 		  </taglib>
+		  <!--  ======================================================== -->  
+		  <!--   FCKEditor Tag Library -->
+		  <!--  ======================================================== -->   
+		  <taglib>
+			  <taglib-uri>fck-editor</taglib-uri>
+			  <taglib-location>/WEB-INF/tlds/fckeditor/FCKeditor.tld</taglib-location>
+		  </taglib>
 		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -r1f4738f614e87a175a1a577a3030dc7a98b30bdf -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1f4738f614e87a175a1a577a3030dc7a98b30bdf)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -1,13 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 <c:url var="newQuestionInitUrl" value='/authoring/newQuestionInit.do'>
-	<c:param name="sessionMapID" value="${formBean.sessionMapID}" />
+	<c:param name="sessionMapID" value="${sessionMapID}" />
 </c:url>	
 
 <script lang="javascript">
 	//The panel of assessment list panel
 	var questionListTargetDiv = "#questionListArea";
-	function deleteQuestion(idx,sessionMapID){
+	function deleteQuestion(idx){
 		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
 
 		if (deletionConfirmed) {
@@ -16,40 +17,87 @@
 				url,
 				{
 					questionIndex: idx, 
-					sessionMapID: sessionMapID
+					sessionMapID: "${sessionMapID}",
+					referenceGrades: serializeReferenceGrades()
 				},
 				function(){
 					refreshThickbox();
 				}
 			);
 		};
 	}
-	function upQuestion(idx, sessionMapID){
-		var url = "<c:url value="/authoring/upQuestion.do"/>";
+	function addQuestionReference(){
+		var questionTypeDropdown = document.getElementById("questionSelect");
+		var idx = questionTypeDropdown.value;
+		
+		var url = "<c:url value="/authoring/addQuestionReference.do"/>";
 		$(questionListTargetDiv).load(
 				url,
 				{
 					questionIndex: idx, 
-					sessionMapID: sessionMapID
+					sessionMapID: "${sessionMapID}",
+					referenceGrades: serializeReferenceGrades()
 				},
 				function(){
 					refreshThickbox();
 				}
 		);
 	}
-	function downQuestion(idx, sessionMapID){
-		var url = "<c:url value="/authoring/downQuestion.do"/>";
+	function deleteQuestionReference(idx){
+		var url = "<c:url value="/authoring/removeQuestionReference.do"/>";
 		$(questionListTargetDiv).load(
+			url,
+			{
+				questionReferenceIndex: idx, 
+				sessionMapID: "${sessionMapID}",
+				referenceGrades: serializeReferenceGrades()
+			},
+			function(){
+				refreshThickbox();
+			}
+		);
+	}
+	function upQuestionReference(idx){
+		var url = "<c:url value="/authoring/upQuestionReference.do"/>";
+		$(questionListTargetDiv).load(
 				url,
 				{
-					questionIndex: idx, 
-					sessionMapID: sessionMapID
+					questionReferenceIndex: idx, 
+					sessionMapID: "${sessionMapID}",
+					referenceGrades: serializeReferenceGrades()
 				},
 				function(){
 					refreshThickbox();
 				}
 		);
 	}
+	function downQuestionReference(idx){
+		var url = "<c:url value="/authoring/downQuestionReference.do"/>";
+		$(questionListTargetDiv).load(
+				url,
+				{
+					questionReferenceIndex: idx, 
+					sessionMapID: "${sessionMapID}",
+					referenceGrades: serializeReferenceGrades()
+				},
+				function(){
+					refreshThickbox();
+				}
+		);
+	}
+	function serializeReferenceGrades(){
+		var serializedGrades = "";
+		$("[name^=grade]").each(function() {
+			serializedGrades += "&" + this.name + "="  + this.value;
+		});
+		return serializedGrades;
+	}
+	
+	function exportQuestions(){   
+	    var reqIDVar = new Date();
+		var param = "?sessionMapID=${sessionMapID}&reqID="+reqIDVar.getTime();
+		location.href="<c:url value='/authoring/exportQuestions.do'/>" + param;
+	};
 
 	function resizeIframe() {
 		if (document.getElementById('TB_iframeContent') != null) {
@@ -72,7 +120,7 @@
 	function createNewQuestionInitHref() {
 		var questionTypeDropdown = document.getElementById("questionType");
 		var questionType = questionTypeDropdown.selectedIndex + 1;
-		var newQuestionInitHref = "${newQuestionInitUrl}&questionType=" + questionType + "&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true";
+		var newQuestionInitHref = "${newQuestionInitUrl}&questionType=" + questionType + "&referenceGrades=" + encodeURIComponent(serializeReferenceGrades()) + "&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true";
 		$("#newQuestionInitHref").attr("href", newQuestionInitHref)
 	};
 	function refreshThickbox(){
@@ -125,9 +173,21 @@
 	</select>
 	
 	<a onclick="createNewQuestionInitHref();return false;" href="" class="button-add-item space-left thickbox" id="newQuestionInitHref">  
-		<fmt:message key="label.authoring.basic.add.question" />
+		<fmt:message key="label.authoring.basic.add.question.to.pool" />
 	</a>
+	
+	<c:set var="importInitUrl" >
+		<c:url value='/authoring/importInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=240&width=650
+	</c:set>
+	<a href="${importInitUrl}" class="button space-right thickbox" id="importButton" style="float: right;">  
+		<fmt:message key="label.authoring.basic.import.questions" />
+	</a>
+	
+	<a onclick="javascript:exportQuestions();" class="button space-right" id="exportButton" style="float: right;">  
+		<fmt:message key="label.authoring.basic.export.questions" />
+	</a>
 </p>
+<br>
  
 <p>
 	<iframe
Index: lams_tool_assessment/web/pages/authoring/importQuestions.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -0,0 +1,74 @@
+<%@ page language="java"  pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ include file="/common/taglibs.jsp"%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<lams:html>
+	<lams:head>
+		<title><fmt:message key="authoring.title.import" /></title>
+		<!-- ********************  CSS ********************** -->
+		<lams:css />
+		
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery-1.4.2.min.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.form.js'/>"></script>
+		<script type="text/javascript">
+			function closeWin(){
+				window.close();
+			}
+			
+			function verifyAndSubmit() {
+				if (document.getElementById("UPLOAD_FILE").value.length == 0)	{
+					var msg = "<fmt:message key="button.select.importfile"/>";
+					alert(msg);
+					return (false);
+				} else {
+	    	    	var options = { 
+		    	    	target:  parent.jQuery('#questionListArea'), 
+		    		   	success: afterRatingSubmit  // post-submit callback
+		    		}; 				
+		    		    				
+		    		$('#importForm').ajaxSubmit(options);
+				}
+			}
+			// post-submit callback 
+    		function afterRatingSubmit(responseText, statusText)  { 
+    			self.parent.refreshThickbox();
+    			self.parent.tb_remove();
+    		}  
+			
+		</script>
+	</lams:head>
+
+	<body class="stripes">
+			<div id="content">
+			<h1>
+				<fmt:message key="authoring.title.import" />
+			</h1>
+
+				<h2>
+					<fmt:message key="title.import.instruction" />
+				</h2>
+				<p>
+					&nbsp;
+				</p>
+				<p>
+					<fmt:message key="msg.import.file.format"/>
+				</p>
+				<form action="<c:url value="/authoring/importQuestions.do"/>?sessionMapID=${sessionMapID}" method="post" enctype="multipart/form-data" id="importForm">
+					<p>
+						<fmt:message key="label.import.file" />
+						<input type="file" name="UPLOAD_FILE" id="UPLOAD_FILE"/>
+						<a href="javascript:;" class="button" onclick="verifyAndSubmit();"><span class="import"><fmt:message key="button.import" /></span></a>
+					</p>
+				</form>
+
+			</div>
+			<!--closes content-->
+
+
+			<div id="footer">
+			</div>
+			<!--closes footer-->
+
+
+	</body>
+</lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r24ffa43545be19c176ebcc4cc16286e59dbf1306 -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -3,26 +3,31 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="availableQuestions" value="${sessionMap.availableQuestions}" />
 
-<div id="questionList">
+<div>
 	<h2 class="spacer-left">
 		<fmt:message key="label.authoring.basic.question.list.title" />
-		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="assessmentListArea_Busy" />
+		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="referencesArea_Busy" />
 	</h2>
 
-	<table class="alternative-color" id="questionTable" cellspacing="0">
+	<table class="alternative-color" id="referencesTable" cellspacing="0">
 		<tr>
 			<th width="20%"><fmt:message key="label.authoring.basic.list.header.type" /></th>
-			<th colspan="4"><fmt:message key="label.authoring.basic.list.header.question" /></th>
+			<th width="40%"><fmt:message key="label.authoring.basic.list.header.question" /></th>
+			<th colspan="3"><fmt:message key="label.authoring.basic.list.header.mark" /></th>
 		</tr>	
-	
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-		<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
+		<c:forEach var="questionReference" items="${sessionMap.questionReferences}" varStatus="status">
+			<c:set var="question" value="${questionReference.question}" />
 			<tr>
 				<td>
 					<span class="field-name">
 						<c:choose>
+							<c:when test="${questionReference.randomQuestion}">
+								<fmt:message key="label.authoring.basic.type.random.question" />
+							</c:when>
 							<c:when test="${question.type == 1}">
 								<fmt:message key="label.authoring.basic.type.multiple.choice" />
 							</c:when>
@@ -49,14 +54,25 @@
 				</td>
 
 				<td>
-					${question.title}
+					<c:choose>
+						<c:when test="${questionReference.randomQuestion}">
+							<fmt:message key="label.authoring.basic.random.question" />
+						</c:when>
+						<c:otherwise>
+							${question.title}
+						</c:otherwise>
+					</c:choose>
 				</td>
 				
+				<td>
+					<input name="grade${questionReference.sequenceId}" id="grade${questionReference.sequenceId}" value="${questionReference.defaultGrade}">
+				</td>
+				
 				<td width="40px" style="vertical-align:middle;">
 					<c:if test="${not status.first}">
 						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
 							border="0" title="<fmt:message key="label.authoring.basic.up"/>"
-							onclick="upQuestion(${status.index},'${sessionMapID}')">
+							onclick="upQuestionReference(${status.index})">
 						<c:if test="${status.last}">
 							<img
 								src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
@@ -73,10 +89,87 @@
 
 						<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
 							border="0" title="<fmt:message key="label.authoring.basic.down"/>"
-							onclick="downQuestion(${status.index},'${sessionMapID}')">
+							onclick="downQuestionReference(${status.index})">
 					</c:if>
 				</td>
+                
+				<td width="20px" style="vertical-align:middle;">
+					<img src="${tool}includes/images/cross.gif"
+						title="<fmt:message key="label.authoring.basic.delete" />"
+						onclick="deleteQuestionReference(${status.index})" />
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+	
+	
+	<!-- Dropdown menu for choosing a question from question bank -->
+	<c:if test="${not empty availableQuestions}">
+		<p>
+			<select id="questionSelect" style="float: left">
+				<c:if test="${fn:length(availableQuestions) > 1}">
+					<option value="-1" selected="selected"><fmt:message key="label.authoring.basic.select.random.question" /></option>
+				</c:if>
 				
+				<c:forEach var="question" items="${availableQuestions}" varStatus="status">
+					<option value="${question.sequenceId}">${question.title}</option>
+				</c:forEach>
+			</select>
+			
+			<a onclick="addQuestionReference();return false;" href="" class="button-add-item space-left" id="newQuestionInitHref2">  
+				<fmt:message key="label.authoring.basic.add.question.to.list" />
+			</a>
+		</p>
+	</c:if>
+</div>
+<br>
+
+<div>
+	<h2 class="spacer-left">
+		<fmt:message key="label.authoring.basic.question.bank.title" />
+		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="assessmentListArea_Busy" />
+	</h2>
+
+	<table class="alternative-color" id="questionTable" cellspacing="0">
+		<tr>
+			<th width="20%"><fmt:message key="label.authoring.basic.list.header.type" /></th>
+			<th colspan="3"><fmt:message key="label.authoring.basic.list.header.question" /></th>
+		</tr>	
+	
+		<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
+			<tr>
+				<td>
+					<span class="field-name">
+						<c:choose>
+							<c:when test="${question.type == 1}">
+								<fmt:message key="label.authoring.basic.type.multiple.choice" />
+							</c:when>
+							<c:when test="${question.type == 2}">
+								<fmt:message key="label.authoring.basic.type.matching.pairs" />
+							</c:when>
+							<c:when test="${question.type == 3}">
+								<fmt:message key="label.authoring.basic.type.short.answer" />
+							</c:when>
+							<c:when test="${question.type == 4}">
+								<fmt:message key="label.authoring.basic.type.numerical" />
+							</c:when>
+							<c:when test="${question.type == 5}">
+								<fmt:message key="label.authoring.basic.type.true.false" />
+							</c:when>
+							<c:when test="${question.type == 6}">
+								<fmt:message key="label.authoring.basic.type.essay" />
+							</c:when>
+							<c:when test="${question.type == 7}">
+								<fmt:message key="label.authoring.basic.type.ordering" />
+							</c:when>							
+						</c:choose>
+					</span>
+				</td>
+
+				<td>
+					${question.title}
+				</td>
+				
 				<td width="20px" style="vertical-align:middle;">
 					<c:set var="editQuestionUrl" >
 						<c:url value='/authoring/editQuestion.do'/>?sessionMapID=${sessionMapID}&questionIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true
@@ -90,18 +183,9 @@
 				<td width="20px" style="vertical-align:middle;">
 					<img src="${tool}includes/images/cross.gif"
 						title="<fmt:message key="label.authoring.basic.delete" />"
-						onclick="deleteQuestion(${status.index},'${sessionMapID}')" />
+						onclick="deleteQuestion(${status.index})" />
 				</td>
 			</tr>
 		</c:forEach>
 	</table>
 </div>
-
-<%-- This script will works when a new resoruce item submit in order to refresh "Assessment List" panel. --%>
-<script lang="javascript">
-	//if(window.top != null){
-	//	window.top.hideMessage();
-	//	var obj = window.top.document.getElementById('questionListArea');
-	//	obj.innerHTML = document.getElementById("questionList").innerHTML;
-	//}
-</script>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r47195191346a942a7269768176ffbe7feb80b6c1 -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 47195191346a942a7269768176ffbe7feb80b6c1)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
@@ -20,19 +20,13 @@
 						'userId',
 						'sessionId',
 						"<fmt:message key="label.monitoring.summary.user.name" />",
-			   	        <c:forEach var="question" items="${assessment.questions}">
-			   	     		"${question.title}", 
-			   	        </c:forEach>
 					    "<fmt:message key="label.monitoring.summary.total" />"],
 					    
 			   	colModel:[
 			   		{name:'id',index:'id', width:20, sorttype:"int"},
 			   		{name:'userId',index:'userId', width:0},
 			   		{name:'sessionId',index:'sessionId', width:0},
-			   		{name:'userName',index:'userName', width:100},
-		   	        <c:forEach var="question" items="${assessment.questions}">
-		   	     		{name:'${question.uid}', index:'${question.uid}', width:80, align:"right", sorttype:"float"},
-	   	        	</c:forEach>			   				
+			   		{name:'userName',index:'userName', width:200},
 			   		{name:'total',index:'total', width:50,align:"right",sorttype:"float", formatter:'number', formatoptions:{decimalPlaces: 2}}		
 			   	],
 			   	
@@ -71,23 +65,11 @@
    	   	     		userId:"${assessmentResult.user.userId}",
    	   	     		sessionId:"${assessmentResult.user.session.sessionId}",
    	   	     		userName:"${assessmentResult.user.lastName}, ${assessmentResult.user.firstName}",
-		   	   	  	<c:choose>
-		   	   			<c:when test="${not empty assessmentResult.questionResults}">
-				   	        <c:forEach var="questionResult" items="${assessmentResult.questionResults}">
-			   	    			${questionResult.assessmentQuestion.uid}:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>",
-	   	        			</c:forEach>		
-		   	   			</c:when>
-		   	   			<c:otherwise>
-				   	        <c:forEach var="question" items="${assessment.questions}">
-				   	     		${question.uid}:"-",
-		   	        		</c:forEach>		   	   			
-		   	   			</c:otherwise>
-		   	   		</c:choose>	
-   	   	     		
    	   	     		total:"<fmt:formatNumber value='${assessmentResult.grade}' maxFractionDigits='3'/>"
    	   	   	    });
 	        </c:forEach>
 	        
+	        var oldValue = 0;
 			jQuery("#userSummary${summary.sessionId}").jqGrid({
 				datatype: "local",
 				gridstate:"hidden",
@@ -114,16 +96,16 @@
 
 				cellurl: '<c:url value="/monitoring/saveUserGrade.do?sessionMapID=${sessionMapID}"/>',
   				cellEdit: true,
+  				afterEditCell: function (rowid,name,val,iRow,iCol){
+  					oldValue = eval(val);
+				},	 
   				afterSaveCell : function (rowid,name,val,iRow,iCol){
-					//var questionResultUid = jQuery("#session${session.sessionId}").getCell(rowid, 'questionResultUid');   || (questionResultUid=="")
   					if (isNaN(val)) {
   						jQuery("#userSummary${summary.sessionId}").restoreCell(iRow,iCol); 
   					} else {
   						var parentSelectedRowId = jQuery("#list${summary.sessionId}").getGridParam("selrow");
-  						var previousValue =  eval(jQuery("#list${summary.sessionId}").getCell(parentSelectedRowId, eval(rowid)+3));
   						var previousTotal =  eval(jQuery("#list${summary.sessionId}").getCell(parentSelectedRowId, 'total'));
-  						jQuery("#list${summary.sessionId}").setCell(parentSelectedRowId, eval(rowid)+3, val, {}, {});
-  						jQuery("#list${summary.sessionId}").setCell(parentSelectedRowId, 'total', previousTotal - previousValue + eval(val), {}, {});
+  						jQuery("#list${summary.sessionId}").setCell(parentSelectedRowId, 'total', previousTotal - oldValue + eval(val), {}, {});
   					}
 				},	  		
   				beforeSubmitCell : function (rowid,name,val,iRow,iCol){