Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -r7ec5fb1ceecbc55268fd3a8cc5ce950eaef7e3bb -rb318437288a6761c6e176c89974773e231bfbc87
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 7ec5fb1ceecbc55268fd3a8cc5ce950eaef7e3bb)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision b318437288a6761c6e176c89974773e231bfbc87)
@@ -1,11 +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.ApplicationResources</value></property>
-	</bean>
 	<bean id="forumMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
-		<property name="messageSource"><ref local="messageSource"/></property>										
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename"><value>org.lamsfoundation.lams.tool.forum.ApplicationResources</value></property>
+			</bean>
+		</property>
 	</bean>
     <!-- Hibernate SessionFactory -->
     <bean id="forumSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -rb318437288a6761c6e176c89974773e231bfbc87
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision b318437288a6761c6e176c89974773e231bfbc87)
@@ -4,11 +4,12 @@
 
 <beans>
 
-	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basename"><value>org.lamsfoundation.lams.tool.rsrc.ApplicationResources</value></property>
-	</bean>
 	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
-		<property name="messageSource"><ref local="messageSource"/></property>										
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename"><value>org.lamsfoundation.lams.tool.rsrc.ApplicationResources</value></property>
+			</bean>
+		</property>										
 	</bean>
     <!-- Hibernate SessionFactory -->
     <bean id="resourceSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -rb318437288a6761c6e176c89974773e231bfbc87
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision b318437288a6761c6e176c89974773e231bfbc87)
@@ -4,11 +4,12 @@
 <!-- Application context definition for Submit Files Tool -->
 
 <beans>
-	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basename"><value>org.lamsfoundation.lams.tool.sbmt.ApplicationResources</value></property>
-	</bean>
 	<bean id="sbmtMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
-		<property name="messageSource"><ref local="messageSource"/></property>										
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename"><value>org.lamsfoundation.lams.tool.sbmt.ApplicationResources</value></property>
+			</bean>
+		</property>										
 	</bean>
 	
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->