Index: lams_tool_task/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/xdoclet/struts-actions.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_task/conf/xdoclet/struts-actions.xml	9 May 2008 03:45:55 -0000	1.7
+++ lams_tool_task/conf/xdoclet/struts-actions.xml	22 May 2008 07:34:35 -0000	1.8
@@ -1,6 +1,6 @@
 		<!-- ========== Action Mapping Definitions ============================== -->
 		
-		<!-- ========== BEGIN: Authroing Definitions ============================== -->
+		<!-- ========== Authroing Definitions ============================== -->
 		
 		<action path="/authoring/start"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
@@ -38,7 +38,7 @@
 			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
 		</action>
 		
-		<!-- ==========  Instrcutions File: online/offline ========== -->
+		<!-- ==========  Authroing Definitions: Instrcutions Files ========== -->
 		
 		<action path="/authoring/uploadOnlineFile"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
@@ -73,7 +73,7 @@
 			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		
-		<!-- ==========  Add taskListItem methods ========== -->
+		<!-- ==========  Authroing Definitions: Add taskListItem methods ========== -->
 		
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
@@ -116,7 +116,7 @@
 			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
 		</action>
 		
-		<!-- ==========  Add taskListCondition methods ========== -->
+		<!-- ==========  Authroing Definitions: Add taskListCondition methods ========== -->
 		
 		<action path="/authoring/showConditions"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringTaskListConditionAction"
@@ -166,47 +166,23 @@
 			parameter="downCondition">
 			<forward name="success" path="/pages/authoring/parts/conditionlist.jsp" />
 		</action>
-		
-		<!-- ==========  Review Task  ========== -->
-		
-		<action path="/reviewtask/reviewTask"
-			type="org.lamsfoundation.lams.tool.taskList.web.action.ViewItemAction"
-			name="taskListItemForm" 
-			scope="request" 
-			parameter="reviewTask" 
-			validate="false">
-			<forward name="success" path="/pages/reviewtask/reviewtask.jsp" />
-		</action>
-		<action path="/reviewtask/addNewComment"
-			type="org.lamsfoundation.lams.tool.taskList.web.action.ViewItemAction"
-			parameter="addNewComment"
-			name="taskListItemForm" 
-			scope="request" 
-			validate="false">
-			<forward name="success" path="/pages/reviewtask/reviewtask.jsp" />
-		</action>
-		<action path="/reviewtask/uploadFile"
-			type="org.lamsfoundation.lams.tool.taskList.web.action.ViewItemAction"
-			name="taskListItemForm" 
-			scope="request" 
-			validate="false"
-			parameter="uploadFile">
-			<forward name="success" path="/pages/reviewtask/reviewtask.jsp" />
-		</action>
 
-		<!-- ========== BEGIN: Learning Definitions ============================== -->
+		<!-- ========== Learning Definitions ============================== -->
 		
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
-			parameter="start" >
+			name="taskListItemForm" 
+			scope="request" 
+			parameter="start" 
+			validate="false">
 			<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"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
 			parameter="complete" >
-			<forward name="success" path="/pages/learning/learning.jsp" />
+			<forward name="success" path="/learning/start.do" />
 		</action>
 		<action path="/learning/finish"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
@@ -220,19 +196,34 @@
 			name="taskListItemForm" 
 			scope="request" 
 			validate="false">
-			<forward name="success" path="/pages/learning/addtask.jsp" />
+			<forward name="success" path="/pages/learning/parts/addtask.jsp" />
 		</action>
 		<action path="/learning/saveNewTask"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
 			parameter="saveNewTask"
 			name="taskListItemForm" 
 			scope="request" 
 			validate="false">
-			<forward name="task" path="/pages/learning/addtask.jsp" />
-			<forward name="success" path="/pages/learning/success.jsp" />
+			<forward name="task" path="/pages/learning/parts/addtask.jsp" />
+			<forward name="success" path="/pages/learning/start.jsp" />
 		</action>
 		
-		<!--  ========= Reflection =============== -->
+		<action path="/learning/addNewComment"
+			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
+			parameter="addNewComment"
+			name="taskListItemForm" 
+			scope="request" 
+			validate="false">
+			<forward name="success" path="/learning/start.do" />
+		</action>
+		<action path="/learning/uploadFile"
+			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
+			name="taskListItemForm" 
+			scope="request" 
+			validate="false"
+			parameter="uploadFile">
+			<forward name="success" path="/learning/start.do" />
+		</action>
 		
 		<action path="/learning/newReflection"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
@@ -241,19 +232,19 @@
 			parameter="newReflection" 
 			input="/pages/learning/learning.jsp" 
 			scope="request">
-			<forward name="success" path="/pages/learning/notebook.jsp" />
+			<forward name="success" path="/pages/learning/parts/notebook.jsp" />
 		</action>
 		<action path="/learning/submitReflection"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.LearningAction"
 			name="reflectionForm" 
 			validate="false" 
-			input="/pages/learning/notebook.jsp"
+			input="/pages/learning/parts/notebook.jsp"
 			parameter="submitReflection" 
 			scope="request">
 			<forward name="success" path="/pages/learning/finish.jsp" />
 		</action>
 		
-		<!-- ========== BEGIN: Monitoring Definitions ============================== -->
+		<!-- ========== Monitoring Definitions ============================== -->
 		
 		<action path="/monitoring/summary"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.MonitoringAction"
@@ -279,10 +270,11 @@
 		<action path="/monitoring/viewReflection"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.MonitoringAction"
 			parameter="viewReflection">
-			<forward name="success" path="/pages/monitoring/notebook.jsp" />
+			<forward name="success" path="/pages/monitoring/parts/notebook.jsp" />
 		</action>
-		<!-- ========== BEGIN: Common ============================== -->
 		
+		<!-- ========== Common Definitions============================== -->
+		
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.ClearSessionAction">
 		</action>