Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r629f9b144dd097e55be45019d71f8e6a5887cc38 -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r629f9b144dd097e55be45019d71f8e6a5887cc38 -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 629f9b144dd097e55be45019d71f8e6a5887cc38)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -4,14 +4,14 @@
 <!--
   - Application context definition for LAMS. Used to deploy to JBOSS.
 -->
-<beans>
+<beans default-autowire="no">
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<import resource="messageContext.xml"/>
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-  
+
  	<!-- Hibernate SessionFactory -->
 	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="dataSource"/></property>
@@ -54,13 +54,6 @@
 				<value>classpath:org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
  				
-				<!-- Tool related mapping files-->
-				<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/ToolSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml</value>
-				
 				<!-- Workspace related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml</value>
 				
@@ -85,11 +78,11 @@
 				<value>classpath:org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml</value>
 				
 				<!-- Mapping files for tools with complex conditions -->
-				
-				<value>classpath*:org/lamsfoundation/lams/tool/qa/*.hbm.xml</value>
-				<value>classpath*:org/lamsfoundation/lams/tool/notebook/model/*.hbm.xml</value>	
-                <value>classpath*:org/lamsfoundation/lams/tool/survey/model/*.hbm.xml</value>
-				<value>classpath*:org/lamsfoundation/lams/tool/forum/model/*.hbm.xml</value>
+
+				<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>
 			</list>
 		</property>
 		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
Index: lams_tool_chat/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_chat/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_chat/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -181,9 +181,6 @@
 				<include name="struts/*" />
 				<include name="tags/*.tag" />
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar" />
-			</lib>
 			<fileset dir="${conf.web.dir}">
 				<include name="*" />
 				<include name="common/**" />
Index: lams_tool_daco/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_daco/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_daco/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -265,7 +265,6 @@
 				<include name="tags/**"/>
 				<include name="tlds/**"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
Index: lams_tool_dimdim/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_dimdim/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_dimdim/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -181,9 +181,6 @@
 				<include name="struts/*" />
 				<include name="tags/*.tag" />
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar" />
-			</lib>
 			<fileset dir="${conf.web.dir}">
 				<include name="*" />
 				<include name="common/**" />
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -267,7 +267,6 @@
 				<include name="fckeditor/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
Index: lams_tool_gmap/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_gmap/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_gmap/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -181,9 +181,6 @@
 				<include name="struts/*" />
 				<include name="tags/*.tag" />
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar" />
-			</lib>
 			<fileset dir="${conf.web.dir}">
 				<include name="*" />
 				<include name="common/**" />
Index: lams_tool_images/build.xml
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_images/build.xml	(.../build.xml)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -273,7 +273,6 @@
 				<include name="tags/**"/>
 				<include name="tlds/**"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -269,7 +269,6 @@
 				<include name="tags/**"/>
 				<include name="tlds/**"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
Index: lams_tool_nb/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_nb/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_nb/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -214,8 +214,6 @@
 				<include name="struts/*"/>
 				<include name="tags/*.*"/>
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar"/> </lib>
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/*"/>
Index: lams_tool_notebook/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_notebook/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_notebook/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -181,9 +181,6 @@
 				<include name="struts/*" />
 				<include name="tags/*.tag" />
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar" />
-			</lib>
 			<fileset dir="${conf.web.dir}">
 				<include name="*" />
 				<include name="common/**" />
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -255,7 +255,6 @@
 	   				<exclude name="classes/**"/>
 	   				
 	   			</webinf>
-	   			<classes dir="${build.classes.java}"/>	
 	   			<!-- front end programs like HTML, JSP, CSS etc. -->
 	   			<fileset dir="${conf.web.dir}">
 						<include name="**/*.jsp"/>
Index: lams_tool_scribe/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_scribe/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_scribe/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -181,9 +181,6 @@
 				<include name="struts/*" />
 				<include name="tags/*.tag" />
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar" />
-			</lib>
 			<fileset dir="${conf.web.dir}">
 				<include name="*" />
 				<include name="common/**" />
Index: lams_tool_spreadsheet/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_spreadsheet/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_spreadsheet/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -269,7 +269,6 @@
 				<include name="tags/**"/>
 				<include name="tlds/**"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
Index: lams_tool_survey/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_survey/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_survey/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -266,7 +266,6 @@
 				<include name="tags/**"/>
 				<include name="tlds/**"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
Index: lams_tool_task/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_task/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_task/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -270,7 +270,6 @@
 				<include name="tags/**"/>
 				<include name="tlds/**"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
Index: lams_tool_wiki/build.xml
===================================================================
diff -u -r40fb72d3289330a49552817cf29d032ba4e203a1 -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3
--- lams_tool_wiki/build.xml	(.../build.xml)	(revision 40fb72d3289330a49552817cf29d032ba4e203a1)
+++ lams_tool_wiki/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
@@ -198,9 +198,6 @@
 				<include name="struts/*" />
 				<include name="tags/*.tag" />
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar" />
-			</lib>
 			<fileset dir="${conf.web.dir}">
 				<include name="*" />
 				<include name="common/**" />