Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -3,15 +3,15 @@
 		<action path="/authoring/start"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			parameter="start" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/start.jsp" />
 		</action>
 		<action path="/definelater"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			parameter="definelater" 
 			validate="false">
 			<forward name="forbidden" path="/pages/authoring/definelaterforbid.jsp" />
@@ -20,7 +20,7 @@
 		<action path="/authoring/init"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
@@ -30,7 +30,7 @@
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			parameter="updateContent" 
 			validate="false">
 			<forward name="author" path="/pages/authoring/authoring.jsp" />
@@ -40,38 +40,41 @@
 		<action path="/authoring/uploadOnlineFile"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="uploadOnlineFile">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 		<action path="/authoring/uploadOfflineFile"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="uploadOfflineFile">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 		<action path="/authoring/deleteOnlineFile"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="deleteOnlineFile">
 			<forward name="success" path="/pages/authoring/parts/onlinefilelist.jsp" />
 		</action>
 		<action path="/authoring/deleteOfflineFile"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="deleteOfflineFile">
 			<forward name="success" path="/pages/authoring/parts/offlinefilelist.jsp" />
 		</action>
 		<!-- ==========  Resource Item : URL ========== -->
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			name="resourceItemForm" 
+			scope="request" 
+			validate="false"			
 			parameter="newItemInit">
 			<forward name="url" path="/pages/authoring/parts/addurl.jsp" />
 			<forward name="file" path="/pages/authoring/parts/addfile.jsp" />
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
diff -u -r4812e830a27ccc4127bc6f3043258b16776f314b -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision 4812e830a27ccc4127bc6f3043258b16776f314b)
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -90,7 +90,9 @@
    last_name varchar(255),
    first_name varchar(255),
    login_name varchar(255),
-   session_id bigint,
+   session_finished smallint,
+   session_uid bigint,
+   resource_uid bigint,
    primary key (uid)
 );
 alter table tl_larsrc11_attachment add index FK1E7009430E79035 (resource_uid), add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
@@ -102,7 +104,8 @@
 alter table tl_larsrc11_item_log add index FK693580A438BF8DFE (resource_item_uid), add constraint FK693580A438BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid);
 alter table tl_larsrc11_item_log add index FK693580A441F9365D (user_uid), add constraint FK693580A441F9365D foreign key (user_uid) references tl_larsrc11_user (uid);
 alter table tl_larsrc11_session add index FK24AA78C530E79035 (resource_uid), add constraint FK24AA78C530E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
-alter table tl_larsrc11_user add index FK30113BFC506CD584 (session_id), add constraint FK30113BFC506CD584 foreign key (session_id) references tl_larsrc11_session (uid);
+alter table tl_larsrc11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
+alter table tl_larsrc11_user add index FK30113BFC309ED320 (resource_uid), add constraint FK30113BFC309ED320 foreign key (resource_uid) references tl_larsrc11_resource (uid);
 
 
 
Index: lams_tool_larsrc/db/sql/table-schema.sql
===================================================================
diff -u -r4812e830a27ccc4127bc6f3043258b16776f314b -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 4812e830a27ccc4127bc6f3043258b16776f314b)
+++ lams_tool_larsrc/db/sql/table-schema.sql	(.../table-schema.sql)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -1,114 +1,36 @@
 alter table tl_larsrc11_attachment drop foreign key FK1E7009430E79035;
 alter table tl_larsrc11_item_instruction drop foreign key FKA5665013980570ED;
+alter table tl_larsrc11_item_log drop foreign key FK63195BC938BF8DFE;
+alter table tl_larsrc11_item_log drop foreign key FK63195BC941F9365D;
 alter table tl_larsrc11_resource drop foreign key FK89093BF758092FB;
-alter table tl_larsrc11_resource_item drop foreign key FKF52D1F93758092FB;
 alter table tl_larsrc11_resource_item drop foreign key FKF52D1F9330E79035;
 alter table tl_larsrc11_resource_item drop foreign key FKF52D1F93EC0D3147;
-alter table tl_larsrc11_item_log drop foreign key FK693580A438BF8DFE;
-alter table tl_larsrc11_item_log drop foreign key FK693580A441F9365D;
+alter table tl_larsrc11_resource_item drop foreign key FKF52D1F93758092FB;
 alter table tl_larsrc11_session drop foreign key FK24AA78C530E79035;
-alter table tl_larsrc11_user drop foreign key FK30113BFC506CD584;
+alter table tl_larsrc11_user drop foreign key FK30113BFCEC0D3147;
+alter table tl_larsrc11_user drop foreign key FK30113BFC309ED320;
 drop table if exists tl_larsrc11_attachment;
 drop table if exists tl_larsrc11_item_instruction;
+drop table if exists tl_larsrc11_item_log;
 drop table if exists tl_larsrc11_resource;
 drop table if exists tl_larsrc11_resource_item;
-drop table if exists tl_larsrc11_item_log;
 drop table if exists tl_larsrc11_session;
 drop table if exists tl_larsrc11_user;
-create table tl_larsrc11_attachment (
-   uid bigint not null auto_increment,
-   file_version_id bigint,
-   file_type varchar(255),
-   file_name varchar(255),
-   file_uuid bigint,
-   create_date datetime,
-   resource_uid bigint,
-   primary key (uid)
-);
-create table tl_larsrc11_item_instruction (
-   uid bigint not null auto_increment,
-   description varchar(255),
-   sequence_id integer,
-   item_uid bigint,
-   primary key (uid)
-);
-create table tl_larsrc11_resource (
-   uid bigint not null auto_increment,
-   create_date datetime,
-   update_date datetime,
-   create_by bigint,
-   title varchar(255),
-   run_offline bit,
-   lock_on_finished bit,
-   instructions text,
-   online_instructions text,
-   offline_instructions text,
-   content_in_use bit,
-   define_later bit,
-   content_id bigint unique,
-   allow_add_files bit,
-   allow_add_urls bit,
-   mini_view_resource_number integer,
-   allow_auto_run bit,
-   primary key (uid)
-);
-create table tl_larsrc11_resource_item (
-   uid bigint not null auto_increment,
-   file_uuid bigint,
-   file_version_id bigint,
-   description varchar(255),
-   ims_schema varchar(255),
-   init_item varchar(255),
-   organization_xml text,
-   title varchar(255),
-   url text,
-   create_by bigint,
-   create_date datetime,
-   create_by_author bit,
-   is_hide bit,
-   item_type smallint,
-   file_type varchar(255),
-   file_name varchar(255),
-   open_url_new_window bit,
-   resource_uid bigint,
-   session_uid bigint,
-   primary key (uid)
-);
-create table tl_larsrc11_item_log (
-   uid bigint not null auto_increment,
-   access_date datetime,
-   resource_item_uid bigint,
-   user_uid bigint,
-   complete bit,
-   session_id bigint,
-   primary key (uid)
-);
-create table tl_larsrc11_session (
-   uid bigint not null auto_increment,
-   session_end_date datetime,
-   session_start_date datetime,
-   status integer,
-   resource_uid bigint,
-   session_id bigint,
-   session_name varchar(250),
-   primary key (uid)
-);
-create table tl_larsrc11_user (
-   uid bigint not null auto_increment,
-   user_id bigint,
-   last_name varchar(255),
-   first_name varchar(255),
-   login_name varchar(255),
-   session_id bigint,
-   primary key (uid)
-);
+create table tl_larsrc11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, resource_uid bigint, primary key (uid));
+create table tl_larsrc11_item_instruction (uid bigint not null auto_increment, description varchar(255), sequence_id integer, item_uid bigint, primary key (uid));
+create table tl_larsrc11_item_log (uid bigint not null auto_increment, access_date datetime, resource_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
+create table tl_larsrc11_resource (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_add_files bit, allow_add_urls bit, mini_view_resource_number integer, allow_auto_run bit, primary key (uid));
+create table tl_larsrc11_resource_item (uid bigint not null auto_increment, file_uuid bigint, file_version_id bigint, description varchar(255), ims_schema varchar(255), init_item varchar(255), organization_xml text, title varchar(255), url text, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, item_type smallint, file_type varchar(255), file_name varchar(255), open_url_new_window bit, resource_uid bigint, session_uid bigint, primary key (uid));
+create table tl_larsrc11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, resource_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
+create table tl_larsrc11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, content_uid bigint, session_finished bit, primary key (uid));
 alter table tl_larsrc11_attachment add index FK1E7009430E79035 (resource_uid), add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
 alter table tl_larsrc11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_larsrc11_resource_item (uid);
+alter table tl_larsrc11_item_log add index FK63195BC938BF8DFE (resource_item_uid), add constraint FK63195BC938BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid);
+alter table tl_larsrc11_item_log add index FK63195BC941F9365D (user_uid), add constraint FK63195BC941F9365D foreign key (user_uid) references tl_larsrc11_user (uid);
 alter table tl_larsrc11_resource add index FK89093BF758092FB (create_by), add constraint FK89093BF758092FB foreign key (create_by) references tl_larsrc11_user (uid);
