Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff -rf27e4add424636db794f56d68dddea0fc4e1d7d2
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision f27e4add424636db794f56d68dddea0fc4e1d7d2)
@@ -8,16 +8,7 @@
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
-	<!-- Message source for this context, loaded from localized "messages_xx" files -->
-	<bean id="commonMessageService" class="org.lamsfoundation.lams.util.MessageService" >
-		<property name="messageSource">
-			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-				<property name="basename">
-					<value>org.lamsfoundation.lams.ApplicationResources</value>
-				</property>										
-			</bean>
-		</property>
-    </bean>
+	<import resource="messageContext.xml"/>
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
   
Index: lams_common/src/java/org/lamsfoundation/lams/messageContext.xml
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/messageContext.xml	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/messageContext.xml	(revision f27e4add424636db794f56d68dddea0fc4e1d7d2)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for LAMS. Used to deploy to JBOSS.
+-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Message source for this context, loaded from localized "messages_xx" files -->
+	<bean id="commonMessageService" class="org.lamsfoundation.lams.util.MessageService" >
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename">
+					<value>org.lamsfoundation.lams.ApplicationResources</value>
+				</property>										
+			</bean>
+		</property>
+    </bean>
+    
+</beans>
\ No newline at end of file