Index: lams_tool_forum/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u -rde672e5125377cd876df4bf2e9e624ffcfac30a4 -re3d5d02ad8bfba0dea58527dd98ffcc06687569d
--- lams_tool_forum/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision de672e5125377cd876df4bf2e9e624ffcfac30a4)
+++ lams_tool_forum/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision e3d5d02ad8bfba0dea58527dd98ffcc06687569d)
@@ -5,4 +5,8 @@
     <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
   </filter-mapping>
\ No newline at end of file
Index: lams_tool_forum/conf/xdoclet/filters.xml
===================================================================
diff -u -r9401077810a09c0dc2a77ff8bce04b1efeb25353 -re3d5d02ad8bfba0dea58527dd98ffcc06687569d
--- lams_tool_forum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 9401077810a09c0dc2a77ff8bce04b1efeb25353)
+++ lams_tool_forum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision e3d5d02ad8bfba0dea58527dd98ffcc06687569d)
@@ -17,3 +17,9 @@
          </filter-class>
      </filter>
    
+	<filter>
+	       <filter-name>LocaleFilter</filter-name>
+	         <filter-class>
+			   org.lamsfoundation.lams.web.filter.LocaleFilter
+	         </filter-class>
+	</filter>
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -rf8a848300b6c54e00973ac2b2b27c0eb53521711 -re3d5d02ad8bfba0dea58527dd98ffcc06687569d
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision f8a848300b6c54e00973ac2b2b27c0eb53521711)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision e3d5d02ad8bfba0dea58527dd98ffcc06687569d)
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
-
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename"><value>org.lamsfoundation.lams.tool.forum.web.ApplicationResources</value></property>
+	</bean>
+	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+		<property name="messageSource"><ref local="messageSource"/></property>										
+	</bean>
     <!-- Hibernate SessionFactory -->
     <bean id="forumSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="toolDataSource"/></property>
@@ -92,6 +97,7 @@
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
+   		<property name="messageService"><ref bean="messageService"/></property>
     </bean>
 
     <bean id="forumService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r5dcca6320036cabb17b0fefd636ce5a80e43780b -re3d5d02ad8bfba0dea58527dd98ffcc06687569d
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 5dcca6320036cabb17b0fefd636ce5a80e43780b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision e3d5d02ad8bfba0dea58527dd98ffcc06687569d)
@@ -54,6 +54,8 @@
 import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
 import org.lamsfoundation.lams.tool.forum.util.TopicComparator;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.springframework.context.support.MessageSourceAccessor;
 
 /**
  * 
@@ -75,7 +77,14 @@
 	private ForumToolContentHandler forumToolContentHandler;
 	private IRepositoryService repositoryService;
 	private ILearnerService learnerService;
-
+    private MessageService messageService;
+	//---------------------------------------------------------------------
+    // Inversion of Control Methods - Method injection
+    //---------------------------------------------------------------------
+	public void setMessageService(MessageService messageService) {
+		this.messageService = messageService;
+	}
+	
     public Forum updateForum(Forum forum) throws PersistenceException {
         forumDao.saveOrUpdate(forum);
         return forum;
@@ -86,6 +95,9 @@
     }
 
 	public Forum getForumByContentId(Long contentID)  throws PersistenceException {
+//    	String str = messageService.getMessage("label.authoring.heading.basic");
+//    	System.out.println(str);
+    	
 		Forum forum = (Forum) forumDao.getByContentId(contentID);
 		if(forum == null){
 			log.error("Could not find the content by given ID:"+contentID);