-alter table tl_larsrc11_resource_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_larsrc11_user (uid);
 alter table tl_larsrc11_resource_item add index FKF52D1F9330E79035 (resource_uid), add constraint FKF52D1F9330E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
 alter table tl_larsrc11_resource_item add index FKF52D1F93EC0D3147 (session_uid), add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
-alter table tl_larsrc11_item_log add index FK693580A438BF8DFE (resource_item_uid), add constraint FK693580A438BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid);
-alter table tl_larsrc11_item_log add index FK693580A441F9365D (user_uid), add constraint FK693580A441F9365D foreign key (user_uid) references tl_larsrc11_user (uid);
+alter table tl_larsrc11_resource_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_larsrc11_user (uid);
 alter table tl_larsrc11_session add index FK24AA78C530E79035 (resource_uid), add constraint FK24AA78C530E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
-alter table tl_larsrc11_user add index FK30113BFC506CD584 (session_id), add constraint FK30113BFC506CD584 foreign key (session_id) references tl_larsrc11_session (uid);
+alter table tl_larsrc11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
+alter table tl_larsrc11_user add index FK30113BFC309ED320 (content_uid), add constraint FK30113BFC309ED320 foreign key (content_uid) references tl_larsrc11_resource (uid);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -rd954e17fe98a476d678ef291f332d884723ff641 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision d954e17fe98a476d678ef291f332d884723ff641)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -70,6 +70,9 @@
 	public static final String ATTR_SUMMARY_LIST = "summaryList";
 	public static final String ATTR_USER_LIST = "userList";
 	public static final String ATTR_RESOURCE_INSTRUCTION = "instructions";
+	public static final String ATTR_FINISH_LOCK = "finishLock";
+	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
+	public static final Object ATTR_RESOURCE_FORM = "resourceForm";
 	
 	//error message keys
 	public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java
===================================================================
diff -u -r27653cd039c7a5c282fed7bb692473179a4d89ec -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java	(.../ResourceUserDAO.java)	(revision 27653cd039c7a5c282fed7bb692473179a4d89ec)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java	(.../ResourceUserDAO.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -27,6 +27,8 @@
 
 public interface ResourceUserDAO extends DAO {
 
-	ResourceUser getUserByUserID( Long userUid);
+	ResourceUser getUserByUserIDAndSessionID(Long userID, Long sessionId);
 
+	ResourceUser getUserByUserIDAndContentID(Long userId, Long contentId);
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java
===================================================================
diff -u -rd94c8065dd1c7acac3e5b6f1125f15960f26c0b3 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java	(.../ResourceUserDAOHibernate.java)	(revision d94c8065dd1c7acac3e5b6f1125f15960f26c0b3)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java	(.../ResourceUserDAOHibernate.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -31,14 +31,22 @@
 
 public class ResourceUserDAOHibernate extends BaseDAOHibernate implements ResourceUserDAO{
 	
-	private static final String FIND_BY_USER_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =?";
+	private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =? and u.content.contentId=?";
+	private static final String FIND_BY_USER_ID_SESSION_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?";
 
-	public ResourceUser getUserByUserID(Long userID) {
-		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID,userID);
+	public ResourceUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
+		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId});
 		if(list == null || list.size() == 0)
 			return null;
 		return (ResourceUser) list.get(0);
 	}
 
+	public ResourceUser getUserByUserIDAndContentID(Long userId, Long contentId) {
+		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId});
+		if(list == null || list.size() == 0)
+			return null;
+		return (ResourceUser) list.get(0);
+	}
 
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -r062b4d69562dc693b0677f9a7a75ae619f39cb63 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision 062b4d69562dc693b0677f9a7a75ae619f39cb63)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -102,6 +102,15 @@
 		defaultContent.toolContentHandler = resourceToolContentHandler;
 		toContent = (Resource) defaultContent.clone();
 		toContent.setContentId(contentId);
+		
+		//reset user info as well
+		if(toContent.getCreatedBy() != null){
+			toContent.getCreatedBy().setResource(toContent);
+			Set<ResourceItem> items = toContent.getResourceItems();
+			for(ResourceItem item:items){
+				item.setCreateBy(toContent.getCreatedBy());
+			}
+		}
 		return toContent;
 	}
   	public Object clone(){
@@ -146,9 +155,9 @@
   				resource.attachments = set;
   			}
   			//clone ReourceUser as well
-  			if(this.createdBy != null)
+  			if(this.createdBy != null){
   				resource.setCreatedBy((ResourceUser) this.createdBy.clone());
-  			
+  			}
 		} catch (CloneNotSupportedException e) {
 			log.error("When clone " + Resource.class + " failed");
 		} catch (ItemNotFoundException e) {
@@ -389,7 +398,7 @@
 	/**
      *
      * @hibernate.set   lazy="true"
-     * 					cascade="all"
+     * 					cascade="all-delete-orphan"
      * 					inverse="false"
      * 					order-by="create_date desc"
      * @hibernate.collection-key column="resource_uid"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -115,7 +115,7 @@
         <many-to-one
             name="createBy"
             class="org.lamsfoundation.lams.tool.rsrc.model.ResourceUser"
-            cascade="save-update"
+            cascade="none"
             outer-join="auto"
             update="true"
             insert="true"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -222,7 +222,7 @@
 		}
 		/**
 	     * @hibernate.many-to-one
-	     *     cascade="save-update"
+	     *     cascade="none"
 	     * 		column="create_by"
 		 * 
 		 * @return
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml
===================================================================
diff -u -r0b23a62859775434b92eba6cfa99d25a5cc19758 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision 0b23a62859775434b92eba6cfa99d25a5cc19758)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -46,7 +46,7 @@
         <many-to-one
             name="user"
             class="org.lamsfoundation.lams.tool.rsrc.model.ResourceUser"
-            cascade="save-update"
+            cascade="none"
             outer-join="auto"
             update="true"
             insert="true"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java
===================================================================
diff -u -r0b23a62859775434b92eba6cfa99d25a5cc19758 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	(.../ResourceItemVisitLog.java)	(revision 0b23a62859775434b92eba6cfa99d25a5cc19758)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	(.../ResourceItemVisitLog.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -75,7 +75,7 @@
 	}
 	/**
 	 * @hibernate.many-to-one  column="user_uid"
- 	 * cascade="save-update"
+ 	 * cascade="none"
 	 * @return
 	 */
 	public ResourceUser getUser() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -67,9 +67,27 @@
             outer-join="auto"
             update="true"
             insert="true"
-            column="session_id"
+            column="session_uid"
         />
 
+        <many-to-one
+            name="content"
+            class="org.lamsfoundation.lams.tool.rsrc.model.Resource"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="content_uid"
+        />
+
+        <property
+            name="sessionFinished"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="session_finished"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ResourceUser.xml
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java
===================================================================
diff -u -rc991c60f5a604ed7f71309d0ebe8971eea102642 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	(.../ResourceUser.java)	(revision c991c60f5a604ed7f71309d0ebe8971eea102642)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	(.../ResourceUser.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -45,7 +45,10 @@
 	private String firstName;
 	private String lastName;
 	private String loginName;
+	private boolean sessionFinished;
+	
 	private ResourceSession session;
+	private Resource resource;
 	
 	//=============== NON Persisit value: for display use ===========
 	//the user access some reousrce item date time. Use in monitoring summary page
@@ -59,7 +62,18 @@
 		this.lastName = user.getLastName();
 		this.loginName = user.getLogin();
 		this.session = session;
+		this.resource = null;
+		this.sessionFinished = false;
 	}
+	public ResourceUser(UserDTO user, Resource content){
+		this.userId = new Long(user.getUserID().intValue());
+		this.firstName = user.getFirstName();
+		this.lastName = user.getLastName();
+		this.loginName = user.getLogin();
+		this.session = null;
+		this.resource = content;
+		this.sessionFinished = false;
+	}
 	/**
 	 * Clone method from <code>java.lang.Object</code>
 	 */
@@ -143,7 +157,7 @@
 		this.loginName = loginName;
 	}
 	/**
-	 * @hibernate.many-to-one column="session_id"
+	 * @hibernate.many-to-one column="session_uid"
 	 * 			cascade="none"
 	 * @return
 	 */
@@ -154,6 +168,28 @@
 	public void setSession(ResourceSession session) {
 		this.session = session;
 	}
+	/**
+	 * @hibernate.many-to-one column="resource_uid"
+	 * 			cascade="none"
+	 * @return
+	 */
+	public Resource getResource() {
+		return resource;
+	}
+	public void setResource(Resource content) {
+		this.resource = content;
+	}
+	/**
+	 * @hibernate.property column="session_finished"
+	 * @return
+	 */
+	public boolean isSessionFinished() {
+		return sessionFinished;
+	}
+
+	public void setSessionFinished(boolean sessionFinished) {
+		this.sessionFinished = sessionFinished;
+	}
 	
 	public boolean equals(Object obj) {
 		if (this == obj)
@@ -180,4 +216,5 @@
 		this.accessDate = accessDate;
 	}
 
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -95,12 +95,21 @@
 	 */
 	void createUser(ResourceUser resourceUser);
 	/**
-	 * Get user by given userID.
+	 * Get user by given userID and toolContentID.
 	 * @param long1
 	 * @return
 	 */
