Index: lams_tool_forum/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/build.xml,v
diff -u -r1.37 -r1.38
--- lams_tool_forum/build.xml	27 Mar 2006 22:25:03 -0000	1.37
+++ lams_tool_forum/build.xml	14 Apr 2006 06:14:48 -0000	1.38
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/web-settings.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/conf/xdoclet/web-settings.xml	27 Mar 2006 22:24:32 -0000	1.8
+++ lams_tool_forum/conf/xdoclet/web-settings.xml	14 Apr 2006 06:14:48 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/web.xml,v
diff -u -r1.20 -r1.21
--- lams_tool_forum/web/WEB-INF/web.xml	27 Mar 2006 22:24:53 -0000	1.20
+++ lams_tool_forum/web/WEB-INF/web.xml	14 Apr 2006 06:14:48 -0000	1.21
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/build.xml,v
diff -u -r1.23 -r1.24
--- lams_tool_lamc/build.xml	7 Apr 2006 00:43:17 -0000	1.23
+++ lams_tool_lamc/build.xml	14 Apr 2006 06:18:01 -0000	1.24
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/test/web/WEB-INF/web.xml	14 Oct 2005 15:50:11 -0000	1.6
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	14 Apr 2006 06:18:01 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/web/WEB-INF/web.xml	10 Apr 2006 11:10:26 -0000	1.16
+++ lams_tool_lamc/web/WEB-INF/web.xml	14 Apr 2006 06:18:01 -0000	1.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/build.xml,v
diff -u -r1.25 -r1.26
--- lams_tool_laqa/build.xml	7 Apr 2006 00:44:23 -0000	1.25
+++ lams_tool_laqa/build.xml	14 Apr 2006 06:18:54 -0000	1.26
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/test/web/WEB-INF/web.xml	23 Feb 2006 20:43:40 -0000	1.9
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	14 Apr 2006 06:18:54 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/web/WEB-INF/web.xml	10 Apr 2006 11:10:45 -0000	1.19
+++ lams_tool_laqa/web/WEB-INF/web.xml	14 Apr 2006 06:18:54 -0000	1.20
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/build.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/build.xml	3 Apr 2006 05:09:50 -0000	1.9
+++ lams_tool_larsrc/build.xml	14 Apr 2006 06:19:40 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/web/WEB-INF/web.xml	27 Mar 2006 06:10:17 -0000	1.6
+++ lams_tool_larsrc/web/WEB-INF/web.xml	14 Apr 2006 06:19:40 -0000	1.7
@@ -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