Index: tool/pom.xml
===================================================================
--- tool/pom.xml	(revision 126714)
+++ tool/pom.xml	(working copy)
@@ -37,6 +37,26 @@
 				<filtering>false</filtering>
 			</resource>
 		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<packagingExcludes>WEB-INF/bundle/*.properties,WEB-INF/bundle</packagingExcludes>
+					<webResources>
+						<resource>
+							<!-- move bundle/*.properties into classes in order to make them accessible from classpath -->
+							<directory>${basedir}/src/webapp/WEB-INF/bundle</directory>
+							<includes>
+								<include>*.properties</include>
+							</includes>
+							<targetPath>WEB-INF/classes</targetPath>
+						</resource>
+					</webResources>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 
 	<dependencies>
Index: tool/src/webapp/WEB-INF/applicationContext.xml
===================================================================
--- tool/src/webapp/WEB-INF/applicationContext.xml	(revision 126714)
+++ tool/src/webapp/WEB-INF/applicationContext.xml	(working copy)
@@ -8,10 +8,10 @@
 	<bean id="messageLocator" class="uk.org.ponder.springutil.SpringMessageLocator">
 		<property name="messageSource">
 			<bean
-				class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
+				class="org.sakaiproject.util.ResourceLoaderMessageSource"
 				depends-on="TLABPostProcessorLoader">
 				<property name="basename">
-					<value>WEB-INF/bundle/Messages</value>
+					<value>classpath:Messages</value>
 				</property>
 				<property name="cacheSeconds">
 					<value>10</value>