Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
diff -u -r72fa17227e3f1f28a3919142afea2de07542a981 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 72fa17227e3f1f28a3919142afea2de07542a981)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -147,7 +147,7 @@
 			nbForm.setToolContentID(contentId.toString());
 			nbForm.setContentFolderID(contentFolderId);
 			nbForm.setTitle(nb.getTitle());
-			nbForm.setContent(nb.getContent());
+			nbForm.setBasicContent(nb.getContent());
 			nbForm.setOnlineInstructions(nb.getOnlineInstructions());
 			nbForm.setOfflineInstructions(nb.getOfflineInstructions());
 			
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java
===================================================================
diff -u -rb671c9f662957bb9ca3f579d36b6e1acd768cddd -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	(.../NbAuthoringForm.java)	(revision b671c9f662957bb9ca3f579d36b6e1acd768cddd)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	(.../NbAuthoringForm.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -70,7 +70,7 @@
 	static Logger logger = Logger.getLogger(NbAuthoringForm.class.getName());
 
 	private String title;
-	private String content;
+	private String basicContent;
 	private String onlineInstructions;
 	private String offlineInstructions;
 	
@@ -146,14 +146,14 @@
 	/**
 	 * @return Returns the content.
 	 */
-	public String getContent() {
-		return content;
+	public String getBasicContent() {
+		return basicContent;
 	}
 	/**
-	 * @param content The content to set.
+	 * @param basicContent The content to set.
 	 */
-	public void setContent(String content) {
-		this.content = content;
+	public void setBasicContent(String basicContent) {
+		this.basicContent = basicContent;
 	}
 	/**
 	 * @return Returns the title.
@@ -262,7 +262,7 @@
 	public void populateFormWithNbContentValues(NoticeboardContent nbContent)
 	{
 		setTitle(nbContent.getTitle());
-		setContent(nbContent.getContent());
+		setBasicContent(nbContent.getContent());
 		setOnlineInstructions(nbContent.getOnlineInstructions());
 		setOfflineInstructions(nbContent.getOfflineInstructions());
 		setReflectOnActivity(nbContent.getReflectOnActivity());
@@ -272,7 +272,7 @@
 	public void copyValuesIntoNbContent(NoticeboardContent nbContent)
 	{
 		nbContent.setTitle(getTitle());
-	    nbContent.setContent(getContent());
+	    nbContent.setContent(getBasicContent());
 	    if (defineLater == null || defineLater.length() == 0) {
 	    	// ie. If defineLater is null or empty, this means we are in authoring
 			nbContent.setOnlineInstructions(getOnlineInstructions());
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportForm.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportForm.java	(.../NbExportForm.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportForm.java	(.../NbExportForm.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -43,7 +43,7 @@
     static Logger logger = Logger.getLogger(NbExportForm.class.getName());
     
     private String title;
-	private String content;
+	private String basicContent;
 	
 	private String toolContentID;
 	private String toolSessionID;
@@ -68,14 +68,14 @@
     /**
      * @return Returns the content.
      */
-    public String getContent() {
-        return content;
+    public String getBasicContent() {
+        return basicContent;
     }
     /**
-     * @param content The content to set.
+     * @param basicContent The content to set.
      */
-    public void setContent(String content) {
-        this.content = content;
+    public void setBasicContent(String basicContent) {
+        this.basicContent = basicContent;
     }
     /**
      * @return Returns the mode.
@@ -142,7 +142,7 @@
     {
         this.mode = null;
         this.title = null;
-        this.content = null;
+        this.basicContent = null;
         this.toolContentID = null;
         this.toolSessionID = null;
         this.userID = null;
@@ -151,6 +151,6 @@
     public void populateForm(NoticeboardContent content)
     {
         setTitle(content.getTitle());
-        setContent(content.getContent());
+        setBasicContent(content.getContent());
     }
 }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java
===================================================================
diff -u -r4aae0391a4892385de3df761a655e0ab8b1c0183 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java	(.../NbLearnerForm.java)	(revision 4aae0391a4892385de3df761a655e0ab8b1c0183)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java	(.../NbLearnerForm.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -46,7 +46,7 @@
     
     private String title;
     
-    private String content;
+    private String basicContent;
     
     private String toolSessionID;
     
@@ -73,14 +73,14 @@
     /**
      * @return Returns the content.
      */
-    public String getContent() {
-        return content;
+    public String getBasicContent() {
+        return basicContent;
     }
     /**
-     * @param content The content to set.
+     * @param basicContent The content to set.
      */
-    public void setContent(String content) {
-        this.content = content;
+    public void setBasicContent(String basicContent) {
+        this.basicContent = basicContent;
     }
     /**
      * @return Returns the title.
@@ -110,7 +110,7 @@
     
     public void reset()
 	{
-		this.content = null;
+		this.basicContent = null;
 		this.title = null;
 		this.toolSessionID = null;
 		this.method = null;
@@ -121,7 +121,7 @@
     public void copyValuesIntoForm(NoticeboardContent content, boolean readOnly, String mode)
     {
         setTitle(content.getTitle());
-        setContent(content.getContent());
+        setBasicContent(content.getContent());
         setMode(mode);
         setReadOnly(new Boolean(readOnly));
     }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
diff -u -r90efaeded0926437b1e4f2490caa5426c9cee46e -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision 90efaeded0926437b1e4f2490caa5426c9cee46e)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -105,7 +105,7 @@
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 
     	monitorForm.setTitle(content.getTitle());
-    	monitorForm.setContent(content.getContent());
+    	monitorForm.setBasicContent(content.getContent());
     	monitorForm.setOnlineInstructions(content.getOnlineInstructions());
     	monitorForm.setOfflineInstructions(content.getOfflineInstructions());
 		monitorForm.setAttachmentsList(NbWebUtil.setupAttachmentList(nbService, content));
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	(.../NbMonitoringForm.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	(.../NbMonitoringForm.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -68,7 +68,7 @@
 
 	/* Only valid when form just set up by Java. Values are not returned from jsp page */
 	private String title;
-	private String content;
+	private String basicContent;
 	private String onlineInstructions;
 	private String offlineInstructions;
 	private String contentEditable;
@@ -125,8 +125,8 @@
 		this.currentTab = currentTab;
 	}
  
-	public String getContent() {
-		return content;
+	public String getBasicContent() {
+		return basicContent;
 	}
 
 	public String getOfflineInstructions() {
@@ -144,8 +144,8 @@
 	public String getContentEditable() {
 		return contentEditable;
 	}
-	public void setContent(String content) {
-		this.content = content;
+	public void setBasicContent(String basicContent) {
+		this.basicContent = basicContent;
 	}
 	public void setContentEditable(String contentEditable) {
 		this.contentEditable = contentEditable;
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java	(.../NbPedagogicalPlannerAction.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java	(.../NbPedagogicalPlannerAction.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -107,7 +107,7 @@
 	NbPedagogicalPlannerForm plannerForm = (NbPedagogicalPlannerForm) form;
 	ActionMessages errors = plannerForm.validate();
 	if (errors.isEmpty()) {
-	    String content = plannerForm.getContent();
+	    String content = plannerForm.getBasicContent();
 	    Long toolContentID = plannerForm.getToolContentID();
 	    NoticeboardContent noticeboard = getNoticeboardService().retrieveNoticeboard(toolContentID);
 	    noticeboard.setContent(content);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java	(.../NbPedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerForm.java	(.../NbPedagogicalPlannerForm.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -31,7 +31,7 @@
  *              type="org.lamsfoundation.lams.tool.noticeboard.web.NbPedagogicalPlannerForm"
  */
 public class NbPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
-    private String content;
+    private String basicContent;
     private String contentFolderID;
 
     public String getContentFolderID() {
@@ -42,18 +42,18 @@
 	this.contentFolderID = contentFolderID;
     }
 
-    public String getContent() {
-	return content;
+    public String getBasicContent() {
+	return basicContent;
     }
 
-    public void setContent(String instructions) {
-	content = instructions;
+    public void setBasicContent(String instructions) {
+	basicContent = instructions;
     }
 
     public void fillForm(NoticeboardContent noticeboard) {
 	if (noticeboard != null) {
 	    String content = noticeboard.getContent();
-	    setContent(content);
+	    setBasicContent(content);
 	    setToolContentID(noticeboard.getNbContentId());
 	}
     }
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -5,19 +5,24 @@
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.tool.noticeboard.ApplicationResources</param-value>
 </context-param>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath:/org/lamsfoundation/lams/applicationContext.xml
-            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-			classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-			classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml
-		</param-value>
-	</context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
+<context-param> 
+	<param-name>contextConfigLocation</param-name>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml</param-value>
+</context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
+
   <!--  <filter>
     <filter-name>contentFilter</filter-name>
     <filter-class>org.lamsfoundation.lams.web.filter.ResponseCaptureFilter</filter-class>
@@ -40,7 +45,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>nbSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 
@@ -104,9 +109,7 @@
     </servlet>
 <!--  The download servlet, reused from the content repository jar -->
 	<servlet>
-		<servlet-name>download</servlet-name>
-		<display-name>Instructions Download</display-name>
-		<description>Instructions Download</description>		
+		<servlet-name>download</servlet-name>		
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
 	    <init-param>
 	      <param-name>toolContentHandlerBeanName</param-name>
@@ -116,8 +119,6 @@
 	</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>
 
@@ -198,14 +199,8 @@
 		    <taglib-uri>tags-xml</taglib-uri>
 		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
 		  </taglib>
+
 			<!--  ======================================================== -->	
-			<!--   FCKEditor Tag Library -->
-			<!--  ======================================================== -->	
-			<taglib>
-			    <taglib-uri>fck-editor</taglib-uri>
-			    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-			</taglib>
-			<!--  ======================================================== -->	
 			<!--   LAMS Tag Library -->
 			<!--  ======================================================== -->	
 			<taglib>
Index: lams_tool_nb/web/authoring/basic.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -14,7 +14,7 @@
 			<div class="field-name">
 				<fmt:message key="basic.content"></fmt:message>
 			</div>
-			<lams:CKEditor id="content" value="${NbAuthoringForm.content}"
+			<lams:CKEditor id="basicContent" value="${NbAuthoringForm.basicContent}"
 				contentFolderID="${NbAuthoringForm.contentFolderID}"></lams:CKEditor>
 		</td>
 	</tr>
Index: lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -9,8 +9,8 @@
 	<script type="text/javascript">
 		function prepareFormData(){
 			//CKeditor content is not submitted when sending by jQuery; we need to do this
-			var content = CKEDITOR.instances.content.getData();
-			document.getElementById("content").value=content;
+			var basicContent = CKEDITOR.instances.basicContent.getData();
+			document.getElementById("basicContent").value=basicContent;
 		}
 	</script>
 </lams:head>
@@ -23,8 +23,8 @@
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
 		
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-		<lams:CKEditor id="content"
-			value="${formBean.content}"
+		<lams:CKEditor id="basicContent"
+			value="${formBean.basicContent}"
 			contentFolderID="${formBean.contentFolderID}"
                toolbarSet="CustomPedplanner" height="190px"
                width="750px" displayExpanded="false">
Index: lams_tool_nb/web/exportPortfolio.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_nb/web/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -20,7 +20,7 @@
 			</h1>
 
 				<p>
-					<c:out value="${NbExportForm.content}" escapeXml="false" />
+					<c:out value="${NbExportForm.basicContent}" escapeXml="false" />
 				</p>
 				
 			<c:if test="${learner}">
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r7df97e6bb8b73c214ae80b19e5715a92a1f0448e -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 7df97e6bb8b73c214ae80b19e5715a92a1f0448e)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -23,7 +23,7 @@
 	</h1>
 
 	<p>
-		<c:out value="${NbLearnerForm.content}" escapeXml="false" />
+		<c:out value="${NbLearnerForm.basicContent}" escapeXml="false" />
 	</p>
 
 	<html:form action="/learner" target="_self"
Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp
===================================================================
diff -u -r6f480ab11bce79b61a9dd5e2f870eaa02245b1b3 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 6f480ab11bce79b61a9dd5e2f870eaa02245b1b3)
+++ lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -20,7 +20,7 @@
 					<fmt:message key="basic.content" />
 				</td>
 				<td>
-					<c:out value="${formBean.content}" escapeXml="false" />
+					<c:out value="${formBean.basicContent}" escapeXml="false" />
 				</td>
 			</tr>
 </table>
Index: lams_tool_nb/web/monitoring/m_Summary.jsp
===================================================================
diff -u -rb011786cc660c7861944698562681008be671915 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/monitoring/m_Summary.jsp	(.../m_Summary.jsp)	(revision b011786cc660c7861944698562681008be671915)
+++ lams_tool_nb/web/monitoring/m_Summary.jsp	(.../m_Summary.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -49,7 +49,7 @@
 	<p>&nbsp;</p>
 
 	<H2><c:out value="${formBean.title}" escapeXml="false" /></H2>
-	<p><c:out value="${formBean.content}" escapeXml="false" /></p>
+	<p><c:out value="${formBean.basicContent}" escapeXml="false" /></p>
 
 	<H2><fmt:message key="titleHeading.statistics"/></H2>
 	<%@ include file="m_Statistics.jsp"%>