-	ResourceUser getUserByID(Long userID);
+	ResourceUser getUserByIDAndContent(Long userID, Long contentId); 
 
+	/**
+	 * Get user by sessionID and UserID
+	 * @param long1
+	 * @param sessionId
+	 * @return
+	 */
+	ResourceUser getUserByIDAndSession(Long long1, Long sessionId); 
+
+
 	//********** Repository methods ***********************
 	/**
 	 * Delete file from repository.
@@ -194,6 +203,7 @@
 	 * @return
 	 */
 	public List<Summary> exportBySessionId(Long sessionId, boolean skipHide);
-	public List<List<Summary>> exportByContentId(Long contentId); 
+	public List<List<Summary>> exportByContentId(Long contentId);
+
 }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r08afbd42add64dcb44f8accb9595bd125bd9ebae -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 08afbd42add64dcb44f8accb9595bd125bd9ebae)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -256,11 +256,16 @@
 	}
 
 
-	public ResourceUser getUserByID(Long userUid) {
+	public ResourceUser getUserByIDAndContent(Long userId, Long contentId) {
 		
-		return (ResourceUser) resourceUserDao.getUserByUserID(userUid);
+		return (ResourceUser) resourceUserDao.getUserByUserIDAndContentID(userId,contentId);
 		
 	}
+	public ResourceUser getUserByIDAndSession(Long userId, Long sessionId)  {
+		
+		return (ResourceUser) resourceUserDao.getUserByUserIDAndSessionID(userId,sessionId);
+		
+	}
 
 
 	public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws ResourceApplicationException {
@@ -419,7 +424,7 @@
 			log = new ResourceItemVisitLog();
 			ResourceItem item = resourceItemDao.getByUid(resourceItemUid);
 			log.setResourceItem(item);
-			ResourceUser user = resourceUserDao.getUserByUserID(userId); 
+			ResourceUser user = resourceUserDao.getUserByUserIDAndSessionID(userId, sessionId);
 			log.setUser(user);
 			log.setSessionId(sessionId);
 			log.setAccessDate(new Timestamp(new Date().getTime()));
@@ -435,7 +440,7 @@
 			log = new ResourceItemVisitLog();
 			ResourceItem item = resourceItemDao.getByUid(resourceItemUid);
 			log.setResourceItem(item);
-			ResourceUser user = resourceUserDao.getUserByUserID(userId); 
+			ResourceUser user = resourceUserDao.getUserByUserIDAndSessionID(userId, sessionId);
 			log.setUser(user);
 			log.setComplete(false);
 			log.setSessionId(sessionId);
@@ -446,10 +451,14 @@
 
 
 	public String finishToolSession(Long toolSessionId, Long userId) throws ResourceApplicationException {
-		ResourceSession session = resourceSessionDao.getSessionBySessionId(toolSessionId);
-		session.setStatus(ResourceConstants.COMPLETED);
-		resourceSessionDao.saveObject(session);
+		ResourceUser user = resourceUserDao.getUserByUserIDAndSessionID(userId, toolSessionId);
+		user.setSessionFinished(true);
+		resourceUserDao.saveObject(user);
 		
+//		ResourceSession session = resourceSessionDao.getSessionBySessionId(toolSessionId);
+//		session.setStatus(ResourceConstants.COMPLETED);
+//		resourceSessionDao.saveObject(session);
+		
 		String nextUrl = null;
 		try {
 			nextUrl = this.leaveToolSession(toolSessionId,userId);
@@ -788,14 +797,15 @@
 			
 //			reset it to new toolContentId
 			toolContentObj.setContentId(toolContentId);
-			ResourceUser user = resourceUserDao.getUserByUserID(new Long(newUserUid.longValue()));
+			ResourceUser user = resourceUserDao.getUserByUserIDAndSessionID(new Long(newUserUid.longValue()), toolContentId);
 			if(user == null){
 				user = new ResourceUser();
 				UserDTO sysUser = ((User)userManagementService.findById(User.class,newUserUid)).getUserDTO();
 				user.setFirstName(sysUser.getFirstName());
 				user.setLastName(sysUser.getLastName());
 				user.setLoginName(sysUser.getLogin());
 				user.setUserId(new Long(newUserUid.longValue()));
+				user.setResource(toolContentObj);
 			}
 			toolContentObj.setCreatedBy(user);
 			
@@ -1073,4 +1083,4 @@
 
 
 
-}
+}
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r0323e71ffd563ef7cd2bc6560e0fc5428f998268 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0323e71ffd563ef7cd2bc6560e0fc5428f998268)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -23,7 +23,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.rsrc.web.action;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.sql.Timestamp;
@@ -73,6 +72,7 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -90,7 +90,7 @@
 	private static Logger log = Logger.getLogger(AuthoringAction.class);
 	
 	public ActionForward execute(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+			HttpServletRequest request, HttpServletResponse response) throws Exception{
 		
 		String param = mapping.getParameter();
 		//-----------------------Resource Author function ---------------------------
@@ -194,13 +194,20 @@
 	 * @return
 	 */
 	private ActionForward removeItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		
+//		get back sessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
+		
 		int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),-1);
 		if(itemIdx != -1){
-			List<ResourceItem> resourceList = getResourceItemList(request);
+			List<ResourceItem> resourceList = getResourceItemList(sessionMap);
 			ResourceItem item = resourceList.remove(itemIdx);
-			List delList = getDeletedResourceItemList(request);
+			List delList = getDeletedResourceItemList(sessionMap);
 			delList.add(item);
-		}		
+		}	
+		
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	
@@ -213,10 +220,15 @@
 	 * @return
 	 */
 	private ActionForward editItemInit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		
+//		get back sessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
+		
 		int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),-1);
 		ResourceItem item = null;
 		if(itemIdx != -1){
-			List<ResourceItem> resourceList = getResourceItemList(request);
+			List<ResourceItem> resourceList = getResourceItemList(sessionMap);
 			item = resourceList.get(itemIdx);
 			if(item != null){
 				populateItemToForm(itemIdx, item,(ResourceItemForm) form,request);
@@ -233,6 +245,9 @@
 	 * @return
 	 */
 	private ActionForward newItemlInit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+		((ResourceItemForm)form).setSessionMapID(sessionMapID);
+		
 		short type = (short) NumberUtils.stringToInt(request.getParameter(ITEM_TYPE));
 		List instructionList = new ArrayList(INIT_INSTRUCTION_COUNT);
 		for(int idx=0;idx<INIT_INSTRUCTION_COUNT;idx++){
@@ -279,7 +294,8 @@
 				return findForward(itemForm.getItemType(),mapping);
 			}
 		}
-		
+		//set session map ID so that itemlist.jsp can get sessionMAP
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, itemForm.getSessionMapID());
 		//return null to close this window
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
@@ -335,19 +351,26 @@
 	 * method run successfully. 
 	 *  
 	 * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
+	 * @throws ServletException 
 	 * 
 	 */
-	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException {
+		
 		//save toolContentID into HTTPSession
 		Long contentId = new Long(WebUtil.readLongParam(request,ResourceConstants.PARAM_TOOL_CONTENT_ID));
-		request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID,contentId);
 		
 //		get back the resource and item list and display them on page
 		IResourceService service = getResourceService();
 
 		List items = null;
 		Resource resource = null;
 		ResourceForm resourceForm = (ResourceForm)form;
+
+		//initial Session Map 
+		SessionMap sessionMap = new SessionMap();
+		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		resourceForm.setSessionMapID(sessionMap.getSessionID());
+		
 		try {
 			resource = service.getResourceByContentId(contentId);
 			//if resource does not exist, try to use default content instead.
@@ -363,23 +386,24 @@
 			resourceForm.setResource(resource);
 
 			//initialize instruction attachment list
-			List attachmentList = getAttachmentList(request);
+			List attachmentList = getAttachmentList(sessionMap);
 			attachmentList.clear();
 			attachmentList.addAll(resource.getAttachments());
 		} catch (Exception e) {
 			log.error(e);
-			return mapping.findForward(ResourceConstants.ERROR);
+			throw new ServletException(e);
 		}
 		
 		//init it to avoid null exception in following handling
 		if(items == null)
 			items = new ArrayList();
 		
 		//init resource item list
-		List resourceItemList = getResourceItemList(request);
+		List resourceItemList = getResourceItemList(sessionMap);
 		resourceItemList.clear();
 		resourceItemList.addAll(items);
 		
+		sessionMap.put(ResourceConstants.ATTR_RESOURCE_FORM, resourceForm);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
@@ -391,9 +415,21 @@
 	 * @param request
 	 * @param response
 	 * @return
+	 * @throws ServletException 
 	 */
 	private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
