Index: lams_tool_daco/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r2b2611326286bc64cc4e22c9d16642ad038b93c3 -r9aa7e24878b41bd6baffa35e83ef392e670811c3
--- lams_tool_daco/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 2b2611326286bc64cc4e22c9d16642ad038b93c3)
+++ lams_tool_daco/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 9aa7e24878b41bd6baffa35e83ef392e670811c3)
@@ -38,8 +38,8 @@
 	<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
 </action>
 <!-- ==========  Daco Question  ========== -->
-<action path="/authoring/newQuestionInit" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
-	name="dacoQuestionForm" scope="request" validate="false" parameter="newQuestionInit">
+<action path="/authoring/newQuestion" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+	name="dacoQuestionForm" scope="request" validate="false" parameter="newQuestion">
 	<forward name="textfield" path="/pages/authoring/parts/addtextfield.jsp" />
 	<forward name="textarea" path="/pages/authoring/parts/addtextarea.jsp" />
 	<forward name="number" path="/pages/authoring/parts/addnumber.jsp" />
@@ -52,8 +52,8 @@
 	<forward name="longlat" path="/pages/authoring/parts/addlonglat.jsp" />
 </action>
 
-<action path="/authoring/editQuestionInit" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
-	name="dacoQuestionForm" scope="request" parameter="editQuestionInit" validate="false">
+<action path="/authoring/editQuestion" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+	name="dacoQuestionForm" scope="request" parameter="editQuestion" validate="false">
 	<forward name="textfield" path="/pages/authoring/parts/addtextfield.jsp" />
 	<forward name="textarea" path="/pages/authoring/parts/addtextarea.jsp" />
 	<forward name="number" path="/pages/authoring/parts/addnumber.jsp" />
@@ -99,16 +99,6 @@
 	<forward name="success" path="/pages/authoring/parts/questionattachment.jsp" />
 </action>
 
-<!-- ==========  Display Question  ========== -->
-<action path="/reviewQuestion" type="org.lamsfoundation.lams.tool.daco.web.action.ViewQuestionAction"
-	parameter="reviewQuestion">
-	<forward name="success" path="/pages/questionreview/mainframe.jsp" />
-</action>
-<action path="/nextInstruction" type="org.lamsfoundation.lams.tool.daco.web.action.ViewQuestionAction"
-	parameter="nextInstruction">
-	<forward name="success" path="/pages/questionreview/instructionsnav.jsp" />
-</action>
-
 <!-- ========== BEGIN: Learning Definitions ============================== -->
 <action path="/learning/start" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="start"
 	name="recordForm" scope="request" validate="false">
@@ -161,17 +151,9 @@
 <action path="/monitoring/summary" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="summary">
 	<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 </action>
-<action path="/monitoring/listuser" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="listuser">
-	<forward name="success" path="/pages/monitoring/userlist.jsp" />
+<action path="/monitoring/listRecords" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="listRecords">
+	<forward name="success" path="/pages/monitoring/listRecords.jsp" />
 </action>
-<action path="/monitoring/hidequestion" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
-	parameter="hidequestion">
-	<forward name="success" path="/pages/monitoring/monitoring.jsp" />
-</action>
-<action path="/monitoring/showquestion" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
-	parameter="showquestion">
-	<forward name="success" path="/pages/monitoring/monitoring.jsp" />
-</action>
 
 <action path="/monitoring/viewReflection" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
 	parameter="viewReflection">