Index: lams_central/conf/war/META-INF/MANIFEST.MF
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/war/META-INF/Attic/MANIFEST.MF,v
diff -u -r1.5 -r1.6
--- lams_central/conf/war/META-INF/MANIFEST.MF	11 Apr 2006 23:57:36 -0000	1.5
+++ lams_central/conf/war/META-INF/MANIFEST.MF	14 Apr 2006 06:42:01 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/web-settings.xml,v
diff -u -r1.9 -r1.10
--- lams_central/conf/xdoclet/web-settings.xml	11 Apr 2006 23:57:36 -0000	1.9
+++ lams_central/conf/xdoclet/web-settings.xml	14 Apr 2006 06:42:01 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.17 -r1.18
--- lams_central/web/WEB-INF/web.xml	10 Apr 2006 05:02:54 -0000	1.17
+++ lams_central/web/WEB-INF/web.xml	14 Apr 2006 06:42:01 -0000	1.18
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/war/META-INF/Attic/MANIFEST.MF,v
diff -u -r1.7 -r1.8
--- lams_learning/conf/war/META-INF/MANIFEST.MF	11 Apr 2006 23:56:55 -0000	1.7
+++ lams_learning/conf/war/META-INF/MANIFEST.MF	14 Apr 2006 06:41:27 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v
diff -u -r1.18 -r1.19
--- lams_learning/conf/xdoclet/web-settings.xml	11 Apr 2006 23:56:55 -0000	1.18
+++ lams_learning/conf/xdoclet/web-settings.xml	14 Apr 2006 06:41:27 -0000	1.19
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/Attic/TestExportPortfolioService.java,v
diff -u -r1.5 -r1.6
--- lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	5 Apr 2006 23:08:08 -0000	1.5
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	14 Apr 2006 06:41:28 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/service/Attic/TestLearnerService.java,v
diff -u -r1.26 -r1.27
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	5 Apr 2006 23:08:09 -0000	1.26
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	14 Apr 2006 06:41:28 -0000	1.27
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/Attic/AbstractTestAction.java,v
diff -u -r1.3 -r1.4
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java	5 Apr 2006 23:08:08 -0000	1.3
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java	14 Apr 2006 06:41:27 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.4 -r1.5
--- lams_learning/test/web/WEB-INF/web.xml	7 Apr 2006 00:35:19 -0000	1.4
+++ lams_learning/test/web/WEB-INF/web.xml	14 Apr 2006 06:41:27 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.23 -r1.24
--- lams_learning/web/WEB-INF/web.xml	10 Apr 2006 11:08:17 -0000	1.23
+++ lams_learning/web/WEB-INF/web.xml	14 Apr 2006 06:41:28 -0000	1.24
@@ -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>