+			HttpServletResponse response) throws ServletException {
+		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
+		ResourceForm existForm = (ResourceForm) sessionMap.get(ResourceConstants.ATTR_RESOURCE_FORM);
+		
+		ResourceForm resourceForm = (ResourceForm )form;
+		try {
+			PropertyUtils.copyProperties(resourceForm, existForm);
+		} catch (Exception e) {
+			throw new ServletException(e);
+		}
+		
 		ToolAccessMode mode = getAccessMode(request);
 		if(mode.isAuthor())
 			return mapping.findForward(ResourceConstants.SUCCESS);
@@ -408,143 +444,141 @@
 	 * @param request
 	 * @param response
 	 * @return
+	 * @throws ServletException 
 	 */
 	private ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
+			HttpServletResponse response) throws Exception {
 		ResourceForm resourceForm = (ResourceForm)(form);
+		
+		//get back sessionMAP
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(resourceForm.getSessionMapID());
+		
 		ToolAccessMode mode = getAccessMode(request);
     	
 		Resource resource = resourceForm.getResource();
-		try {
-			IResourceService service = getResourceService();
-			
-			//*******************************Handle user*******************
-			//try to get form system session
-			HttpSession ss = SessionManager.getSession();
-			//get back login user DTO
-			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			ResourceUser resourceUser = service.getUserByID(new Long(user.getUserID().intValue()));
-			if(resourceUser == null){
-				resourceUser = new ResourceUser(user,null);
-				service.createUser(resourceUser);
+		IResourceService service = getResourceService();
+		
+		//**********************************Get Resource PO*********************
+		Resource resourcePO = service.getResourceByContentId(resourceForm.getResource().getContentId());
+		if(resourcePO == null){
+			//new Resource, create it.
+			resourcePO = resource;
+			resourcePO.setCreated(new Timestamp(new Date().getTime()));
+			resourcePO.setUpdated(new Timestamp(new Date().getTime()));
+		}else{
+			if(mode.isAuthor()){
+				Long uid = resourcePO.getUid();
+				PropertyUtils.copyProperties(resourcePO,resource);
+				//get back UID
+				resourcePO.setUid(uid);
+			}else{ //if it is Teacher, then just update basic tab content (definelater)
+				resourcePO.setInstructions(resource.getInstructions());
+				resourcePO.setTitle(resource.getTitle());
+				resourcePO.setDefineLater(false);
 			}
-			
-			//**********************************Get Resource PO*********************
-			Resource resourcePO = service.getResourceByContentId(resourceForm.getToolContentID());
-			if(resourcePO == null || !resourceForm.getToolContentID().equals(resource.getContentId()) ){
-				//new Resource, create it.
-				resourcePO = resource;
-				resourcePO.setContentId(resourceForm.getToolContentID());
-				resourcePO.setCreated(new Timestamp(new Date().getTime()));
-				resourcePO.setUpdated(new Timestamp(new Date().getTime()));
-			}else{
-				if(mode.isAuthor()){
-					Long uid = resourcePO.getUid();
-					PropertyUtils.copyProperties(resourcePO,resource);
-					//get back UID
-					resourcePO.setUid(uid);
-				}else{ //if it is Teacher, then just update basic tab content (definelater)
-					resourcePO.setInstructions(resource.getInstructions());
-					resourcePO.setTitle(resource.getTitle());
-					resourcePO.setDefineLater(false);
-				}
-				resourcePO.setUpdated(new Timestamp(new Date().getTime()));
-			}
-			resourcePO.setCreatedBy(resourceUser);
-			
-			//**********************************Handle Authoring Instruction Attachement *********************
-	    	//merge attachment info
-			Set attPOSet = resourcePO.getAttachments();
-			if(attPOSet == null)
-				attPOSet = new HashSet();
-			List attachmentList = getAttachmentList(request);
-			List deleteAttachmentList = getDeletedAttachmentList(request);
-			
-			//current attachemnt in authoring instruction tab.
-			Iterator iter = attachmentList.iterator();
-			while(iter.hasNext()){
-				ResourceAttachment newAtt = (ResourceAttachment) iter.next();
-				//add new attachment if UID is not null
-				if(newAtt.getUid() == null)
-					attPOSet.add(newAtt);
-			}
-			attachmentList.clear();
-			
-			//deleted attachment. 2 possible types: one is persist another is non-persist before.
-			iter = deleteAttachmentList.iterator();
-			while(iter.hasNext()){
-				ResourceAttachment delAtt = (ResourceAttachment) iter.next();
-				iter.remove();
-				//delete from repository
-				service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
-				//it is an existed att, then delete it from current attachmentPO
-				if(delAtt.getUid() != null){
-					Iterator attIter = attPOSet.iterator();
-					while(attIter.hasNext()){
-						ResourceAttachment att = (ResourceAttachment) attIter.next();
-						if(delAtt.getUid().equals(att.getUid())){
-							attIter.remove();
-							break;
-						}
+			resourcePO.setUpdated(new Timestamp(new Date().getTime()));
+		}
+		
+		//*******************************Handle user*******************
+		//try to get form system session
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		ResourceUser resourceUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue())
+						,resourceForm.getResource().getContentId());
+		if(resourceUser == null){
+			resourceUser = new ResourceUser(user,resourcePO);
+		}
+		
+		resourcePO.setCreatedBy(resourceUser);
+		
+		//**********************************Handle Authoring Instruction Attachement *********************
+    	//merge attachment info
+		Set attPOSet = resourcePO.getAttachments();
+		if(attPOSet == null)
+			attPOSet = new HashSet();
+		List attachmentList = getAttachmentList(sessionMap);
+		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
+		
+		//current attachemnt in authoring instruction tab.
+		Iterator iter = attachmentList.iterator();
+		while(iter.hasNext()){
+			ResourceAttachment newAtt = (ResourceAttachment) iter.next();
+			attPOSet.add(newAtt);
+		}
+		attachmentList.clear();
+		
+		//deleted attachment. 2 possible types: one is persist another is non-persist before.
+		iter = deleteAttachmentList.iterator();
+		while(iter.hasNext()){
+			ResourceAttachment delAtt = (ResourceAttachment) iter.next();
+			iter.remove();
+			//delete from repository
+			service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
+			//it is an existed att, then delete it from current attachmentPO
+			if(delAtt.getUid() != null){
+				Iterator attIter = attPOSet.iterator();
+				while(attIter.hasNext()){
+					ResourceAttachment att = (ResourceAttachment) attIter.next();
+					if(delAtt.getUid().equals(att.getUid())){
+						attIter.remove();
+						break;
 					}
-					service.deleteResourceAttachment(delAtt.getUid());
-				}//end remove from persist value
-			}
-			
-			//copy back
-			resourcePO.setAttachments(attPOSet);
-			//************************* Handle resource items *******************
-			//Handle resource items
-			Set itemList = new LinkedHashSet();
-			List topics = getResourceItemList(request);
-	    	iter = topics.iterator();
-	    	while(iter.hasNext()){
-	    		ResourceItem item = (ResourceItem) iter.next();
-	    		if(item != null){
-    				//This flushs user UID info to message if this user is a new user. 
-    				item.setCreateBy(resourceUser);
-    				item.setCreateDate(new Timestamp(new Date().getTime()));
-    				itemList.add(item);
-	    		}
-	    	}
-	    	resourcePO.setResourceItems(itemList);
-	    	//delete them from database.
-	    	List delResourceItemList = getDeletedResourceItemList(request);
-	    	iter = delResourceItemList.iterator();
-	    	while(iter.hasNext()){
-	    		ResourceItem item = (ResourceItem) iter.next();
-	    		iter.remove();
-	    		if(item.getUid() != null)
-	    			service.deleteResourceItem(item.getUid());
-	    		if(item.getFileUuid() != null && item.getFileVersionId() != null)
-	    			service.deleteFromRepository(item.getFileUuid(),item.getFileVersionId());
-	    	}
-	    	//handle resource item attachment file:
-	    	List delItemAttList = getDeletedItemAttachmentList(request);
-			iter = delItemAttList.iterator();
-			while(iter.hasNext()){
-				ResourceItem delAtt = (ResourceItem) iter.next();
-				iter.remove();
-				//delete from repository
-				service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
-			}
-			
-			//if miniview number is bigger than available items, then force it to 1
-			if(resourcePO.getMiniViewResourceNumber() > topics.size())
-				resourcePO.setMiniViewResourceNumber((topics.size()==0?0:1));
-			//**********************************************
-			//finally persist resourcePO again
-			service.saveOrUpdateResource(resourcePO);
-			
-			//initialize attachmentList again
-			attachmentList = getAttachmentList(request);
-			attachmentList.addAll(resource.getAttachments());
-			resourceForm.setResource(resourcePO);
-			
-		} catch (Exception e) {
-			log.error(e);
+				}
+				service.deleteResourceAttachment(delAtt.getUid());
+			}//end remove from persist value
 		}
-
+		
+		//copy back
+		resourcePO.setAttachments(attPOSet);
+		//************************* Handle resource items *******************
+		//Handle resource items
+		Set itemList = new LinkedHashSet();
+		List topics = getResourceItemList(sessionMap);
+    	iter = topics.iterator();
+    	while(iter.hasNext()){
+    		ResourceItem item = (ResourceItem) iter.next();
+    		if(item != null){
+				//This flushs user UID info to message if this user is a new user. 
+				item.setCreateBy(resourceUser);
+				item.setCreateDate(new Timestamp(new Date().getTime()));
+				itemList.add(item);
+    		}
+    	}
+    	resourcePO.setResourceItems(itemList);
+    	//delete them from database.
+    	List delResourceItemList = getDeletedResourceItemList(sessionMap);
+    	iter = delResourceItemList.iterator();
+    	while(iter.hasNext()){
+    		ResourceItem item = (ResourceItem) iter.next();
+    		iter.remove();
+    		if(item.getUid() != null)
+    			service.deleteResourceItem(item.getUid());
+    		if(item.getFileUuid() != null && item.getFileVersionId() != null)
+    			service.deleteFromRepository(item.getFileUuid(),item.getFileVersionId());
+    	}
+    	//handle resource item attachment file:
+    	List delItemAttList = getDeletedItemAttachmentList(sessionMap);
+		iter = delItemAttList.iterator();
+		while(iter.hasNext()){
+			ResourceItem delAtt = (ResourceItem) iter.next();
+			iter.remove();
+			//delete from repository
+			service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
+		}
+		
+		//if miniview number is bigger than available items, then force it to 1
+		if(resourcePO.getMiniViewResourceNumber() > topics.size())
+			resourcePO.setMiniViewResourceNumber((topics.size()==0?0:1));
+		//**********************************************
+		//finally persist resourcePO again
+		service.saveOrUpdateResource(resourcePO);
+		
+		//initialize attachmentList again
+		attachmentList = getAttachmentList(sessionMap);
+		attachmentList.addAll(resource.getAttachments());
+		resourceForm.setResource(resourcePO);
+		
 		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
     	if(mode.isAuthor())
     		return mapping.findForward("author");
@@ -559,9 +593,10 @@
 	 * @param request
 	 * @param response
 	 * @return
+	 * @throws UploadResourceFileException 
 	 */
 	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+			HttpServletRequest request, HttpServletResponse response) throws UploadResourceFileException {
 		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE,request);
 	}
 	/**
@@ -571,9 +606,10 @@
 	 * @param request
 	 * @param response
 	 * @return
+	 * @throws UploadResourceFileException 
 	 */
 	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+			HttpServletRequest request, HttpServletResponse response) throws UploadResourceFileException {
 		return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE,request);
 	}
 	/**
@@ -583,65 +619,57 @@
 	 * @param type
 	 * @param request
 	 * @return
+	 * @throws UploadResourceFileException 
 	 */
 	private ActionForward uploadFile(ActionMapping mapping, ActionForm form,
-			String type,HttpServletRequest request) {
+			String type,HttpServletRequest request) throws UploadResourceFileException {
 
 		ResourceForm resourceForm = (ResourceForm) form;
-		
+		//get back sessionMAP
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(resourceForm.getSessionMapID());
+
 		FormFile file;
 		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type))
 			file = (FormFile) resourceForm.getOfflineFile();
 		else
 			file = (FormFile) resourceForm.getOnlineFile();
 		
