Index: lams_monitoring/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -rb4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_monitoring/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision b4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac)
+++ lams_monitoring/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -1,2 +1,2 @@
-Class-Path: ./lams.jar ./lams-monitoring.jar ./lams-central.jar ./lams-learning.jar ./lams-tool-lafrum11.jar ./lams-tool-laicp10.jar ./lams-tool-lamc11.jar ./lams-tool-lanb11.jar ./lams-tool-laqa11.jar ./lams-tool-lasbmt11.jar ./lams-tool-lasr10.jar ./lams-tool-lachat11.jar ./lams-tool-larsrc11.jar ./lams-tool-vote11.jar
+Class-Path: ./lams.jar ./lams-monitoring.jar ./lams-central.jar ./lams-learning.jar 
 
Index: lams_monitoring/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac)
+++ lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -7,20 +7,11 @@
 	<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/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-<!-- 		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml  -->
-		classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
-<!-- 		classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml -->
-<!-- 		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml -->
+		<!--  Add tool contexts after this -->
 	</param-value>
 </context-param>
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -136,7 +136,7 @@
         return new String[] { 
         		"/org/lamsfoundation/lams/localApplicationContext.xml",
         		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
-        		"/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+        		"/org/lamsfoundation/lams/toolApplicationContext.xml",
           		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml",        					  
           		"/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml",
           		"/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml",
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java	(.../TestGateAction.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java	(.../TestGateAction.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -76,7 +76,7 @@
     {
         return 	"/org/lamsfoundation/lams/localApplicationContext.xml "+
 		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "+
-		"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "+
+		"/org/lamsfoundation/lams/toolApplicationContext.xml "+
   		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml "+        					  
   		"/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml "+
   		"/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml "+
@@ -90,7 +90,7 @@
 		+"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
 		+"/WEB-INF/spring/authoringApplicationContext.xml "
 		+"/WEB-INF/spring/learningApplicationContext.xml "
-		+"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
+		+"/org/lamsfoundation/lams/toolApplicationContext.xml "
 		+"/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml "
 		+"/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml";
     } */
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java	(.../TestMonitoringAction.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java	(.../TestMonitoringAction.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -62,7 +62,7 @@
     {
         return 	"/org/lamsfoundation/lams/localApplicationContext.xml "+
 		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "+
-		"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "+
+		"/org/lamsfoundation/lams/toolApplicationContext.xml "+
   		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml "+        					  
   		"/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml "+
   		"/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml "+
Index: lams_monitoring/test/web/WEB-INF/web.xml
===================================================================
diff -u -rfc085e0eda6c46d659c5b98f9ee9e29f495af042 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
+++ lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -10,7 +10,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/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -ra7766445094c16b343aa56dc1f73fd3051cef1db -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision a7766445094c16b343aa56dc1f73fd3051cef1db)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -10,20 +10,12 @@
 	<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/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-<!-- 		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml  -->
-		classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
-<!-- 		classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml -->
-<!-- 		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml -->
+		<!--  Add tool contexts after this -->
 	</param-value>
 </context-param>
 
Index: lams_tool_chat/build.xml
===================================================================
diff -u -r8d5c540b1da67b18a80b3145c81c1ce04c2c17b2 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_chat/build.xml	(.../build.xml)	(revision 8d5c540b1da67b18a80b3145c81c1ce04c2c17b2)
+++ lams_tool_chat/build.xml	(.../build.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -337,12 +337,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_chat.sql" 
 			toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_chat.sql" 
 			toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" 
 			toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" 
 			toolInsertScriptPath="${db.scripts}/tool_insert.sql" 
+			toolApplicationContextPath="/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml"
 			lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" 
 			toolWebUri="${product}.war"
 			languageFilesPackage="org.lamsfoundation.lams.tool.chat">
Index: lams_tool_chat/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r8d5c540b1da67b18a80b3145c81c1ce04c2c17b2 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_chat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 8d5c540b1da67b18a80b3145c81c1ce04c2c17b2)
+++ lams_tool_chat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -10,7 +10,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/chat/chatApplicationContext.xml			
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -r8d5c540b1da67b18a80b3145c81c1ce04c2c17b2 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 8d5c540b1da67b18a80b3145c81c1ce04c2c17b2)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -13,7 +13,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/chat/chatApplicationContext.xml			
Index: lams_tool_example/build.xml
===================================================================
diff -u -rbb753a6fb63b04b00f1bf56e369a5474177c9ada -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_example/build.xml	(.../build.xml)	(revision bb753a6fb63b04b00f1bf56e369a5474177c9ada)
+++ lams_tool_example/build.xml	(.../build.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -337,12 +337,14 @@
 					dbDriverUrl="${db.url}"
 					dbDriverClass="com.mysql.jdbc.Driver"
 					deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+					toolJarFileName="${product}.jar"
 					toolSignature="${signature}"
 					toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_example.sql"
 					toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_example.sql"
 					toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql"
 					toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql"
 					toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql"
+					toolApplicationContextPath="/org/lamsfoundation/lams/tool/example/applicationContext.xml"
 					lamsEarPath="${jboss.deploy}"
 					toolContext="${toolContext}"
 					toolWebUri="${product}.war"
Index: lams_tool_example/conf/xdoclet/web-settings.xml
===================================================================
diff -u -ra7766445094c16b343aa56dc1f73fd3051cef1db -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_example/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision a7766445094c16b343aa56dc1f73fd3051cef1db)
+++ lams_tool_example/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -10,7 +10,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/example/applicationContext.xml			
Index: lams_tool_example/web/WEB-INF/web.xml
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -13,7 +13,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/example/applicationContext.xml			
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/ActionBaseTest.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/ActionBaseTest.java	(.../ActionBaseTest.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/ActionBaseTest.java	(.../ActionBaseTest.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -40,7 +40,7 @@
         context.setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
         		"org/lamsfoundation/lams/localApplicationContext.xml," +
 				 "org/lamsfoundation/lams/contentrepository/applicationContext.xml," +
-				 "org/lamsfoundation/lams/tool/toolApplicationContext.xml," +
+				 "org/lamsfoundation/lams/toolApplicationContext.xml," +
 				 "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml," +
 				 "org/lamsfoundation/lams/learning/learningApplicationContext.xml,"+	
 				 "org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml,");
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/BaseTest.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/BaseTest.java	(.../BaseTest.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/BaseTest.java	(.../BaseTest.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -36,7 +36,7 @@
 	protected String[] getContextConfigLocation() {
 		return new String[] {"org/lamsfoundation/lams/localApplicationContext.xml",
 				 "org/lamsfoundation/lams/contentrepository/applicationContext.xml",
-				 "org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+				 "org/lamsfoundation/lams/toolApplicationContext.xml",
 				 "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
 				 "org/lamsfoundation/lams/learning/learningApplicationContext.xml",	
 				 "org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml"};
Index: lams_tool_nb/build.xml
===================================================================
diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_nb/build.xml	(.../build.xml)	(revision 992d0d544a920da849e7d1a6b3f2006f816f7d86)
+++ lams_tool_nb/build.xml	(.../build.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -429,12 +429,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_nb.sql"
 					toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_nb.sql"
 					toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
 					toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
 					toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+					toolApplicationContextPath="/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml"
 					lamsEarPath="${jboss.deploy}"
 					toolContext="${toolContext}"
 					toolWebUri="${product}.war"
Index: lams_tool_nb/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_nb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_nb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -7,7 +7,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/tool/noticeboard/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java
===================================================================
diff -u -r1bf30edca36c1de9ca329e9140bf4673c1225028 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision 1bf30edca36c1de9ca329e9140bf4673c1225028)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -140,7 +140,7 @@
     	return new String[] {
     	        "org/lamsfoundation/lams/localApplicationContext.xml",
     			"org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
-    			"org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+    			"org/lamsfoundation/lams/toolApplicationContext.xml",
     			"org/lamsfoundation/lams/learning/learningApplicationContext.xml",
     			"org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml"};
     }
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r8f07317c71b1749ef616c0d42f5b49e9a14c43a8 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 8f07317c71b1749ef616c0d42f5b49e9a14c43a8)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -10,7 +10,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/tool/noticeboard/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -375,12 +375,14 @@
 			dbDriverUrl="${db.url}"
 			dbDriverClass="${db.driver}"
 			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_sbmt.sql"
 			toolTablesScriptPath="${db.scripts}/create_lams_tool_sbmt.sql"
 			toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
 			toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
 			toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+			toolApplicationContextPath="/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml"
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
Index: lams_tool_sbmt/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r387e02f25594fa9e7f80e4d3fa7620b28fd9f69f -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_sbmt/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 387e02f25594fa9e7f80e4d3fa7620b28fd9f69f)
+++ lams_tool_sbmt/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -10,7 +10,7 @@
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
 	</param-value>
 </context-param>
 <context-param>
Index: lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/SbmtBaseTestCase.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/SbmtBaseTestCase.java	(.../SbmtBaseTestCase.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/SbmtBaseTestCase.java	(.../SbmtBaseTestCase.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -62,7 +62,7 @@
 							 "org/lamsfoundation/lams/contentrepository/applicationContext.xml",
 							 "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
 							 "org/lamsfoundation/lams/learning/learningApplicationContext.xml",	
-							 "org/lamsfoundation/lams/tool/toolApplicationContext.xml"};
+							 "org/lamsfoundation/lams/toolApplicationContext.xml"};
 	}
 
 
Index: lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/web/SbmtBaseTestAction.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/web/SbmtBaseTestAction.java	(.../SbmtBaseTestAction.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/web/SbmtBaseTestAction.java	(.../SbmtBaseTestAction.java)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -46,7 +46,7 @@
 				 "org/lamsfoundation/lams/contentrepository/applicationContext.xml,"+
 				 "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml,"+
 				 "org/lamsfoundation/lams/learning/learningApplicationContext.xml,"+	
-				 "org/lamsfoundation/lams/tool/toolApplicationContext.xml,");
+				 "org/lamsfoundation/lams/toolApplicationContext.xml,");
         ctxLoader.initWebApplicationContext(context);
 	}
 }
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r8f07317c71b1749ef616c0d42f5b49e9a14c43a8 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 8f07317c71b1749ef616c0d42f5b49e9a14c43a8)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -13,7 +13,7 @@
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
 	</param-value>
 </context-param>
 <context-param>
Index: lams_tool_vote/build.xml
===================================================================
diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_vote/build.xml	(.../build.xml)	(revision 402985c35e80fbce6960c7d7598b0262292398eb)
+++ lams_tool_vote/build.xml	(.../build.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -380,12 +380,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_vote.sql"
 				toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_vote.sql"
 				toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
 				toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
 				toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+				toolApplicationContextPath="/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml"
 				lamsEarPath="${jboss.deploy}"
 				toolContext="${toolContext}"
 				toolWebUri="${product}.war"
Index: lams_tool_vote/test/web/WEB-INF/web.xml
===================================================================
diff -u -r19bc5e18dcd7f69fba1b72edbcda28ae3c1de2e4 -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 19bc5e18dcd7f69fba1b72edbcda28ae3c1de2e4)
+++ lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -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/vote/voteApplicationContext.xml
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r1c7c157a72edb59e9bbd8b7300d0b31eb52df88d -rad683fcaeabe83c702b599c5c866bb7d30cd7191
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 1c7c157a72edb59e9bbd8b7300d0b31eb52df88d)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
@@ -31,7 +31,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/vote/voteApplicationContext.xml