Index: lams_tool_nb/conf/jar/META-INF/MANIFEST.MF
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/conf/jar/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/conf/jar/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -1,3 +1,4 @@
 Implementation-Title: Noticeboard Tool
-Implementation-Version: 0.1
-Implementation-Vendor: LAMS Foundation (http://lamsfoundation.org)
\ No newline at end of file
+Implementation-Version: 1.1
+Implementation-Vendor: LAMS Foundation (http://lamsfoundation.org)
+Class-Path: ./lams.jar ./lams_learning.jar
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
diff -u -r1566cb0a7fb8f469bbe803d4a3f86e01069ed50b -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 1566cb0a7fb8f469bbe803d4a3f86e01069ed50b)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -214,14 +214,14 @@
 		copyAuthoringFormValuesIntoFormBean(request, nbForm);
 		
 		INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
-		String idAsString = nbForm.getToolContentId();
+		String idAsString = nbForm.getToolContentID();
 		if (idAsString == null)
 		{
 		    String error = "Unable to continue. Tool content id missing";
 		    logger.error(error);
 			throw new NbApplicationException(error);
 		}
-		Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentId());
+		Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID());
 		
 		//throws exception if the content id does not exist
 		checkContentId(content_id);
@@ -259,7 +259,7 @@
 	    	FormFile theFile;
 	    	INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
 			
-	    	Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentId());
+	    	Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID());
 			//throws exception if the content id does not exist
 			checkContentId(content_id);
 			NoticeboardContent nbContent = nbService.retrieveNoticeboard(content_id);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java