-		ActionErrors errors = new ActionErrors();
-		try {
-			IResourceService service = getResourceService();
-			//upload to repository
-			ResourceAttachment  att = service.uploadInstructionFile(file, type);
-			//handle session value
-			List attachmentList = getAttachmentList(request);
-			List deleteAttachmentList = getDeletedAttachmentList(request);
-			//first check exist attachment and delete old one (if exist) to deletedAttachmentList
-			Iterator iter = attachmentList.iterator();
-			ResourceAttachment existAtt;
-			while(iter.hasNext()){
-				existAtt = (ResourceAttachment) iter.next();
-				if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
-					//if there is same name attachment, delete old one
-					deleteAttachmentList.add(existAtt);
-					iter.remove();
-					break;
-				}
+		IResourceService service = getResourceService();
+		//upload to repository
+		ResourceAttachment  att = service.uploadInstructionFile(file, type);
+		//handle session value
+		List attachmentList = getAttachmentList(sessionMap);
+		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
+		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
+		Iterator iter = attachmentList.iterator();
+		ResourceAttachment existAtt;
+		while(iter.hasNext()){
+			existAtt = (ResourceAttachment) iter.next();
+			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+				//if there is same name attachment, delete old one
+				deleteAttachmentList.add(existAtt);
+				iter.remove();
+				break;
 			}
-			//add to attachmentList
-			attachmentList.add(att);
-			
-			//update Html FORM, this will echo back to web page for display
-			List list;
-			if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
-				list = resourceForm.getOfflineFileList();
-				if(list == null){
-					list = new ArrayList();
-					resourceForm.setOfflineFileList(list);
-				}
-			}else{
-				list = resourceForm.getOnlineFileList();
-				if(list == null){
-					list = new ArrayList();
-					resourceForm.setOnlineFileList(list);
-				}
-			}
-			list.add(att);
-		} catch (UploadResourceFileException e) {
-			log.error("Upload instruction attachment failed:" + e.getMessage());
-			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_UPLOAD_FAILED,e.getMessage()));
 		}
+		//add to attachmentList
+		attachmentList.add(att);
 		
-		if(!errors.isEmpty())
-			this.addErrors(request,errors);
+		//update Html FORM, this will echo back to web page for display
+		List onlineFileList = new ArrayList();
+		List offlineFileList = new ArrayList();
+		iter = attachmentList.iterator();
+		while(iter.hasNext()){
+			ResourceAttachment attFile = (ResourceAttachment) iter.next();
+			if(StringUtils.equalsIgnoreCase(attFile.getFileType(),IToolContentHandler.TYPE_OFFLINE))
+				offlineFileList.add(attFile);
+			else
+				onlineFileList.add(attFile);
+		}
+		resourceForm.setOnlineFileList(onlineFileList);
+		resourceForm.setOfflineFileList(offlineFileList);
 		
+		
 		return mapping.findForward(ResourceConstants.SUCCESS);
 
 	}
@@ -683,39 +711,30 @@
 		Long versionID = new Long(WebUtil.readLongParam(request,ResourceConstants.PARAM_FILE_VERSION_ID));
 		Long uuID = new Long(WebUtil.readLongParam(request,ResourceConstants.PARAM_FILE_UUID));
 		
+		//get back sessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
+		
 		//handle session value
-		List attachmentList = getAttachmentList(request);
-		List deleteAttachmentList = getDeletedAttachmentList(request);
+		List attachmentList = getAttachmentList(sessionMap);
+		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
 		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
 		Iterator iter = attachmentList.iterator();
 		ResourceAttachment existAtt;
+		List leftAttachments = new ArrayList();
 		while(iter.hasNext()){
 			existAtt = (ResourceAttachment) iter.next();
 			if(existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
-				//remove from attachemnt
 				iter.remove();
-				break;
+			}else if(StringUtils.equals(existAtt.getFileType(),type) ){
+				leftAttachments.add(existAtt);
 			}
+				
 		}
-		
-		//handle web page display
-		List leftAttachments;
+
 		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
-			leftAttachments = ((ResourceForm)form).getOfflineFileList();
-		}else{
-			leftAttachments = ((ResourceForm)form).getOnlineFileList();
-		}
-		iter = leftAttachments.iterator();
-		while(iter.hasNext()){
-			ResourceAttachment att = (ResourceAttachment) iter.next();
-			if(versionID.equals(att.getFileVersionId()) && uuID.equals(att.getFileUuid())){
-				iter.remove();
-				break;
-			}
-		}
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
 			request.setAttribute("offlineFileList",leftAttachments);
 		}else{
 			request.setAttribute("onlineFileList",leftAttachments);
@@ -737,31 +756,31 @@
 	 * @param request
 	 * @return
 	 */
-	private List getAttachmentList(HttpServletRequest request) {
-		return getListFromSession(request,ResourceConstants.ATT_ATTACHMENT_LIST);
+	private List getAttachmentList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ResourceConstants.ATT_ATTACHMENT_LIST);
 	}
 	/**
 	 * @param request
 	 * @return
 	 */
-	private List getDeletedAttachmentList(HttpServletRequest request) {
-		return getListFromSession(request,ResourceConstants.ATTR_DELETED_ATTACHMENT_LIST);
+	private List getDeletedAttachmentList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ResourceConstants.ATTR_DELETED_ATTACHMENT_LIST);
 	}
 	/**
 	 * List save current resource items.
 	 * @param request
 	 * @return
 	 */
-	private List getResourceItemList(HttpServletRequest request) {
-		return getListFromSession(request,ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
+	private List getResourceItemList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
 	}	
 	/**
 	 * List save deleted resource items, which could be persisted or non-persisted items. 
 	 * @param request
 	 * @return
 	 */
-	private List getDeletedResourceItemList(HttpServletRequest request) {
-		return getListFromSession(request,ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
+	private List getDeletedResourceItemList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
 	}
 	/**
 	 * If a resource item has attahment file, and the user edit this item and change the attachment
@@ -770,8 +789,8 @@
 	 * @param request
 	 * @return
 	 */
-	private List getDeletedItemAttachmentList(HttpServletRequest request) {
-		return getListFromSession(request,ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);
+	private List getDeletedItemAttachmentList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);
 	}
 
 
@@ -782,16 +801,17 @@
 	 * @param name
 	 * @return
 	 */
-	private List getListFromSession(HttpServletRequest request,String name) {
-		List list = (List) request.getSession().getAttribute(name);
+	private List getListFromSession(SessionMap sessionMap,String name) {
+		List list = (List) sessionMap.get(name);
 		if(list == null){
 			list = new ArrayList();
-			request.getSession().setAttribute(name,list);
+			sessionMap.put(name,list);
 		}
 		return list;
 	}
 	
 	
+	
 	/**
 	 * Get resource items instruction from <code>HttpRequest</code>
 	 * @param request
@@ -900,8 +920,9 @@
 		 * this resource item.
 		 */
 		
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(itemForm.getSessionMapID());
 		//check whether it is "edit(old item)" or "add(new item)"
-		List resourceList = getResourceItemList(request);
+		List resourceList = getResourceItemList(sessionMap);
 		int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(),-1);
 		ResourceItem item;
 		
@@ -951,7 +972,7 @@
 				}
 				//put it after "upload" to ensure deleted file added into list only no exception happens during upload 
 				if(hasOld){
-					List delAtt = getDeletedItemAttachmentList(request);
+					List delAtt = getDeletedItemAttachmentList(sessionMap);
 					delAtt.add(delAttItem);
 				}
 			}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
