Index: lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml
===================================================================
diff -u -r671eb4d5d117da007a95d4c0e2c6efff19b58817 -r0983a96e4ff5e060884e4bc9cbc028059302a8e1
--- lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	(.../localCommonContext.xml)	(revision 671eb4d5d117da007a95d4c0e2c6efff19b58817)
+++ lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	(.../localCommonContext.xml)	(revision 0983a96e4ff5e060884e4bc9cbc028059302a8e1)
@@ -123,7 +123,7 @@
 				<!-- Pedagogical Planner related mapping files-->
 				<value>classpath:org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml</value>
 				
-								<!-- Gradebook related mapping files -->
+				<!-- Gradebook related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml</value>
 				
@@ -134,188 +134,12 @@
 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml</value>
 				
-				<!-- Mapping files for all tools -->
-		 		
-				<value>classpath*:org/lamsfoundation/lams/tool/**/**/*.hbm.xml</value>
-				
-				<!-- Explicit list of tools' mapping files come handy in debugging 
-				
 				<value>classpath:org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/tool/SystemTool.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/forum/persistence/Timestamp.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/mc/McContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/mc/McSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/wiki/model/WikiAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/vote/VoteQueContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/vote/VoteQueUsr.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/vote/VoteSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/vote/VoteUploadedFile.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/vote/VoteUsrAttempt.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/taskList/model/TaskListUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/scribe/model/ScribeAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/pixlr/model/PixlrAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRating.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentOverallFeedback.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/rsrc/model/ResourceAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageRating.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/dimdim/model/Dimdim.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/daco/model/DacoAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml</value>
-				
-				<value>classpath:org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/chat/model/ChatAttachment.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml</value>
-				-->
 			</list>
 		</property>
 		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>