Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 0a704617c31a5847217132f6b7cd73a4b9b43c9f)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
@@ -1,4 +1,4 @@
-		<!-- ========== Action Mapping Definitions ============================== -->
+		<!-- ========== Action Mapping Definitions ============================== 
 		<action path="/defineLater"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
@@ -7,291 +7,4 @@
 			parameter="defineLater">
 			<forward name="success" path="tiles:/monitoring/forum/defineLater" />
 		</action>
-   		
-		<!-- ========== BEGIN: Authroing Definitions ============================== -->
-		<action path="/authoring/init"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="forumForm" 
-			scope="session" 
-			parameter="initPage" 
-			validate="false">
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
-		</action>
-		
-		<action path="/authoring/update"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="forumForm" 
-			scope="session" 
-			parameter="updateContent" 
-			validate="false">
-			<forward name="author" path="/jsps/authoring/authoring.jsp" />
-			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
-		</action>
-
-		<action path="/authoring/uploadOnline"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="forumForm" 
-			scope="session" 
-			parameter="uploadOnlineFile" 
-			validate="false">
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
-		</action>
-		
-		<action path="/authoring/uploadOffline"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="forumForm" 
-			scope="session" 
-			validate="false"
-			parameter="uploadOfflineFile" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
-		</action>
-		
-		<action path="/authoring/deleteOnline"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="forumForm" 
-			scope="session" 
-			validate="false"
-			parameter="deleteOnlineFile" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
-		</action>
-		
-		<action path="/authoring/deleteOffline"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="forumForm" 
-			scope="session" 
-			validate="false"
-			parameter="deleteOfflineFile" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
-		</action>
-						
-		<action path="/authoring/newTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			parameter="newTopic">
-			<forward name="success" path="tiles:/authoring/forum/newTopic" />
-		</action>
-		
-		<action path="/authoring/createTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="messageForm" 
-			validate="true"
-			input="tiles:/authoring/forum/newTopic" 
-			parameter="createTopic"
-			scope="request">
-			<forward name="success" path="tiles:/authoring/forum/newTopic" />
-		</action>
-		
-		<action path="/authoring/deleteTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			parameter="deleteTopic">
-			<forward name="success" path="/jsps/authoring/message/delete.jsp" />
-		</action>
-		
-		<action path="/authoring/viewTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="messageForm" 
-			validate="false"
-			parameter="viewTopic"
-			scope="request">
-			<forward name="success" path="tiles:/authoring/forum/viewTopic" />
-		</action>
-		
-		<action path="/authoring/editTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="messageForm" 
-			validate="false"
-			parameter="editTopic"
-			scope="session">
-			<forward name="success" path="tiles:/authoring/forum/editTopic" />
-			<forward name="forbidden" path="tiles:/authoring/forum/forbiddenEditTopic" />
-		</action>
-		
-		<action path="/authoring/deleteAttachment"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="messageForm" 
-			validate="false"
-			parameter="deleteAttachment"
-			scope="session">
-			<forward name="success" path="tiles:/authoring/forum/editTopic" />
-		</action>
-		
-		<action path="/authoring/updateTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			name="messageForm" 
-			validate="true"
-			input="tiles:/authoring/forum/editTopic" 
-			parameter="updateTopic"
-			scope="session">
-			<forward name="success" path="/authoring/viewTopic.do" />
-		</action>
-		
-		<action path="/authoring/refreshTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			parameter="refreshTopic" >
-			<forward name="author" path="/jsps/message/topiclist.jsp" />
-			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
-		</action>
-		<action path="/authoring/finishTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			input="tiles:/authoring/forum/create" 
-			name="forumForm" 
-			scope="session" 
-			validate="false"
-			parameter="finishTopic" >
-			<forward name="author" path="/jsps/authoring/authoring.jsp" />
-			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
-		</action>
-		
-		<!-- ========== END: Authroing Definitions ============================== -->
-		
-		<!-- ========== BEGIN: Learning Definitions ============================== -->
-		<action path="/learning/viewForum"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="viewForum" scope="request" name="emptyForm">
-			<forward name="success" path="tiles:/learning/forum/viewForum" />
-		</action>
-		<action path="/learning/viewTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="viewTopic" scope="request">
-			<forward name="success" path="tiles:/learning/forum/viewTopic" />
-		</action>
-		<action path="/learning/newTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="newTopic" scope="request">
-			<forward name="success" path="tiles:/learning/forum/newTopic" />
-		</action>
-		<action path="/learning/createTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" 
-			validate="true" 
-			input="tiles:/learning/forum/newTopic" 
-			parameter="createTopic" 
-			scope="request">
-			<forward name="success" path="tiles:/learning/forum/viewForum" />
-		</action>
-		<action path="/learning/newReplyTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" 
-			validate="false" 
-			parameter="newReplyTopic" 
-			scope="request">
-			<forward name="success" path="tiles:/learning/forum/replyTopic" />
-		</action>
-		<action path="/learning/replyTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" 
-			validate="true" 
-			input="tiles:/learning/forum/replyTopic" 
-			parameter="replyTopic" 
-			scope="request">
-			<forward name="success" path="tiles:/learning/forum/viewTopic" />
-		</action>
-		<action path="/learning/editTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" 
-			validate="false" 
-			parameter="editTopic" 
-			scope="session">
-			<forward name="success" path="tiles:/learning/forum/editTopic" />
-		</action>
-		<action path="/learning/updateTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" 
-			validate="true" 
-			input="tiles:/learning/forum/editTopic"
-			parameter="updateTopic" 
-			scope="session">
-			<forward name="success" path="tiles:/learning/forum/viewTopic" />
-		</action>
-		<action path="/learning/updateMessageHideFlag"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="updateMessageHideFlag" 
-			scope="session">
-			<forward name="success" path="tiles:/learning/forum/viewTopic" />
-		</action>	
-		<action path="/learning/deleteAttachment"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" 
-			validate="false"
-			parameter="deleteAttachment"
-			scope="session">
-			<forward name="success" path="tiles:/learning/forum/editTopic" />
-		</action>
-				
-		<action path="/learning/finish"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="finish">
-			<forward name="success" path="tiles:/learning/forum/viewForum" />
-		</action>
-		<!-- ========== END: Learning  Definitions ============================== -->
-		
-		<!-- ========== START: Monitoring  Definitions ============================== -->
-		<action path="/monitoring" 
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-		    scope="request"
-		    parameter="init" >
-			<forward name="load" path="tiles:/monitoring/forum/main" redirect="false" />	        
-		</action>
-	
-		<action path="/monitoring/downloadMarks"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			input="tiles:/monitoring/forum/listContentUsers"
-			name="emptyForm"
-			scope="request"
-			validate="false"
-			parameter="downloadMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
-		</action>
-		
-		<action path="/monitoring/viewAllMarks"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			name="emptyForm"
-			scope="request"
-			validate="false"
-			parameter="viewAllMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/viewAllMarks" />
-		</action>
-		
-		<!--  EDIT MARK		 -->
-		<action path="/monitoring/viewUserMark"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			name="emptyForm"
-			scope="request"
-			validate="false"
-			parameter="viewUserMark" >
-			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
-		</action>
-		
-		<action path="/monitoring/editMark"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			name="markForm"
-			scope="session"
-			validate="false"			
-			parameter="editMark" >
-			<forward name="success" path="tiles:/monitoring/forum/editUserMark" />
-		</action>
-		
-		<action path="/monitoring/updateMark"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			input="tiles:/monitoring/forum/editUserMark"
-			name="markForm"
-			scope="request"
-			validate="true"
-			parameter="updateMark" >
-			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
-		</action>
-	
-		<action path="/monitoring/viewTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			parameter="viewTopic">
-			<forward name="success" path="tiles:/monitoring/forum/viewTopic" />
-		</action>
-		<!-- ========== END: Monitoring  Definitions ============================== -->
-		<!-- System level actions -->
-		<action path="/index" type="org.apache.struts.actions.ForwardAction"
-			parameter="tiles:/layout" />
-		<action path="/error" type="org.apache.struts.actions.ForwardAction"
-			parameter="tiles:/error" />
-		<action path="/blank" type="org.apache.struts.actions.ForwardAction"
-			parameter="tiles:/blank" />
-							
-				
+   		-->