===================================================================
diff -u -r62210e3b3fc129093d235b83d585690eff4e0752 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 62210e3b3fc129093d235b83d585690eff4e0752)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -42,13 +42,7 @@
 	@Override
 	public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
 		if(mode.isAuthor()){
-			session.removeAttribute(AttributeNames.ATTR_MODE);
-			session.removeAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID);
-			session.removeAttribute(ResourceConstants.ATT_ATTACHMENT_LIST);
-			session.removeAttribute(ResourceConstants.ATTR_DELETED_ATTACHMENT_LIST);
-			session.removeAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
-			session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
-			session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);
+			session.removeAttribute(customiseSessionID);
 		}
 	}
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -r1e633dd70ea6f5461605ec545fd608e876354db0 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -151,6 +151,7 @@
 	private ActionForward saveOrUpdateItem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		
+		Long sessionId = (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
 		String mode = request.getParameter(AttributeNames.ATTR_MODE);
 		ResourceItemForm itemForm = (ResourceItemForm)form;
 		ActionErrors errors = validateResourceItem(itemForm);
@@ -164,15 +165,7 @@
 		//create a new ResourceItem
 		ResourceItem item = new ResourceItem(); 
 		IResourceService service = getResourceService();
-		//try to get form system session
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		ResourceUser resourceUser = service.getUserByID(new Long(user.getUserID().intValue()));
-		if(resourceUser == null){
-			resourceUser = new ResourceUser(user,null);
-			service.createUser(resourceUser);
-		}
+		ResourceUser resourceUser = getCurrentUser(service,sessionId);
 		item.setType(type);
 		item.setTitle(itemForm.getTitle());
 		item.setDescription(itemForm.getDescription());
@@ -193,7 +186,7 @@
 			item.setOpenUrlNewWindow(itemForm.isOpenUrlNewWindow());
 		}
 		//save and update session
-		Long sessionId = (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		
 		ResourceSession resSession = service.getResourceSessionBySessionId(sessionId);
 		if(resSession == null){
 			log.error("Failed update ResourceSession by ID[" + sessionId + "]");
@@ -232,15 +225,7 @@
 		
 //		get back the resource and item list and display them on page
 		IResourceService service = getResourceService();
-		//try to get form system session
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		ResourceUser resourceUser = service.getUserByID(new Long(user.getUserID().intValue()));
-		if(resourceUser == null){
-			resourceUser = new ResourceUser(user,null);
-			service.createUser(resourceUser);
-		}
+		ResourceUser resourceUser = getCurrentUser(service,sessionId);
 
 		List<ResourceItem> items = null;
 		Resource resource;
@@ -252,6 +237,7 @@
 			return mapping.findForward(ResourceConstants.ERROR);
 		}
 		
+		
 		//add define later support
 		if(resource.isDefineLater()){
 			return mapping.findForward("defineLater");
@@ -294,6 +280,10 @@
 		}
 		request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,new Boolean(runAuto));
 		
+		//check whehter finish lock is on/off
+		boolean lock = resource.getLockWhenFinished() && resourceUser.isSessionFinished();
+		request.getSession().setAttribute(ResourceConstants.ATTR_FINISH_LOCK,lock);
+		
 		//set contentInUse flag to true!
 		resource.setContentInUse(true);
 		resource.setDefineLater(false);
@@ -302,6 +292,7 @@
 		request.setAttribute(AttributeNames.ATTR_MODE,mode);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
+
 	//*************************************************************************************
 	// Private method 
 	//*************************************************************************************
@@ -359,6 +350,21 @@
 		}
 		return forward;
 	}
+
+	private ResourceUser getCurrentUser(IResourceService service, Long sessionId) {
+		//try to get form system session
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		ResourceUser resourceUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),sessionId);
+		
+		if(resourceUser == null){
+			ResourceSession session = service.getResourceSessionBySessionId(sessionId);
+			resourceUser = new ResourceUser(user,session);
+			service.createUser(resourceUser);
+		}
+		return resourceUser;
+	}
 	/**
 	 * @param itemForm
 	 * @return
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
diff -u -ra780ca2abc108cb1fc24396a2429461b7973f16a -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision a780ca2abc108cb1fc24396a2429461b7973f16a)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -49,8 +49,10 @@
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
 import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -104,7 +106,11 @@
 	 */
 	private ActionForward nextInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		ResourceItem item = getResourceItem(request, mode);
+		
+		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sesionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
+
+		ResourceItem item = getResourceItem(request, sesionMap, mode);
 		if(item == null){
 			return mapping.findForward(ResourceConstants.ERROR);
 		}
@@ -136,7 +142,8 @@
 			navDto.setCurrent(0);
 			navDto.setInstruction(null);
 		}
-			
+		
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID,sessionMapID);
 		request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION,navDto);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
@@ -151,7 +158,11 @@
 	 */
 	private ActionForward reviewItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		ResourceItem item = getResourceItem(request, mode);
+		
+		String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
+		
+		ResourceItem item = getResourceItem(request,sessionMap, mode);
 
 		String idStr = request.getParameter(ResourceConstants.ATTR_TOOL_SESSION_ID);
 		Long sessionId = NumberUtils.createLong(idStr);
@@ -167,8 +178,9 @@
 		if(item == null){
 			return mapping.findForward(ResourceConstants.ERROR);
 		}
-		if(item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT)
-			request.getSession().setAttribute(ResourceConstants.ATT_LEARNING_OBJECT,item);
+		if(item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
+			sessionMap.put(ResourceConstants.ATT_LEARNING_OBJECT,item);
+		}
 		//set url to content frame
 		request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL,getReviewUrl(item));
 		
@@ -179,6 +191,7 @@
 		Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 		request.setAttribute(ResourceConstants.PARAM_RESOURCE_ITEM_UID,itemUid);
 		request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID,sessionId);
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID,sessionMapID);
 		
 		return mapping.findForward(ResourceConstants.SUCCESS);
 		
@@ -189,15 +202,16 @@
 	/**
 	 * Return resoruce item according to ToolAccessMode.
 	 * @param request
+	 * @param sessionMap 
 	 * @param mode
 	 * @return
 	 */
