Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b -r68b6819da85504e0d17a843f8fe2dea5ec200d31
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 68b6819da85504e0d17a843f8fe2dea5ec200d31)
@@ -19,7 +19,7 @@
 		<property name="dataSource"><ref bean="dataSource"/></property>
 		<property name="mappingLocations">
 			<list>
-				<!-- usermanagement related mapping files -->	
+			<!-- 	
 				<value>classpath:org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml</value>
@@ -38,7 +38,6 @@
 				<value>classpath:org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml</value>
 				
-				<!-- learning design related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/learningdesign/Activity.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
@@ -54,42 +53,31 @@
 				<value>classpath:org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml</value>
 				
-				
-				<!-- lesson related mapping files-->
 				<value>classpath:org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
  				<value>classpath:org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml</value>
  				
-				<!-- Workspace related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml</value>
 				
-				<!-- Theme related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/themes/Theme.hbm.xml</value>
 				
-				<!-- Core Notebook Service related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml</value>
 				
-				<!-- Presence Chat Service related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/presence/model/PresenceChatMessage.hbm.xml</value>
 				
-				<!-- Event notification service related mapping files-->
 				<value>classpath:org/lamsfoundation/lams/events/Event.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/events/Subscription.hbm.xml</value>
 				
-				<!--  Configuration related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/config/Registration.hbm.xml</value>
 				
-				<!-- Integration related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml</value>
 				
-				<!-- Pedagogical Planner related mapping files-->
 				<value>classpath:org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml</value>
 				
-								<!-- Gradebook related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml</value>
 				
@@ -99,11 +87,13 @@
 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml</value>
+				-->
+				<value>classpath*:org/lamsfoundation/lams/**/*.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>