Index: lams_build/3rdParty.userlibraries
===================================================================
RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v
diff -u -r1.40.2.1.2.1 -r1.40.2.1.2.2
--- lams_build/3rdParty.userlibraries	13 May 2009 09:37:53 -0000	1.40.2.1.2.1
+++ lams_build/3rdParty.userlibraries	18 May 2009 15:44:40 -0000	1.40.2.1.2.2
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="WINDOWS-1250"?>
+<?xml version="1.0" encoding="WINDOWS-1250" standalone="no"?>
 <eclipse-userlibraries version="2">
     <library name="3rdParty" systemlibrary="false">
         <archive path="/lams_build/lib/autopatch/tk-autopatch-1.2.0-b2-cvs.jar"/>
@@ -30,10 +30,10 @@
         <archive javadoc="http://velocity.apache.org/engine/releases/velocity-1.4/api/" path="/lams_build/lib/middlegen/velocity-1.4-dev.jar"/>
         <archive path="/lams_build/lib/middlegen/middlegen-2.1.jar"/>
         <archive path="/lams_build/lib/middlegen/middlegen-hibernate-plugin-2.1.jar"/>
-<archive path="/lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar"/>
+        <archive path="/lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar"/>
         <archive path="/lams_build/lib/odmg/odmg-3.0.jar"/>
         <archive path="/lams_build/lib/quartz/quartz.jar"/>
-        <archive javadoc="http://static.springframework.org/spring/docs/1.2.x/api/" path="/lams_build/lib/spring/spring.jar" source="/lams_build/lib/spring/src/spring-framework-1.2.8-src.zip"/>
+        <archive javadoc="http://static.springframework.org/spring/docs/2.5.x/api/" path="/lams_build/lib/spring/spring.jar"/>
         <archive path="/lams_build/lib/struts/struts-el.jar"/>
         <archive javadoc="http://struts.apache.org/1.x/apidocs/" path="/lams_build/lib/struts/struts.jar" source="/lams_build/lib/struts/src/struts-1.2.9-src.zip"/>
         <archive path="/lams_build/lib/struts/antlr.jar"/>
Index: lams_build/lib/spring/jboss-spring-int-deployers.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/spring/jboss-spring-int-deployers.jar,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_build/lib/spring/jboss-spring-int-vfs.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/spring/jboss-spring-int-vfs.jar,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_build/lib/spring/spring.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/spring/spring.jar,v
diff -u -r1.3 -r1.3.14.1
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml,v
diff -u -r1.5.2.1.2.1 -r1.5.2.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	13 May 2009 10:05:21 -0000	1.5.2.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	18 May 2009 15:42:14 -0000	1.5.2.1.2.2
@@ -28,51 +28,51 @@
 		 <value>classpath*:org/lamsfoundation/lams/tool/**/*pplicationContext.xml</value>
 		 collects all application context files from all deployed lams tools.
 		 
-		 [IMPORTANT!!!!
-		  UPDATE: JBoss 5.1.0.CR1 still has bugs when it comes ot Ant-style pattern resolution, like the one above.
-		  The pattern had to be change to explicit list of tools, until a good solution is found.
-		  This means that the list of deployed tools is fixed and any changes done to it will cause deployment errors.
-		 ]
+		  JBoss 5.1.0.CR1 had bugs when it comes ot Ant-style pattern resolution, like the one above.
+		  Fortunatelly, a quick reaction from JBoss developers brought a solution,
+		  the new class, VFSClassPathXmlApplicationContext, which is currently used.	 
 		 
 		 If new application context file is used in development and its beans need to be added to shared context,
 		 just add it to the end (or wherever it is suitable) of the list.
 	 -->
 	 
 	<bean id="context.central"
-         class="org.springframework.context.support.ClassPathXmlApplicationContext">
+         class="org.jboss.spring.factory.VFSClassPathXmlApplicationContext">
      <constructor-arg>
        <list>
        		<value>/org/lamsfoundation/lams/applicationContext.xml</value>
 			<value>/org/lamsfoundation/lams/toolApplicationContext.xml</value>
 			<value>/org/lamsfoundation/lams/contentrepository/applicationContext.xml</value>
 			<value>/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml</value>
 			<value>/org/lamsfoundation/lams/learning/learningApplicationContext.xml</value>
-			<!--
+			
 			 <value>classpath*:org/lamsfoundation/lams/tool/**/*pplicationContext.xml</value>
+			 
+			 <!-- 
 			 <value>/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml</value>
 			 <value>/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml</value>
 			 <value>/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml</value>
-			 -->
 			 
-			<value>/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml</value>
-
+			 <value>/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml</value>
+			 <value>/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml</value>
+			-->
+			
 			<value>/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml</value>
 			<value>/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml</value>
 			<value>/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml</value>
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.79.2.2.2.1 -r1.79.2.2.2.2
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	13 May 2009 10:05:21 -0000	1.79.2.2.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	18 May 2009 15:42:14 -0000	1.79.2.2.2.2
@@ -100,21 +100,12 @@
 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml</value>
 				
-				<!-- Mapping files for tools with complex conditions
+				<!-- Mapping files for all tools -->
+		 		
+				<value>classpath*:org/lamsfoundation/lams/tool/**/**/*.hbm.xml</value>
 				
-		 			[IMPORTANT!!!!
-		  			 UPDATE: JBoss 5.1.0.CR1 still has bugs when it comes ot Ant-style pattern resolution, like the ones below.
-		 			 The patterns had to be change to explicit list of tools, until a good solution is found.
-		 			 This means that the list of deployed tools is fixed and any changes done to it will cause deployment errors.
-		 			]
-		 			
-				<value>classpath*:org/lamsfoundation/lams/tool/**/*.hbm.xml</value>
-				<value>classpath*:org/lamsfoundation/lams/tool/**/model/*.hbm.xml</value>
-				<value>classpath*:org/lamsfoundation/lams/tool/**/persistence/*.hbm.xml</value>
-				<value>classpath*:org/lamsfoundation/lams/tool/**/pojos/*.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>
@@ -159,8 +150,6 @@
 				<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>
@@ -201,7 +190,6 @@
 				<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>
@@ -229,8 +217,6 @@
 				<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>
@@ -268,7 +254,6 @@
 				<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>
@@ -296,7 +281,7 @@
 				<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>