-	private ResourceItem getResourceItem(HttpServletRequest request, String mode) {
+	private ResourceItem getResourceItem(HttpServletRequest request, SessionMap sessionMap, String mode) {
 		ResourceItem item = null;		
 		if(ResourceConstants.MODE_AUTHOR_SESSION.equals(mode)){
 			int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),0);
 			//authoring: does not save item yet, so only has ItemList from session and identity by Index
-			List<ResourceItem> resourceList = getResourceItemList(request);
+			List<ResourceItem> resourceList = getResourceItemList(sessionMap);
 			item = resourceList.get(itemIdx);
 		}else{
 			Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
@@ -262,8 +276,8 @@
 	 * @param request
 	 * @return
 	 */
-	private List getResourceItemList(HttpServletRequest request) {
-		return getListFromSession(request,ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
+	private List getResourceItemList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
 	}	
 	/**
 	 * Get <code>java.util.List</code> from HttpSession by given name.
@@ -272,11 +286,11 @@
 	 * @param name
 	 * @return
 	 */
-	private List getListFromSession(HttpServletRequest request,String name) {
-		List list = (List) request.getSession().getAttribute(name);
+	private List getListFromSession(SessionMap sessionMap,String name) {
+		List list = (List) sessionMap.get(name);
 		if(list == null){
 			list = new ArrayList();
-			request.getSession().setAttribute(name,list);
+			sessionMap.put(name,list);
 		}
 		return list;
 	}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
===================================================================
diff -u -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -52,7 +52,7 @@
 	private static Logger logger = Logger.getLogger(ResourceForm.class.getName());
 
 	//Forum fields
-	private Long toolContentID;
+	private String sessionMapID;
 	private int currentTab;
     private FormFile offlineFile;
     private FormFile onlineFile;
@@ -62,7 +62,6 @@
     private Resource resource;
     
     public ResourceForm(){
-    	this.toolContentID = new Long(0);
     	resource = new Resource();
     	resource.setTitle("Shared Resource");
     	currentTab = 1;
@@ -72,7 +71,6 @@
         this.resource = resource;
         //set Form special varaible from given forum
         if(resource != null){
-        	this.toolContentID = resource.getContentId();
     		onlineFileList = new ArrayList();
     		offlineFileList = new ArrayList();
     		Set fileSet = resource.getAttachments();
@@ -154,17 +152,16 @@
 	}
 
 
-	public Long getToolContentID() {
-		return toolContentID;
+	public Resource getResource() {
+		return resource;
 	}
 
-
-	public void setToolContentID(Long toolContentID) {
-		this.toolContentID = toolContentID;
+	public String getSessionMapID() {
+		return sessionMapID;
 	}
 
-	public Resource getResource() {
-		return resource;
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
 	}
 
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	(.../ResourceItemForm.java)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	(.../ResourceItemForm.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -34,6 +34,8 @@
  */
 public class ResourceItemForm extends ActionForm {
 	private String itemIndex;
+	private String sessionMapID;
+	
 	private String title;
 	private short itemType;
 	private String description;
@@ -112,4 +114,10 @@
 	public void setOpenUrlNewWindow(boolean openUrlNewWindow) {
 		this.openUrlNewWindow = openUrlNewWindow;
 	}
+	public String getSessionMapID() {
+		return sessionMapID;
+	}
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
+	}
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -91,7 +91,7 @@
 			throw new ResourceApplicationException(error);
 		}
 
-		ResourceUser learner = service.getUserByID(userID);
+		ResourceUser learner = service.getUserByIDAndSession(userID,toolSessionID);
 
 		if (learner == null) {
 			String error = "The user with user id " + userID + " does not exist.";
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r356eb906d0a80130e76929e9cd914b57304887ff -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 356eb906d0a80130e76929e9cd914b57304887ff)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -117,9 +117,10 @@
 					</td>
 				</tr>
 			</table>
-	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
+	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="toolContentID" />
+		<html:hidden property="resource.contentId" />
+		<html:hidden property="sessionMapID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
 
 			<!-- tab content 1 (Basic) -->
@@ -142,7 +143,9 @@
 				cancelConfirmMsgKey="authoring.msg.cancel.save"
 				accessMode="author"
 			--%>
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
+				toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.resource.contentId}" 
+				 customiseSessionID="${formBean.sessionMapID}" />
 	</html:form>
 
 </div>
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -ra780ca2abc108cb1fc24396a2429461b7973f16a -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a780ca2abc108cb1fc24396a2429461b7973f16a)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -8,36 +8,40 @@
 	 */
 	function showMessage(url) {
 		var area=document.getElementById("reourceInputArea");
-		area.style.width="670px";
-		area.style.height="100%";
-		area.src=url;
-		area.style.display="block";
+		if(area != null){
+			area.style.width="670px";
+			area.style.height="100%";
+			area.src=url;
+			area.style.display="block";
+		}
 	}
 	function hideMessage(){
 		var area=document.getElementById("reourceInputArea");
-		area.style.width="0px";
-		area.style.height="0px";
-		area.style.display="none";
+		if(area != null){
+			area.style.width="0px";
+			area.style.height="0px";
+			area.style.display="none";
+		}
 	}
 
-	function previewItem(type,idx){
+	function previewItem(type,idx,sessionMapID){
 		//1:url, 2:file, 3:website,4:learning object
 		//This mode is special for unsaved author page. It is different with the author mode in preview 
-		var myUrl = "<c:url value='/reviewItem.do?mode=author_session&itemIndex='/>"+idx;
+		var myUrl = "<c:url value='/reviewItem.do?mode=author_session&itemIndex='/>"+idx+"&sessionMapID="+sessionMapID;
 		launchPopup(myUrl,"Review");
 	}
 	
-	function editItem(idx){
+	function editItem(idx,sessionMapID){
 		 var reqIDVar = new Date();
-		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&reqID="+reqIDVar.getTime();
+		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
 		showMessage(url);
 	}
 	//The panel of resource list panel
 	var resourceListTargetDiv = "resourceListArea";
-	function deleteItem(idx){
+	function deleteItem(idx,sessionMapID){
 		var url = "<c:url value="/authoring/removeItem.do"/>";
 	    var reqIDVar = new Date();
-		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime();
+		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
 		deleteItemLoading();
 	    var myAjax = new Ajax.Updater(
 		    	resourceListTargetDiv,
@@ -71,6 +75,7 @@
 		<tr>
 			<td colspan="2">
 				<div id="resourceListArea">
+						<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
 						<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
 				</div>
 			</td>
@@ -80,22 +85,22 @@
 				<table class="forms">
 					<tr>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=1"/>');">
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=1"/>');">
 								<fmt:message key="label.authoring.basic.add.url" />
 							</a>
 						</td>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=2"/>');">
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=2"/>');">
 								<fmt:message key="label.authoring.basic.add.file" />
 							</a>
 						</td>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=3"/>');">
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=3"/>');">
 								<fmt:message key="label.authoring.basic.add.website" />
 							</a>
 						</td>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=4"/>');">
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=4"/>');">
 								<fmt:message key="label.authoring.basic.add.learning.object"/>
 							</a>
 						</td>
Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp
===================================================================
diff -u -rae9f5cc7e20e299c6f3b1ce692e62a33fa5d33b3 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision ae9f5cc7e20e299c6f3b1ce692e62a33fa5d33b3)
+++ lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -53,7 +53,7 @@
 <div id="page">
 	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="toolContentID" />
+		<html:hidden property="resource.contentId" />
 		<html:hidden property="mode" value="teacher"/>
 		
 		<h1>
@@ -72,7 +72,7 @@
 
 
 			<!-- Button Row -->
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}"  accessMode="teacher" defineLater="yes" />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.resource.toolContentID}"  accessMode="teacher" defineLater="yes" />
 
 			<lams:HTMLEditor />
 		</div>
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
diff -u -rd8d9eacb02e91757a196f5f0550b7cc509260f8f -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision d8d9eacb02e91757a196f5f0550b7cc509260f8f)
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -8,7 +8,7 @@
 	function deleteOfflineFile(fileUuid,fileVersionId){
 		var url = "<c:url value="/authoring/deleteOfflineFile.do"/>";
 	    var reqIDVar = new Date();
-		var param = "fileUuid=" + fileUuid + "&fileVersionId="+ fileVersionId+"&reqID="+reqIDVar.getTime();
+		var param = "sessionMapID=${formBean.sessionMapID}&fileUuid=" + fileUuid + "&fileVersionId="+ fileVersionId+"&reqID="+reqIDVar.getTime();
 		offlineLoading();
 	    var myAjax = new Ajax.Updater(
 		    	offlineArea,
@@ -24,7 +24,7 @@
 	function deleteOnlineFile(fileUuid,fileVersionId){
 		var url = "<c:url value="/authoring/deleteOnlineFile.do"/>";
 	    var reqIDVar = new Date();
-		var param = "fileUuid=" + fileUuid + "&fileVersionId="+ fileVersionId+"&reqID="+reqIDVar.getTime();
+		var param = "sessionMapID=${formBean.sessionMapID}&fileUuid=" + fileUuid + "&fileVersionId="+ fileVersionId+"&reqID="+reqIDVar.getTime();
 		onlineLoading();
 	    var myAjax = new Ajax.Updater(
 		    	onlineArea,
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r1efde1c1b8cfa99147c5ea22d9139c1406f39da8 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 1efde1c1b8cfa99147c5ea22d9139c1406f39da8)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -41,6 +41,7 @@
 					<%@ include file="/common/messages.jsp"%>
 					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
 						<input type="hidden" name="instructionList" id="instructionList" />
+						<html:hidden property="sessionMapID" />
 						<input type="hidden" name="itemType" id="itemType" value="2" />
 						<html:hidden property="itemIndex" />
 						<table class="innerforms">
@@ -90,7 +91,7 @@
 			</tr>
 			<tr>
 				<td align="center" valign="bottom">
-					<a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.file" /></a>
+					<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.file" /></a>  <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> 
 				</td>
 			</tr>
 			<tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -r1efde1c1b8cfa99147c5ea22d9139c1406f39da8 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 1efde1c1b8cfa99147c5ea22d9139c1406f39da8)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -40,6 +40,7 @@
 				<td>
 					<%@ include file="/common/messages.jsp"%>
 					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
+						<html:hidden property="sessionMapID" />
 						<input type="hidden" name="instructionList" id="instructionList" />
 						<input type="hidden" name="itemType" id="itemType" value="4" />
 						<html:hidden property="itemIndex" />
@@ -91,7 +92,7 @@
 			</tr>
 			<tr>
 				<td align="center" valign="bottom">
-					<a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.learning.object" /></a>
+					<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.learning.object" /></a> <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> 
 				</td>
 			</tr>
 			<tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -re282626ec944f8f72229d180aebe1484ef4bf490 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision e282626ec944f8f72229d180aebe1484ef4bf490)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -38,6 +38,7 @@
 				<td>
 					<%@ include file="/common/messages.jsp"%>
 					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+						<html:hidden property="sessionMapID" />
 						<input type="hidden" name="instructionList" id="instructionList" />
 						<input type="hidden" name="itemType" id="itemType" value="1" />
 						<html:hidden property="itemIndex" />
@@ -89,7 +90,7 @@
 			</tr>
 			<tr>
 				<td align="center" valign="bottom">
-					<a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.url" /></a>
+					 <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.url" /></a>  <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a>
 				</td>
 			</tr>
 			<tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -r1efde1c1b8cfa99147c5ea22d9139c1406f39da8 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 1efde1c1b8cfa99147c5ea22d9139c1406f39da8)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -40,6 +40,7 @@
 				<td>
 					<%@ include file="/common/messages.jsp"%>
 					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
+						<html:hidden property="sessionMapID" />
 						<input type="hidden" name="instructionList" id="instructionList" />
 						<input type="hidden" name="itemType" id="itemType" value="3" />
 						<html:hidden property="itemIndex" />
@@ -91,7 +92,7 @@
 			</tr>
 			<tr>
 				<td align="center" valign="bottom">
-					<a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.website" /></a>
+					 <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.website" /></a> <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a>
 				</td>
 			</tr>
 			<tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r91331dfb80134a0a25194610b14304e22c3af422 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 91331dfb80134a0a25194610b14304e22c3af422)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -5,7 +5,9 @@
 <img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
 
 <table id="itemTable" style="align:left;width:650px" >
-<c:forEach var="resource" items="${resourceList}" varStatus="status">
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+
+<c:forEach var="resource" items="${sessionMap.resourceList}" varStatus="status">
 	<tr>
 	<%-- Resource Type:1=URL,2=File,3=Website,4=Learning Object --%>
 	<c:if test="${resource.type == 1}">
@@ -14,17 +16,17 @@
 		</td>
 		<td>${resource.title}</td>
 		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(1,${status.index})" class="button">
+			<a href="#" onclick="previewItem(1,${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.verify.url" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index})" class="button">
+			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.edit" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index})" class="button">
+			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.delete" />
 			</a>
 		</td>
@@ -35,17 +37,17 @@
 		</td>
 		<td>${resource.title}</td>
 		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(2,${status.index})" class="button">
+			<a href="#" onclick="previewItem(2,${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.preview" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index})" class="button">
+			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.edit" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index})" class="button">
+			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.delete" />
 			</a>
 		</td>
@@ -56,17 +58,17 @@
 		</td>
 		<td>${resource.title}</td>
 		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(3,${status.index})" class="button">
+			<a href="#" onclick="previewItem(3,${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.preview" />
 			</a>
 		</td>
 			<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index})" class="button">
