Index: lams_tool_forum/conf/xdoclet/servlets.xml
===================================================================
diff -u -r8e35715613755a1ea9c9e22a374f431434dcaead -r1d178e94bec7d2c17be92d2ae7690135deb2ff54
--- lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
+++ lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 1d178e94bec7d2c17be92d2ae7690135deb2ff54)
@@ -46,5 +46,9 @@
 		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
+	    <init-param>
+	      <param-name>toolContentHandlerBeanName</param-name>
+	      <param-value>forumToolContentHandler</param-value>
+	    </init-param>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r37bc758b9d7d1ba5a285a640e6d58113126f9620 -r1d178e94bec7d2c17be92d2ae7690135deb2ff54
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 37bc758b9d7d1ba5a285a640e6d58113126f9620)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 1d178e94bec7d2c17be92d2ae7690135deb2ff54)
@@ -108,6 +108,10 @@
 		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
+	    <init-param>
+	      <param-name>toolContentHandlerBeanName</param-name>
+	      <param-value>forumToolContentHandler</param-value>
+	    </init-param>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
 
@@ -228,10 +232,10 @@
 	    <taglib-uri>fck-editor</taglib-uri>
 	    <taglib-location>/WEB-INF/fckeditor/FCKeditor.tld</taglib-location>
 	</taglib>
-    <taglib>
-        <taglib-uri>forum</taglib-uri>
-        <taglib-location>/WEB-INF/forum.tld</taglib-location>
-    </taglib>
+	<taglib>
+	   <taglib-uri>tags-lams</taglib-uri>
+	   <taglib-location>/WEB-INF/lams.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.
Index: lams_tool_sbmt/conf/xdoclet/servlets.xml
===================================================================
diff -u -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 -r1d178e94bec7d2c17be92d2ae7690135deb2ff54
--- lams_tool_sbmt/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409)
+++ lams_tool_sbmt/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 1d178e94bec7d2c17be92d2ae7690135deb2ff54)
@@ -46,6 +46,10 @@
 		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
+	    <init-param>
+	      <param-name>toolContentHandlerBeanName</param-name>
+	      <param-value>sbmtToolContentHandler</param-value>
+	    </init-param>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
     
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -rc6b6b6b37a75598d144929e5757c4270d704141f -r1d178e94bec7d2c17be92d2ae7690135deb2ff54
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision c6b6b6b37a75598d144929e5757c4270d704141f)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 1d178e94bec7d2c17be92d2ae7690135deb2ff54)
@@ -104,6 +104,10 @@
 		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
+	    <init-param>
+	      <param-name>toolContentHandlerBeanName</param-name>
+	      <param-value>sbmtToolContentHandler</param-value>
+	    </init-param>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>