Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	20 Jul 2005 04:16:37 -0000	1.4
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	20 Jul 2005 05:25:40 -0000	1.5
@@ -54,10 +54,8 @@
 import org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServiceProxy;
 import org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerForm;
 
-import org.lamsfoundation.lams.tool.noticeboard.util.NbLearnerUtil;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil;
 import org.apache.struts.util.MessageResources;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.ActionMessage;
 /**
@@ -82,7 +80,7 @@
         NoticeboardContent nbContent = null;
         NoticeboardSession nbSession = null;
         NoticeboardUser nbUser = null;
-        NbLearnerUtil.cleanSession(request);
+        NbWebUtil.cleanLearnerSession(request);
         saveMessages(request, null);
         
         NbLearnerForm learnerForm = (NbLearnerForm)form;
@@ -162,7 +160,7 @@
         
         /* will show a different screen if defineLater flag is set and running in preview mode */
         NbLearnerForm nbForm = (NbLearnerForm)form;
-        NbLearnerUtil.cleanSession(request);
+        NbWebUtil.cleanLearnerSession(request);
         Long toolContentId = nbForm.getToolContentId();
         saveMessages(request, null);
         
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	20 Jul 2005 04:16:58 -0000	1.3
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	20 Jul 2005 05:26:01 -0000	1.4
@@ -40,7 +40,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService;
 import org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServiceProxy;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
-import org.lamsfoundation.lams.tool.noticeboard.util.NbMonitoringUtil;
+import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil;
 import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
 
 /**
@@ -85,8 +85,8 @@
         Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE);
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
-		NbMonitoringUtil.copyValuesIntoSession(request, content);
-		if (NbMonitoringUtil.isContentEditable(content))
+		NbWebUtil.copyValuesIntoSession(request, content);
+		if (NbWebUtil.isContentEditable(content))
 		{
 		  //  request.getSession().setAttribute(NoticeboardConstants.CONTENT_IN_USE, "false"); //used in jsp page to allow the edit button to show, so that author can edit page
 		    // request.getSession().setAttribute(NoticeboardConstants.DEFINE_LATER, "true");
@@ -124,7 +124,7 @@
   
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
-		NbMonitoringUtil.copyValuesIntoSession(request, content);
+		NbWebUtil.copyValuesIntoSession(request, content);
 		
         return mapping.findForward(NoticeboardConstants.MONITOR_PAGE);
     }
@@ -141,7 +141,7 @@
         Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE);
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
    		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
-   		NbMonitoringUtil.copyValuesIntoSession(request, content);
+   		NbWebUtil.copyValuesIntoSession(request, content);
         
    		return mapping.findForward(NoticeboardConstants.MONITOR_PAGE);
     }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/Attic/NbMonitoringStarterAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringStarterAction.java	20 Jul 2005 04:18:11 -0000	1.3
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringStarterAction.java	20 Jul 2005 05:26:10 -0000	1.4
@@ -37,7 +37,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringForm;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.tool.noticeboard.util.NbMonitoringUtil;
+import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil;
 
 import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService;
 import org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServiceProxy;
@@ -68,14 +68,14 @@
         
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         monitorForm.reset();
-        NbMonitoringUtil.cleanSession(request);
+        NbWebUtil.cleanMonitoringSession(request);
         Long toolContentId = new Long(WebUtil.readLongParam(request, NoticeboardConstants.TOOL_CONTENT_ID));
         monitorForm.setToolContentId(toolContentId.toString());
         
         request.getSession().setAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE, toolContentId);
         
         NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
-        NbMonitoringUtil.copyValuesIntoSession(request, content);
+        NbWebUtil.copyValuesIntoSession(request, content);