Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -r16209fa3982303b4f822717f45e72d490edaef99 -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 16209fa3982303b4f822717f45e72d490edaef99)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -54,6 +54,16 @@
 
         </set>
 
+        <many-to-one
+            name="content"
+            class="org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="content_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmitFilesSession.xml
Index: lams_tool_sbmt/db/sql/table-schema.sql
===================================================================
diff -u -r16209fa3982303b4f822717f45e72d490edaef99 -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 16209fa3982303b4f822717f45e72d490edaef99)
+++ lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -1,4 +1,5 @@
 alter table tl_lasbmt11_submission_details drop foreign key FK1411A53C630DDF64;
+alter table tl_lasbmt11_session drop foreign key FKEC8C77C9FC4BEA1;
 drop table if exists tl_lasbmt11_report;
 drop table if exists tl_lasbmt11_content;
 drop table if exists tl_lasbmt11_submission_details;
@@ -36,3 +37,4 @@
    primary key (session_id)
 );
 alter table tl_lasbmt11_submission_details add index FK1411A53C630DDF64 (session_id), add constraint FK1411A53C630DDF64 foreign key (session_id) references tl_lasbmt11_session (session_id);
+alter table tl_lasbmt11_session add index FKEC8C77C9FC4BEA1 (content_id), add constraint FKEC8C77C9FC4BEA1 foreign key (content_id) references tl_lasbmt11_content (content_id);
Index: lams_tool_sbmt/docs/scmhistory.txt
===================================================================
diff -u -ra69e298ddc11177689df7e3ee00c1fed40140f4b -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/docs/scmhistory.txt	(.../scmhistory.txt)	(revision a69e298ddc11177689df7e3ee00c1fed40140f4b)
+++ lams_tool_sbmt/docs/scmhistory.txt	(.../scmhistory.txt)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -1,2 +1,3 @@
 v1307200501: This version most comes from Manpreet's source code.
-v2007200501: Learner and monitoring works well version.
\ No newline at end of file
+v2007200501: Learner and monitoring works well version.
+v2107200501: Learner,monitoring and Authroing works well version. Except Authroing advance functions.
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
===================================================================
diff -u -r8ad8873eb5b2b790da1c136795b0fdc9ac89027c -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision 8ad8873eb5b2b790da1c136795b0fdc9ac89027c)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -38,6 +38,7 @@
 	/** persistent field */
 	private SubmitFilesReport report;
 
+	/** persistent field, but not cloned to avoid to clone block*/
 	private SubmitFilesSession submitFileSession;
 	
 	/** default constructor */
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java
===================================================================
diff -u -r8ad8873eb5b2b790da1c136795b0fdc9ac89027c -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision 8ad8873eb5b2b790da1c136795b0fdc9ac89027c)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -29,6 +29,9 @@
 	/** persistent field */
 	private Set submissionDetails;
 
