Index: lams_tool_forum/build.xml
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -347,12 +347,14 @@
 			dbDriverUrl="${db.url}"
 			dbDriverClass="com.mysql.jdbc.Driver"
 			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolTablesScriptPath="${db.scripts}/create_lams_tool_forum.sql"
 			toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_forum.sql"
 			toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
 			toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
 			toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+			toolApplicationContextPath="/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml"
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
@@ -449,5 +451,14 @@
         </copy>
     </target>
 
+    <!-- ================================= 
+          target: convert UTF-8 language files to Java properties files using native2ascii
+         ================================= -->
+    <target name="native2ascii" 
+    	description="convert UTF-8 language files to Java properties files using native2ascii">
+		<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}"
+		   includes="*.txt" ext=".properties"/>
+    </target>
+
 	<!-- end tasks **************************************************************************************************-->
 </project>
Index: lams_tool_forum/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_forum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_forum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -14,7 +14,7 @@
 	<param-value>
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
   		classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -14,7 +14,7 @@
 	<param-value>
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
   		classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -360,12 +360,14 @@
 				dbDriverUrl="${db.url}"
 				dbDriverClass="com.mysql.jdbc.Driver"
 				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+				toolJarFileName="${product}.jar"
 				toolSignature="${signature}"
 				toolTablesScriptPath="${db.scripts}/create_lams_tool_mc.sql"
 				toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_mc.sql"
 				toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
 				toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
 				toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+				toolApplicationContextPath="/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml"
 				lamsEarPath="${jboss.deploy}"
 				toolContext="${toolContext}"
 				toolWebUri="${product}.war"
Index: lams_tool_lamc/test/web/WEB-INF/web.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -12,7 +12,7 @@
 		<param-value>
 			classpath:/org/lamsfoundation/lams/applicationContext.xml
             classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+            classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 			classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -re3a73acd76eba38b1cc275e6da895b0a65544767 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision e3a73acd76eba38b1cc275e6da895b0a65544767)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -11,7 +11,7 @@
 			<param-value>
 				classpath:/org/lamsfoundation/lams/applicationContext.xml
 	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-	            classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+	            classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -358,12 +358,15 @@
 				dbDriverUrl="${db.url}"
 				dbDriverClass="com.mysql.jdbc.Driver"
 				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+				toolJarFileName="${product}.jar"
 				toolSignature="${signature}"
 				toolTablesScriptPath="${db.scripts}/create_lams_tool_qa.sql"
 				toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_qa.sql"
 				toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
 				toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
 				toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+				toolApplicationContextPath="/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml"
+
 				lamsEarPath="${jboss.deploy}"
 				toolContext="${toolContext}"
 				toolWebUri="${product}.war"
Index: lams_tool_laqa/test/web/WEB-INF/web.xml
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -12,7 +12,7 @@
 		<param-value>
 			classpath:/org/lamsfoundation/lams/applicationContext.xml
 	    	classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-	    	classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+	    	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 	    	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r59dfd09ebb07bbd0179ba9badecd978a53af0d9f -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 59dfd09ebb07bbd0179ba9badecd978a53af0d9f)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -12,7 +12,7 @@
 			<param-value>
 				classpath:/org/lamsfoundation/lams/applicationContext.xml
 		    	classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-		    	classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+		    	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 		    	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -r6c82746ec6c1edbc3ef793dcf2e93aff7bf758d9 -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision 6c82746ec6c1edbc3ef793dcf2e93aff7bf758d9)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -356,12 +356,15 @@
 			dbDriverUrl="${db.url}"
 			dbDriverClass="com.mysql.jdbc.Driver"
 			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolTablesScriptPath="${db.scripts}/create_lams_tool_rsrc.sql"
 			toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_rsrc.sql"
 			toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
 			toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
 			toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+			toolApplicationContextPath="/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml"
+
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
@@ -14,7 +14,7 @@
 	<param-value>
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
   		classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml