Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -72,7 +72,7 @@
 		<!-- ==========  Survey Item : URL ========== -->
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyItemForm" 
+			name="questionForm" 
 			scope="request" 
 			validate="false"			
 			parameter="newItemInit">
@@ -82,7 +82,7 @@
 		
 		<action path="/authoring/editItemInit"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyItemForm" 
+			name="questionForm" 
 			scope="request" 
 			parameter="editItemInit" 
 			validate="false">
@@ -93,7 +93,7 @@
 		<action path="/authoring/saveOrUpdateItem"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
 			parameter="saveOrUpdateItem"
-			name="surveyItemForm" 
+			name="questionForm" 
 			scope="request" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
@@ -144,16 +144,44 @@
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
+			name="answerForm" 
+			scope="request" 
+			validate="false"
 			parameter="start" >
-			<forward name="success" path="/pages/learning/start.jsp" />
+			<forward name="success" path="/pages/learning/learning.jsp" />
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
 			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
 		</action>
-		<action path="/learning/completeItem"
+		
+		<action path="/learning/nextQuestion"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
-			parameter="complete" >
+			input="/pages/learning/learning.jsp"
+			name="answerForm" 
+			scope="request" 
+			validate="false"			
+			parameter="nextQuestion" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
 		</action>
+		<action path="/learning/previousQuestion"
+			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
+			input="/pages/learning/learning.jsp"
+			name="answerForm" 
+			scope="request" 
+			validate="false"			
+			parameter="previousQuestion" >
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>
+		
+		<action path="/learning/doSurvey"
+			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
+			input="/pages/learning/learning.jsp"
+			name="answerForm" 
+			scope="request" 
+			validate="false"			
+			parameter="doSurvey" >
+			<forward name="success" path="/pages/learning/result.jsp" />
+		</action>
+		
 		<action path="/learning/finish"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"