Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	19 Mar 2006 11:00:55 -0000	1.19
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	19 Mar 2006 13:28:30 -0000	1.20
@@ -318,17 +318,28 @@
 		    logger.debug("retrieving mcService from cache: " + mcService);
 		}
 	    request.getSession().setAttribute(TOOL_SERVICE, mcService);
+	    request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity");
 	 	
-	 	request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity");
-	 	
 
 		request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true));
 		McUtils.setDefineLater(request, true);
 		
 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 		logger.debug("setting  EDIT_OPTIONS_MODE to 0");
-		logger.debug("fwd ing to : " + LOAD_MONITORING_CONTENT);
 		
+		Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
+	    logger.debug("toolContentId: " + toolContentId);
+	    
+	    McContent mcContent=mcService.retrieveMc(toolContentId);
+		logger.debug("mcContent:" + mcContent);
+		
+	    request.getSession().setAttribute(RICHTEXT_TITLE, mcContent.getTitle());
+	    request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS, mcContent.getInstructions());
+
+		logger.debug("Title is: " + mcContent.getTitle());
+		logger.debug("Instructions is: " + mcContent.getInstructions());
+		
+		logger.debug("fwd ing to : " + LOAD_MONITORING_CONTENT);
 		return (mapping.findForward(LOAD_MONITORING_CONTENT));
 	}
     
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.44 -r1.45
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	19 Mar 2006 11:00:56 -0000	1.44
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	19 Mar 2006 13:28:30 -0000	1.45
@@ -199,7 +199,7 @@
    			type="org.lamsfoundation.lams.tool.mc.web.McLearningStarterAction" 
    			name="McLearningForm" 
 	      	scope="session"
-	      	validate="false"
+	      	validate="true"
 	      	unknown="false"
    			input="/learningIndex.jsp"> 
 
@@ -222,37 +222,37 @@
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
 		    name="viewAnswers"
 		    path="/learning/ViewAnswers.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
 		    name="redoQuestions"
 		    path="/learning/RedoQuestions.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
 	     <forward
 	        name="preview"
 	        path="/learning/Preview.jsp"
-	        redirect="true"
+		    redirect="false"
 	     />
 
 	  	<forward
 		    name="learningStarter"
 		    path="/learningIndex.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	</action>  
 	
@@ -265,7 +265,7 @@
       		input="/learning/AnswersContent.jsp"
       		parameter="method"
       		unknown="false"
-      		validate="false">
+      		validate="true">
 	
 		<exception
 	        key="error.exception.McApplication"
@@ -286,55 +286,55 @@
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
 	  	<forward
 		    name="individualReport"
 		    path="/learning/IndividualLearnerResults.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
 	  	<forward
 		    name="redoQuestions"
 		    path="/learning/RedoQuestions.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
 		    name="viewAnswers"
 		    path="/learning/ViewAnswers.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
 		    name="resultsSummary"
 		    path="/learning/ResultsSummary.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
 	        name="starter"
 	        path="/index.jsp"
-	        redirect="true"
+		    redirect="false"
 	     />
 
 	  	<forward
 		    name="learningStarter"
 		    path="/learningIndex.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	     <forward
 	        name="preview"
 	        path="/learning/Preview.jsp"
-	        redirect="true"
+		    redirect="false"
 	     />
     </action>
     
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.13 -r1.14
--- lams_tool_lamc/web/WEB-INF/web.xml	25 Feb 2006 19:27:26 -0000	1.13
+++ lams_tool_lamc/web/WEB-INF/web.xml	19 Mar 2006 13:28:30 -0000	1.14
@@ -257,116 +257,4 @@
 		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
 		</taglib>
 	</jsp-config>
-
-  	<!--  Security Constraint -->
-	<security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Secure Content</web-resource-name>
-    		<url-pattern>*.jsp</url-pattern>
-    		<url-pattern>*.html</url-pattern>
-    		<url-pattern>/index.jsp</url-pattern>
-    		<url-pattern>/flashCrashDump</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>LEARNER</role-name>
-    		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
-    		<role-name>AUTHOR</role-name>
-    		<role-name>ADMIN</role-name>
-    		<role-name>SYSADMIN</role-name>
-    	</auth-constraint>
-    </security-constraint>
-
-    <security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Authoring Update</web-resource-name>
-		    <url-pattern>/authoring.do</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>AUTHOR</role-name>
-    	</auth-constraint>
-    </security-constraint>
-    <security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Staff Content</web-resource-name>
-		    <url-pattern>/monitoring.do</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>STAFF</role-name>
-    	</auth-constraint>
-    </security-constraint>
-
-    <security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Adminstrator Content</web-resource-name>
-		    <url-pattern>/admin.do</url-pattern> 
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>ADMIN</role-name>
-    	</auth-constraint>
-    </security-constraint>
-    <security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
-		    <url-pattern>/sysadmin.do</url-pattern> 
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>SYSADMIN</role-name>
-    	</auth-constraint>
-    </security-constraint>
-	<!--  some combine role security setting -->
-    <security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Download Files</web-resource-name>
-		    <url-pattern>/download/</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
-    		<role-name>ADMIN</role-name>
-    		<role-name>SYSADMIN</role-name>
-    	</auth-constraint>
-    </security-constraint>
-
-	<!--  Login Configuration -->
-  	<login-config>
-   		<auth-method>FORM</auth-method>
-		<realm-name>LAMS</realm-name>
-   		<form-login-config>
-    		<form-login-page>/login.jsp</form-login-page>
-    		<form-error-page>/login.jsp?failed=y</form-error-page>
-   		</form-login-config>
-   	</login-config>
-    <!-- ======================================================== -->
-	<!--  Security Roles -->
-    <!-- ======================================================== -->
-	<security-role>
-		<description>Student</description>
-		<role-name>LEARNER</role-name>
-	</security-role>
-	<security-role>
-		<description>Student</description>
-		<role-name>TEACHER</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can create/modify a learning design</description>
-		<role-name>AUTHOR</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can add/remove users to the system, set up classes of users for sessions</description>
-		<role-name>ADMIN</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can add/remove users to the system, set up classes of users for sessions</description>
-		<role-name>SYSADMIN</role-name>
-	</security-role>
-
 </web-app>