Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.13 -r1.14
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	3 Aug 2006 17:35:53 -0000	1.13
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	3 Aug 2006 23:50:34 -0000	1.14
@@ -634,7 +634,17 @@
 
 		String activeModule=request.getParameter(ACTIVE_MODULE);
 		logger.debug("activeModule: " + activeModule);
+		
+		String onlineInstructions=request.getParameter(ONLINE_INSTRUCTIONS);
+		logger.debug("onlineInstructions: " + onlineInstructions);
+		
+		String offlineInstructions=request.getParameter(OFFLINE_INSTRUCTIONS);
+		logger.debug("offlineInstructions: " + offlineInstructions);
+		
+		sessionMap.put(ONLINE_INSTRUCTIONS_KEY, onlineInstructions);
+		sessionMap.put(OFFLINE_INSTRUCTIONS, offlineInstructions);
 
+
 		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 		logger.debug("strToolContentID: " + strToolContentID);
 		
@@ -654,7 +664,11 @@
 		
 		QaGeneralAuthoringDTO qaGeneralAuthoringDTO= QaUtils.buildGeneralAuthoringDTO(request, qaService, qaContent, qaAuthoringForm);
 		logger.debug("qaGeneralAuthoringDTO: " + qaGeneralAuthoringDTO);
+		
+	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
 
+
         Map mapQuestionContent=(Map)sessionMap.get(MAP_QUESTION_CONTENT_KEY);
         logger.debug("mapQuestionContent: " + mapQuestionContent);
         logger.debug("mapQuestionContent size: " + mapQuestionContent.size());
@@ -674,14 +688,7 @@
         qaGeneralAuthoringDTO.setActivityTitle(richTextTitle);
   		qaGeneralAuthoringDTO.setActivityInstructions(richTextInstructions);
 
-        String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-        logger.debug("onlineInstructions: " + onlineInstructions);
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
 
-        String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-        logger.debug("offlineInstructions: " + offlineInstructions);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
 	    List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY);
 	    logger.debug("attachmentList: " + attachmentList);
 	    List deletedAttachmentList=(List)sessionMap.get(DELETED_ATTACHMENT_LIST_KEY);
@@ -759,7 +766,14 @@
 
 		String activeModule=request.getParameter(ACTIVE_MODULE);
 		logger.debug("activeModule: " + activeModule);
+		
+		
+		String onlineInstructions=(String) sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
+		logger.debug("onlineInstructions: " + onlineInstructions);
 
+		String offlineInstructions=(String) sessionMap.get(OFFLINE_INSTRUCTIONS);
+		logger.debug("offlineInstructions: " + offlineInstructions);
+		
 		String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 		logger.debug("strToolContentID: " + strToolContentID);
 		
@@ -769,6 +783,8 @@
 		QaContent qaContent=qaService.loadQa(new Long(strToolContentID).longValue());
 		logger.debug("qaContent: " + qaContent);
 		
+		
+		
 		if (qaContent == null)
 		{
 			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
@@ -780,6 +796,10 @@
 		QaGeneralAuthoringDTO qaGeneralAuthoringDTO= QaUtils.buildGeneralAuthoringDTO(request, qaService, qaContent, qaAuthoringForm);
 		logger.debug("qaGeneralAuthoringDTO: " + qaGeneralAuthoringDTO);
 		
+	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
+	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
+
+		
 		qaGeneralAuthoringDTO.setSbmtSuccess( new Integer(0).toString());
         Map mapQuestionContent=(Map)sessionMap.get(MAP_QUESTION_CONTENT_KEY);
         logger.debug("mapQuestionContent: " + mapQuestionContent);
@@ -797,14 +817,7 @@
 	             qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID, defaultContentIdStr, activeModule, sessionMap, httpSessionID);
 
         
-        String onlineInstructions=(String)sessionMap.get(ONLINE_INSTRUCTIONS_KEY);
-        logger.debug("onlineInstructions: " + onlineInstructions);
-	    qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
 
-        String offlineInstructions=(String)sessionMap.get(OFFLINE_INSTRUCTIONS_KEY);
-        logger.debug("offlineInstructions: " + offlineInstructions);
-	    qaGeneralAuthoringDTO.setOfflineInstructions(offlineInstructions);
-
         String richTextTitle = (String)sessionMap.get(ACTIVITY_TITLE_KEY);
 	 	String richTextInstructions = (String)sessionMap.get(ACTIVITY_INSTRUCTIONS_KEY);
         
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaDLStarterAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java	7 Apr 2006 00:44:22 -0000	1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java	3 Aug 2006 23:50:34 -0000	1.4
@@ -106,7 +106,6 @@
 		logger.debug("init defineLater mode. removed attributes...");
 		
 		IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-		request.getSession().setAttribute(TOOL_SERVICE, qaService);
 		
 	    QaStarterAction qaStarterAction= new QaStarterAction();
 	    return qaStarterAction.executeDefineLater(mapping, form, request, response, qaService);
Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	2 Jul 2006 13:31:20 -0000	1.8
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	3 Aug 2006 23:50:40 -0000	1.9
@@ -32,13 +32,13 @@
 							<tr> 
 	 							<td> <b>  <bean:message key="label.authoring.title"/>: </b> </td>
 						 		<td NOWRAP> 
-	                                     <c:out value="${activityTitle}" escapeXml="false"/>
+	                                     <c:out value="${qaGeneralAuthoringDTO.activityTitle}" escapeXml="false"/>
 								</td> 
 						  	</tr>
 						  	<tr> 
 	 							<td> <b> <bean:message key="label.authoring.instructions"/>:  </b></td>
 						 		<td NOWRAP> 
-	                                    <c:out value="${activityInstructions}" escapeXml="false"/>
+	                                    <c:out value="${qaGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/>
 								</td>
 							</tr>
 					
@@ -47,15 +47,15 @@
 									 <b> <bean:message key="label.question1"/>:  </b>
 							 	</td>
 							  	<td>
-										<c:out value="${sessionScope.defaultQuestionContent}"  escapeXml="false"/>
+										<c:out value="${qaGeneralAuthoringDTO.defaultQuestionContent}"  escapeXml="false"/>
 							  	</td>
 						  	</tr>
 	
 				  		<!-- if there is more than just the default content start presenting them -->
-				  	 		<c:set var="queIndex" scope="session" value="1"/>
-							<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
+				  	 		<c:set var="queIndex" scope="request" value="1"/>
+							<c:forEach var="questionEntry" items="${qaGeneralAuthoringDTO.mapQuestionContent}">
 						  		<c:if test="${questionEntry.key > 1}"> 			
-									<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+									<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
 									  <tr>
 			 							<td class="field-name"> <b> <c:out value="Question ${queIndex}"/>:  </b></td>
 									  	<td>
@@ -64,7 +64,6 @@
 									  </tr>
 								</c:if> 			
 							</c:forEach>
-							<html:hidden property="toolContentId" value="${QaAuthoringForm.toolContentId}"/>
 							<html:hidden property="questionIndex"/>
 				
 						<tr>