+	/** persistent field, but not cloned to avoid to clone block*/
+	private SubmitFilesContent content;
+	
     /** full constructor */
     public SubmitFilesSession(Long sessionID,int status) {
     	this.sessionID = sessionID;
@@ -123,4 +126,18 @@
 	public void setSubmissionDetails(Set submissionDetails) {
 		this.submissionDetails = submissionDetails;
 	}
+	/**
+	 * @hibernate.many-to-one column="content_id"
+	 * 
+	 * @return Returns the content.
+	 */
+	public SubmitFilesContent getContent() {
+		return content;
+	}
+	/**
+	 * @param content The content to set.
+	 */
+	public void setContent(SubmitFilesContent content) {
+		this.content = content;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java
===================================================================
diff -u -rf66f1839407b038bc217a2af60599ac3edde342f -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	(.../SubmitFilesContentDAO.java)	(revision f66f1839407b038bc217a2af60599ac3edde342f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	(.../SubmitFilesContentDAO.java)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -7,10 +7,12 @@
 package org.lamsfoundation.lams.tool.sbmt.dao.hibernate;
 
 import net.sf.hibernate.FlushMode;
+import net.sf.hibernate.HibernateException;
 
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO;
+import org.springframework.dao.DataAccessResourceFailureException;
 
 /**
  * @author Manpreet Minhas
@@ -29,7 +31,8 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO#save(org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent)
 	 */
 	public void save(SubmitFilesContent content) {
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		this.getHibernateTemplate().saveOrUpdate(content);
+		this.getSession().setFlushMode(FlushMode.COMMIT);
+		this.getHibernateTemplate().save(content);
+		this.getHibernateTemplate().flush();
 	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -rdf1375bbde992f59d04ee895a971eb4dfa7282b1 -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision df1375bbde992f59d04ee895a971eb4dfa7282b1)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -27,6 +27,7 @@
 
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -140,6 +141,11 @@
 	public UserDTO getUserDetails(Long userID);
 	
 	public FileDetailsDTO getFileDetails(Long detailID);
-	
+	/**
+	 * Get SubmitFilesSession instance according to the given session id.
+	 * @param sessionID
+	 * @return
+	 */
+	public SubmitFilesSession getSessionById(Long sessionID);
 	public InputStream downloadFile(Long uuid, Long versionID);
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rf66f1839407b038bc217a2af60599ac3edde342f -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision f66f1839407b038bc217a2af60599ac3edde342f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -674,6 +674,9 @@
 			throw new SubmitFilesException("ItemNotFoundException occured while trying to download file " + ie.getMessage());			
 		}
 	}
+	public SubmitFilesSession getSessionById(Long sessionID){
+		return submitFilesSessionDAO.getSessionByID(sessionID);
+	}
     /**
 	 * @param toolContentId
 	 * @return
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r279fcb721d30c71b3d61cb67351348a41a9709de -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 279fcb721d30c71b3d61cb67351348a41a9709de)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -10,6 +10,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -19,6 +20,8 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.apache.struts.actions.DispatchAction;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
@@ -50,8 +53,14 @@
 		
 		Long sessionID =(Long) authForm.get("toolSessionID");
 		Long userID = (Long)authForm.get("userID");
+		//get submission information from content table.E.g., title, instruction
+		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+		SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
+		SubmitFilesContent content = session.getContent();
 		
-		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());				
+		HttpSession httpSession = request.getSession(true);
+		httpSession.setAttribute("content",content);
+		
 		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 		authForm.set("filesUploaded",filesUploaded);
 		
Index: lams_tool_sbmt/web/Login.jsp
===================================================================
diff -u -rf66f1839407b038bc217a2af60599ac3edde342f -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/web/Login.jsp	(.../Login.jsp)	(revision f66f1839407b038bc217a2af60599ac3edde342f)
+++ lams_tool_sbmt/web/Login.jsp	(.../Login.jsp)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -3,10 +3,6 @@
 <head><title>Learning Design Details</title></head>
 	
 <body>
-	<%
-		session.setAttribute("title","Submission Upload");
-		session.setAttribute("instructions","Upload you file by this tool");
-	%>
 	<form name="authoring" method="get" action="authoring.do">
 		<input type ="hidden" name="toolContentID" value="1">
 		<input type ="hidden" name="method" value="initPage">
Index: lams_tool_sbmt/web/sbmtLearner.jsp
===================================================================
diff -u -r7ce5a98708f5a561d46682de26ae44541ab23d20 -r8880f4178b1950bfd55ad3a1a94d27140bb223e3
--- lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
+++ lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
@@ -12,7 +12,7 @@
   <head>
     <html:base />
     
-    <title><c:out value="${sessionScope.title}"/></title>    
+    <title><c:out value="${content.title}"/></title>    
 	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
 	<link href="css/aqua.css" rel="stylesheet" type="text/css">
 
@@ -22,8 +22,8 @@
   </head>
   
   <body>
-  	<H1><c:out value="${sessionScope.title}"/></H1>
-  	<H2><c:out value="${sessionScope.instructions}"/></H2>
+  	<H1><c:out value="${content.title}"/></H1>
+  	<H2><c:out value="${content.instructions}"/></H2>
   	<div id="datatablecontainer">
   	<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 	<logic:present name="SbmtLearnerForm" property="filesUploaded">