Index: lams_central/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -rb4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_central/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision b4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac)
+++ lams_central/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -1 +1 @@
-Class-Path: ./lams.jar ./lams-contentrepository.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
\ No newline at end of file
+Class-Path: ./lams.jar ./lams-contentrepository.jar 
\ No newline at end of file
Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac)
+++ lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -7,22 +7,13 @@
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
 				classpath:/org/lamsfoundation/lams/applicationContext.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/authoring/authoringApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 				<!--  Needed to communicate with the tools -->
 				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/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 -->
+				<!--  Add tool contexts after this -->
 	</param-value>
 </context-param>
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r14f91e4d4a063f4ac05b18e7dba1d5b3174a2024 -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 14f91e4d4a063f4ac05b18e7dba1d5b3174a2024)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -10,22 +10,14 @@
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
 				classpath:/org/lamsfoundation/lams/applicationContext.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/authoring/authoringApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 				<!--  Needed to communicate with the tools -->
 				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/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 -->
+				<!--  Add tool contexts after this -->
 	</param-value>
 </context-param>
 
Index: lams_learning/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -rb4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_learning/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision b4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac)
+++ lams_learning/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -1 +1 @@
-Class-Path: ./lams.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
\ No newline at end of file
+Class-Path: ./lams.jar ./lams-learning.jar 
\ No newline at end of file
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b4640f8e366d2ac3bcc5f02e7bb749ce563cb8ac)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -8,17 +8,10 @@
 	<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/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 -->
+		<!--  Add tool contexts after this -->
 	</param-value>
 </context-param>
 <listener>
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	(.../TestExportPortfolioService.java)	(revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	(.../TestExportPortfolioService.java)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -108,7 +108,7 @@
     {
         return new String[] { "classpath:/org/lamsfoundation/lams/localApplicationContext.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:*/applicationContext.xml"};
     }
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -149,7 +149,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/tool/survey/applicationContext.xml",            
     			"/org/lamsfoundation/lams/learning/learningApplicationContext.xml"};
     }
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java	(.../AbstractTestAction.java)	(revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java	(.../AbstractTestAction.java)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -46,7 +46,7 @@
     protected String getContextConfigLocation()
     {
         return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "
-  			   +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml "
+  			   +"/org/lamsfoundation/lams/toolApplicationContext.xml "
   			   +"/org/lamsfoundation/lams/localApplicationContext.xml ";
     }
     /**
Index: lams_learning/test/web/WEB-INF/web.xml
===================================================================
diff -u -rfc085e0eda6c46d659c5b98f9ee9e29f495af042 -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
+++ lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -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/mc/mcApplicationContext.xml 
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -ra7766445094c16b343aa56dc1f73fd3051cef1db -rcdab8186de5e9c75a9d6774616ead602dbf9cb69
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision a7766445094c16b343aa56dc1f73fd3051cef1db)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
@@ -10,16 +10,10 @@
 	<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/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 -->
+		<!--  Add tool contexts after this -->
 	</param-value>
 </context-param>
 <listener>