===================================================================
diff -u -ree8400900aa1a5689a6a3617c362706f7f06502c -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	(.../NbAuthoringForm.java)	(revision ee8400900aa1a5689a6a3617c362706f7f06502c)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	(.../NbAuthoringForm.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -85,7 +85,7 @@
 	private String offlineInstructions;
 	
 	private String method;
-	private String toolContentId;
+	private String toolContentID;
 	private String defineLater;
 	
 	private FormFile onlineFile;
@@ -218,14 +218,14 @@
 	/**
 	 * @return Returns the toolContentID.
 	 */
-	public String getToolContentId() {
-		return toolContentId;
+	public String getToolContentID() {
+		return toolContentID;
 	}
 	/**
 	 * @param toolContentID The toolContentID to set.
 	 */
-	public void setToolContentId(String toolContentID) {
-		this.toolContentId = toolContentID;
+	public void setToolContentID(String toolContentID) {
+		this.toolContentID = toolContentID;
 	}
 
 	public void reset(ActionMapping mapping, HttpServletRequest request)
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java
===================================================================
diff -u -r1566cb0a7fb8f469bbe803d4a3f86e01069ed50b -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java	(.../NbAuthoringStarterAction.java)	(revision 1566cb0a7fb8f469bbe803d4a3f86e01069ed50b)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java	(.../NbAuthoringStarterAction.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -138,7 +138,7 @@
 		    logger.error(error);
 			throw new NbApplicationException(error);
 		}
-		nbForm.setToolContentId(contentId.toString());
+		nbForm.setToolContentID(contentId.toString());
 		
 		/* if there is a defineLater request parameter, set the form value
 		 * If a defineLater request parameter is not present, then it is just set to null.
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringV2Action.java
===================================================================
diff -u -ree8400900aa1a5689a6a3617c362706f7f06502c -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringV2Action.java	(.../NbAuthoringV2Action.java)	(revision ee8400900aa1a5689a6a3617c362706f7f06502c)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringV2Action.java	(.../NbAuthoringV2Action.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -141,7 +141,7 @@
 		    logger.error(error);
 			throw new NbApplicationException(error);
 		}
-		nbForm.setToolContentId(contentId.toString());
+		nbForm.setToolContentID(contentId.toString());
 		
 		/* if there is a defineLater request parameter, set the form value
 		 * If a defineLater request parameter is not present, then it is just set to null.
@@ -281,14 +281,14 @@
     			copyAuthoringFormValuesIntoFormBean(request, nbForm);
     			
     			INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
-    			String idAsString = nbForm.getToolContentId();
+    			String idAsString = nbForm.getToolContentID();
     			if (idAsString == null)
     			{
     			    String error = "Unable to continue. Tool content id missing";
     			    logger.error(error);
     				throw new NbApplicationException(error);
     			}
-    			Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentId());
+    			Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID());
     			
     			//throws exception if the content id does not exist
     			checkContentId(content_id);
@@ -326,7 +326,7 @@
     		    	FormFile theFile;
     		    	INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
     				
-    		    	Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentId());
+    		    	Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID());
     				//throws exception if the content id does not exist
     				checkContentId(content_id);
     				NoticeboardContent nbContent = nbService.retrieveNoticeboard(content_id);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportForm.java
===================================================================
diff -u -r1566cb0a7fb8f469bbe803d4a3f86e01069ed50b -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportForm.java	(.../NbExportForm.java)	(revision 1566cb0a7fb8f469bbe803d4a3f86e01069ed50b)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportForm.java	(.../NbExportForm.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -27,9 +27,9 @@
     private String title;
 	private String content;
 	
-	private String toolContentId;
-	private String toolSessionId;
-	private String userId;
+	private String toolContentID;
+	private String toolSessionID;
+	private String userID;
 	private String mode;
 	
 	
@@ -86,48 +86,48 @@
     /**
      * @return Returns the toolContentId.
      */
-    public String getToolContentId() {
-        return toolContentId;
+    public String getToolContentID() {
+        return toolContentID;
     }
     /**
      * @param toolContentId The toolContentId to set.
      */
-    public void setToolContentId(String toolContentId) {
-        this.toolContentId = toolContentId;
+    public void setToolContentID(String toolContentId) {
+        this.toolContentID = toolContentId;
     }
     /**
      * @return Returns the toolSessionId.
      */
-    public String getToolSessionId() {
-        return toolSessionId;
+    public String getToolSessionID() {
+        return toolSessionID;
     }
     /**
      * @param toolSessionId The toolSessionId to set.
      */
-    public void setToolSessionId(String toolSessionId) {
-        this.toolSessionId = toolSessionId;
+    public void setToolSessionID(String toolSessionId) {
+        this.toolSessionID = toolSessionId;
     }
     /**
      * @return Returns the userId.
      */
-    public String getUserId() {
-        return userId;
+    public String getUserID() {
+        return userID;
     }
     /**
      * @param userId The userId to set.
      */
-    public void setUserId(String userId) {
-        this.userId = userId;
+    public void setUserID(String userId) {
+        this.userID = userId;
     }
     
     public void reset()
     {
         this.mode = null;
         this.title = null;
         this.content = null;
-        this.toolContentId = null;
-        this.toolSessionId = null;
-        this.userId = null;
+        this.toolContentID = null;
+        this.toolSessionID = null;
+        this.userID = null;
     }
     
     public void populateForm(NoticeboardContent content)
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportServlet.java
===================================================================
diff -u -r2f8a72da41040b36640114b662945e56446fb2ba -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportServlet.java	(.../NbExportServlet.java)	(revision 2f8a72da41040b36640114b662945e56446fb2ba)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportServlet.java	(.../NbExportServlet.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -8,11 +8,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
 import org.lamsfoundation.lams.web.servlet.ExportPortfolioServletException;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * @author mtruong
@@ -25,7 +26,7 @@
 	public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
 	{
 	
-		String mode = WebUtil.readStrParam(request, WebUtil.PARAM_MODE);
+		String mode = WebUtil.readStrParam(request, AttributeNames.PARAM_MODE);
 		Long toolContentId, toolSessionId, userId;
 		String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java
===================================================================
diff -u -rbb1e9bc07172b10c79e61b401239b26dcf513aa9 -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision bb1e9bc07172b10c79e61b401239b26dcf513aa9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -98,8 +98,8 @@
     public ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws NbApplicationException, ToolException, DataMissingException, ServletException, IOException {
 		
 	  NbLearnerForm learnerForm = (NbLearnerForm)form;
-	  Long toolSessionID = NbWebUtil.convertToLong(learnerForm.getToolSessionId());
-	  Long userID = NbWebUtil.convertToLong(learnerForm.getUserId());
+	  Long toolSessionID = NbWebUtil.convertToLong(learnerForm.getToolSessionID());
+	  Long userID = NbWebUtil.convertToLong(learnerForm.getUserID());
 	  
 	  if (toolSessionID == null || userID == null)
 	  {
@@ -126,7 +126,7 @@
 		   * currently only the userId is set. There is no username or any other information
 		   */
 		  User user = new User();
-		  user.setUserId(new Integer(learnerForm.getUserId().toString()));
+		  user.setUserId(new Integer(learnerForm.getUserID().toString()));
 		 
 		 /**
 		  * TODO: when this method is called, it throws a NullPointerException.
@@ -140,7 +140,7 @@
 		  String nextActivityUrl;
 			try
 			{
-				nextActivityUrl = sessionMgrService.leaveToolSession(NbWebUtil.convertToLong(learnerForm.getToolSessionId()), user);
+				nextActivityUrl = sessionMgrService.leaveToolSession(NbWebUtil.convertToLong(learnerForm.getToolSessionID()), user);
 			}
 			catch (DataMissingException e)
 			{
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java
===================================================================
diff -u -r9efe1a0a08c2297bafbda1adf2382ac28d0590ea -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java	(.../NbLearnerForm.java)	(revision 9efe1a0a08c2297bafbda1adf2382ac28d0590ea)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java	(.../NbLearnerForm.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -48,11 +48,11 @@
     
     private String content;
     
-    private String userId;
+    private String userID;
     
-    private String toolSessionId;
+    private String toolSessionID;
     
-    private String toolContentId;
+    private String toolContentID;
     
     private String method;
     
@@ -63,38 +63,38 @@
     /**
      * @return Returns the toolContentID.
      */
-    public String getToolContentId() {
-        return toolContentId;
+    public String getToolContentID() {
+        return toolContentID;
     }
     /**
      * @param toolContentID The toolContentID to set.
      */
-    public void setToolContentId(String toolContentID) {
-        this.toolContentId = toolContentID;
+    public void setToolContentID(String toolContentID) {
+        this.toolContentID = toolContentID;
     }
     /**
      * @return Returns the toolSessionID.
      */
-    public String getToolSessionId() {
-        return toolSessionId;
+    public String getToolSessionID() {
+        return toolSessionID;
     }
     /**
      * @param toolSessionID The toolSessionID to set.
      */
-    public void setToolSessionId(String toolSessionID) {
-        this.toolSessionId = toolSessionID;
+    public void setToolSessionID(String toolSessionID) {
+        this.toolSessionID = toolSessionID;
     }
     /**
      * @return Returns the userID.
      */
-    public String getUserId() {
-        return userId;
+    public String getUserID() {
+        return userID;
     }
     /**
      * @param userID The userID to set.
      */
-    public void setUserId(String userId) {
-        this.userId = userId;
+    public void setUserID(String userId) {
+        this.userID = userId;
     }
     /**
      * @return Returns the content.
@@ -138,9 +138,9 @@
 	{
 		this.content = null;
 		this.title = null;
-		this.toolContentId = null;
-		this.toolSessionId = null;
-		this.userId = null;
+		this.toolContentID = null;
+		this.toolSessionID = null;
+		this.userID = null;
 		this.method = null;
 		this.mode = null;
 			
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
diff -u -r7d3397d726c2508f1d45589609b0b05fa15956dc -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision 7d3397d726c2508f1d45589609b0b05fa15956dc)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -110,8 +110,8 @@
         ActionMessages message = new ActionMessages();
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         
-        Long userId = NbWebUtil.convertToLong(learnerForm.getUserId());
-        Long toolSessionId = NbWebUtil.convertToLong(learnerForm.getToolSessionId());
+        Long userId = NbWebUtil.convertToLong(learnerForm.getUserID());
+        Long toolSessionId = NbWebUtil.convertToLong(learnerForm.getToolSessionID());
        // Long toolContentId = NbWebUtil.convertToLong(learnerForm.getToolContentId());
         
         if(userId == null || toolSessionId ==null)
@@ -187,8 +187,8 @@
         ActionMessages message = new ActionMessages();
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         
-        Long userId = NbWebUtil.convertToLong(learnerForm.getUserId());
-        Long toolSessionId = NbWebUtil.convertToLong(learnerForm.getToolSessionId());
+        Long userId = NbWebUtil.convertToLong(learnerForm.getUserID());
+        Long toolSessionId = NbWebUtil.convertToLong(learnerForm.getToolSessionID());
         
         if(userId == null || toolSessionId ==null)
 		{
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
diff -u -r1566cb0a7fb8f469bbe803d4a3f86e01069ed50b -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision 1566cb0a7fb8f469bbe803d4a3f86e01069ed50b)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -119,7 +119,7 @@
         NbMonitoringForm monitorForm = (NbMonitoringForm)form;                
       
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
-        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentID());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 		NbWebUtil.copyValuesIntoSession(request, content);
 		if (NbWebUtil.isContentEditable(content))
@@ -130,7 +130,7 @@
 		    
 		    //set up the request parameters to append to the URL
 		    Map map = new HashMap();
-		    map.put(NoticeboardConstants.TOOL_CONTENT_ID, monitorForm.getToolContentId());
+		    map.put(NoticeboardConstants.TOOL_CONTENT_ID, monitorForm.getToolContentID());
 		    map.put(NoticeboardConstants.DEFINE_LATER, "true");
 		    
 		    monitorForm.setParametersToAppend(map);
@@ -166,7 +166,7 @@
         
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         NbMonitoringForm monitorForm = (NbMonitoringForm)form;
-        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentID());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 		NbWebUtil.copyValuesIntoSession(request, content);
 		
@@ -205,7 +205,7 @@
        // Long toolContentId = getToolContentId(request);
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         NbMonitoringForm monitorForm = (NbMonitoringForm)form;
-        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentID());
    		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
    		NbWebUtil.copyValuesIntoSession(request, content);
         
@@ -229,7 +229,7 @@
         Map map = new HashMap();
        // Long toolContentId = getToolContentId(request);
         NbMonitoringForm monitorForm = (NbMonitoringForm)form;
-        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentID());
         
         NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
         
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java
===================================================================
diff -u -r7f56014100e2571ab98aa73c32d588fe4fac369a -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	(.../NbMonitoringForm.java)	(revision 7f56014100e2571ab98aa73c32d588fe4fac369a)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	(.../NbMonitoringForm.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -56,7 +56,7 @@
     static Logger logger = Logger.getLogger(NbMonitoringForm.class.getName());
     
        
-    private String toolContentId;
+    private String toolContentID;
     
     private String method;
     
@@ -110,14 +110,14 @@
     /**
      * @return Returns the toolContentId.
      */
-    public String getToolContentId() {
-        return toolContentId;
+    public String getToolContentID() {
+        return toolContentID;
     }
     /**
      * @param toolContentId The toolContentId to set.
      */
-    public void setToolContentId(String toolContentId) {
-        this.toolContentId = toolContentId;
+    public void setToolContentID(String toolContentId) {
+        this.toolContentID = toolContentId;
     }
     
     public void reset(ActionMapping mapping, HttpServletRequest request)
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringStarterAction.java
===================================================================
diff -u -r5aa061452fadc8f38e1fa8240fb9b00a36eea468 -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringStarterAction.java	(.../NbMonitoringStarterAction.java)	(revision 5aa061452fadc8f38e1fa8240fb9b00a36eea468)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringStarterAction.java	(.../NbMonitoringStarterAction.java)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -90,7 +90,7 @@
 		    logger.error(error);
 			throw new NbApplicationException(error);
 		}
-        monitorForm.setToolContentId(toolContentId.toString());
+        monitorForm.setToolContentID(toolContentId.toString());
         
       //  request.getSession().setAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE, toolContentId);
         
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r75793b787f82e36f68344d5f013a6363dd8cb8b6 -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 75793b787f82e36f68344d5f013a6363dd8cb8b6)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -24,14 +24,16 @@
 		</listener-class>
 	</listener>	
 
-    <!--
-    To use non XDoclet filters, create a filters.xml file that
-    contains the additional filters (eg Sitemesh) and place it in your
-    project's merge dir.  Don't include filter-mappings in this file,
-    include them in a file called filter-mappings.xml and put that in
-    the same directory.
-    -->
+  <!--  <filter>
+    <filter-name>contentFilter</filter-name>
+    <filter-class>org.lamsfoundation.lams.web.filter.ResponseCaptureFilter</filter-class>
+</filter>
 
+<filter-mapping>
+    <filter-name>contentFilter</filter-name>
+    <url-pattern>/portfolioExport</url-pattern>
+</filter-mapping> -->
+
     <!--
     To use non XDoclet filter-mappings, create a filter-mappings.xml file that
     contains the additional filter-mappings and place it in your
@@ -86,12 +88,18 @@
     </servlet>
 <!--  The download servlet, reused from the content repository jar -->
 	<servlet>
-		<description>Instructions Download</description>
-		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
+		<display-name>Instructions Download</display-name>
+		<description>Instructions Download</description>		
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
+	<servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<display-name>Export Portfolio</display-name>
+		<description>Export Portfolio</description>		
+		<servlet-class>org.lamsfoundation.lams.tool.noticeboard.web.NbExportServlet</servlet-class>
+	</servlet>
 
   	<servlet-mapping>
 		<servlet-name>action</servlet-name>
@@ -102,6 +110,10 @@
 		<servlet-name>download</servlet-name>
 		<url-pattern>/download/*</url-pattern>
   	</servlet-mapping>
+  	<servlet-mapping>
+		<servlet-name>exportPortfolio</servlet-name>
+		<url-pattern>/portfolioExport</url-pattern>
+  	</servlet-mapping>
 
    <session-config>
       <session-timeout>120</session-timeout>
@@ -114,38 +126,77 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-   <!--
-   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-   Organize error-pages.xml following this DTD slice:
+  <error-page>
+	<error-code>403</error-code>
+	<location>/403.html</location>
+</error-page> 
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
-
   <!-- Struts Tag Library Descriptors -->
 
 <taglib>
     <taglib-uri>fck-editor</taglib-uri>
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
 
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</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>
 
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoringv2.do</url-pattern>
+		    <url-pattern>/starter/authoring.do</url-pattern>
+		    <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>/starter/monitor.do</url-pattern>
+		    <url-pattern>/monitoring.do</url-pattern>		   
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
+	<!--  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-login-config>
+   	</login-config>
+
 </web-app>
Index: lams_tool_nb/web/index.jsp
===================================================================
diff -u -r54897839688f5bddcdfbbd4c4dd08ad12b6f22e6 -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/web/index.jsp	(.../index.jsp)	(revision 54897839688f5bddcdfbbd4c4dd08ad12b6f22e6)
+++ lams_tool_nb/web/index.jsp	(.../index.jsp)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -5,13 +5,13 @@
 String path = request.getContextPath();
 String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
 
-String authorUrl = "/starter/authoring?toolContentId="+355;
-String learnerUrl = "/starter/learner?userId="+555+"&toolSessionId="+455+"&mode=learner";
-String learnerUrlTeacher = "/starter/learner?userId="+555+"&toolSessionId="+455+"&mode=teacher";
-String learnerUrlAuthor = "/starter/learner?userId="+555+"&toolSessionId="+455+"&mode=author";
-String monitoringUrl = "/starter/monitor?toolContentId="+355;
-String exportPortfolioTeacher ="/exportPortfolio.do?mode=teacher&toolContentId=355";
-String exportPortfolioStudent = "/exportPortfolio.do?mode=learner&toolSessionId=455&userId=555";
+String authorUrl = "/starter/authoring?toolContentID="+355;
+String learnerUrl = "/starter/learner?userId="+555+"&toolSessionID="+455+"&mode=learner";
+String learnerUrlTeacher = "/starter/learner?userId="+555+"&toolSessionID="+455+"&mode=teacher";
+String learnerUrlAuthor = "/starter/learner?userId="+555+"&toolSessionID="+455+"&mode=author";
+String monitoringUrl = "/starter/monitor?toolContentID="+355;
+String exportPortfolioTeacher ="/exportPortfolio.do?mode=teacher&toolContentID=355";
+String exportPortfolioStudent = "/exportPortfolio.do?mode=learner&toolSessionID=455&userID=555";
 %>
 
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
Index: lams_tool_nb/web/m_EditActivity.jsp
===================================================================
diff -u -r7b1ab9175f88a30e8bfca21fd81a96f00ce768cc -r85507766d15ce5b9b5eaeaef421dfa64b695da9d
--- lams_tool_nb/web/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 7b1ab9175f88a30e8bfca21fd81a96f00ce768cc)
+++ lams_tool_nb/web/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d)
@@ -37,7 +37,7 @@
 	<c:if test='${requestScope.isPageEditable == "true"}'>
 		<tr>
 			<td align="right">
-			<!--	<html:link forward="forwardToAuthorPage" paramName="NbMonitoringForm" paramProperty="toolContentId" paramId="toolContentId" styleClass="button">
+			<!--	<html:link forward="forwardToAuthorPage" paramName="NbMonitoringForm" paramProperty="toolContentID" paramId="toolContentID" styleClass="button">
 					<fmt:message key="button.edit" />
 				</html:link> -->
 				<html:link forward="forwardToAuthorPage" name="NbMonitoringForm" property="parametersToAppend" styleClass="button" target="_blank">