+			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.edit" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index})" class="button">
+			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.delete" />
 			</a>
 		</td>
@@ -77,17 +79,17 @@
 		</td>
 		<td>${resource.title}</td>
 		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(4,${status.index})" class="button">
+			<a href="#" onclick="previewItem(4,${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.preview" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index})" class="button">
+			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.edit" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index})" class="button">
+			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.resource.delete" />
 			</a>
 		</td>
Index: lams_tool_larsrc/web/pages/authoring/start.jsp
===================================================================
diff -u -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
+++ lams_tool_larsrc/web/pages/authoring/start.jsp	(.../start.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -1,9 +1,10 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <body>
-<form action="<c:url value='/authoring/init.do?mode=${mode}'/>" method="post" id="startForm">
-	<input type="hidden" name="toolContentID" value="${toolContentID}"/>
-</form>
+<html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
+	<html:hidden property="resource.contentId"/>
+	<html:hidden property="sessionMapID"/>
+</html:form>
 
 <script type="text/javascript">
 document.getElementById("startForm").submit();
Index: lams_tool_larsrc/web/pages/itemreview/initnav.jsp
===================================================================
diff -u -r1dcb265570c3043908973a86db792f67133645e1 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/itemreview/initnav.jsp	(.../initnav.jsp)	(revision 1dcb265570c3043908973a86db792f67133645e1)
+++ lams_tool_larsrc/web/pages/itemreview/initnav.jsp	(.../initnav.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -6,7 +6,6 @@
 --%>
 
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%= session.getAttribute("instructionNavForm") %>" />
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -18,6 +17,7 @@
 			<c:param name="itemIndex" value="${param.itemIndex}"/>
 			<c:param name="itemUid" value="${param.itemUid}"/>
 			<c:param name="toolSessionID" value="${param.toolSessionID}"/>
+			<c:param name="sessionMapID" value="${param.sessionMapID}"/>
 		</c:redirect>
 	</body>
 </html>
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -r1e633dd70ea6f5461605ec545fd608e876354db0 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -17,7 +17,7 @@
 				//learner and author(preview mode) will mark the finish
 					if(${mode == "learner"} || ${mode == "author"}){
 					   var reqIDVar = new Date();
-					   //if auto run mode, the opener will be null
+					   //if auto run mode, the opener will be null. 
 					   if(window.parent.opener != null) 
 						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
 					   else{
@@ -31,7 +31,7 @@
 					}
 				}
 				function nextIns(currIns){
-					document.location.href="<c:url value='/nextInstruction.do'/>?mode=${mode}&insIdx=" + currIns + "&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}";
+					document.location.href="<c:url value='/nextInstruction.do'/>?mode=${mode}&insIdx=" + currIns + "&sessionMapID=${sessionMapID}&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}";
 				}
 		//-->
 		</script>
Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
===================================================================
diff -u -r1dcb265570c3043908973a86db792f67133645e1 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 1dcb265570c3043908973a86db792f67133645e1)
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -20,7 +20,7 @@
 --%>
 <%@ include file="/common/taglibs.jsp" %>
 <frameset rows="110,*" frameborder="no">
-	<frame src="<c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}" 
+	<frame src="<c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}" 
 	name=headerFrame" marginheight="0" scrolling="NO">
 	<frame src="<c:url value='${resourceItemReviewUrl}'/>" name="resourceFrame" marginheight="0" scrolling="YES">
 </frameset>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -ra04659fabae48ed06bc29ffed6af69bbd05717b3 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a04659fabae48ed06bc29ffed6af69bbd05717b3)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -97,9 +97,9 @@
 
 						<td>
 							<c:if test="${mode != 'teacher'}">
-								<a href="#" class="button" onclick="return completeItem(${item.uid})"><fmt:message key="label.completed" /></a>
+								<a href="#" class="button" onclick="return completeItem(${item.uid})"><fmt:message key="label.completed" disabled="${finishedLock}"/></a>
 							</c:if>
-							<a href="javascript:;" class="button" onclick="viewItem(${item.uid})"><fmt:message key="label.view" /></a>
+							<a href="javascript:;" class="button" onclick="viewItem(${item.uid})"><fmt:message key="label.view"  disabled="${finishedLock}"/></a>
 						</td>
 					</tr>
 				</c:forEach>
@@ -128,17 +128,17 @@
 								<fmt:message key="label.suggest.new" />
 								<c:choose>
 									<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
-										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()">
+										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()" disabled="${finishedLock}">
 										<fmt:message key="label.authoring.basic.resource.url.input" /> |
 								<input type="radio" name="suggest" value="file" onclick="gotoFile()">
 										<fmt:message key="label.authoring.basic.resource.file.input" />
 									</c:when>
 									<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
-										<input type="radio" name="suggest" value="file" checked="true" onclick="gotoFile()">
+										<input type="radio" name="suggest" value="file" checked="true" onclick="gotoFile()" disabled="${finishedLock}">
 										<fmt:message key="label.authoring.basic.resource.file.input" />
 									</c:when>
 									<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
-										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()">
+										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()" disabled="${finishedLock}">
 										<fmt:message key="label.authoring.basic.resource.url.input" />
 									</c:when>
 								</c:choose>
Index: lams_tool_larsrc/web/pages/learningobj/mainframe.jsp
===================================================================
diff -u -r318b6abe8422efe8b6bac112c6dc0fd15ba13873 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/learningobj/mainframe.jsp	(.../mainframe.jsp)	(revision 318b6abe8422efe8b6bac112c6dc0fd15ba13873)
+++ lams_tool_larsrc/web/pages/learningobj/mainframe.jsp	(.../mainframe.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -21,7 +21,7 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <frameset cols="25%,75%" rows="*">
-	<frame src="navigatortree.jsp" name="navigatorFrame" marginheight="0"  scrolling="YES">
+	<frame src="navigatortree.jsp?sessionMapID=${sessionMapID}" name="navigatorFrame" marginheight="0"  scrolling="YES">
 	<frame src="defaultcontent.jsp" name="contentFrame" marginheight="0" scrolling="YES">
 </frameset>
 
Index: lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp
===================================================================
diff -u -r152c08baf0f37ca2c6ff211d80f52f768d993638 -rc25a2c783e51d05045d1fb61981c169357cd3e98
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(.../navigatortree.jsp)	(revision 152c08baf0f37ca2c6ff211d80f52f768d993638)
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(.../navigatortree.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
@@ -27,6 +27,10 @@
 <head>
 	<html:base />
 	<%@ include file="/common/header.jsp"%>
+	
+	<c:set var="sessionMap" value="${sessionScope[param.sessionMapID]}"/>
+	<c:set var="crPackage" value="${sessionMap.crPackage}"/>
+	
 	<style type="text/css">
 	<!--
 	table {