Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -r7473d498dd9a1beb27a3f29d9364eca13e9b8165 -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd)
@@ -88,10 +88,9 @@
 
 
 -- test data for content questions table
-INSERT INTO tl_laqa11_que_content (qa_que_content_id, 
-									question, 
+INSERT INTO tl_laqa11_que_content (question, 
 									display_order, 
-									qa_content_id) VALUES (1,'What is the capital of Russia?',1,${default_content_id});
+									qa_content_id) VALUES ('What is the capital of Russia?',1,${default_content_id});
 
 
 
Fisheye: Tag 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/BasicToolVO.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r7473d498dd9a1beb27a3f29d9364eca13e9b8165 -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd)
@@ -39,8 +39,6 @@
 				<value>/WEB-INF/QaQueContent.hbm.xml</value>
 				<value>/WEB-INF/QaQueUsr.hbm.xml</value>
 				<value>/WEB-INF/QaUsrResp.hbm.xml</value>
-
-				<value>/WEB-INF/BasicToolVO.hbm.xml</value>
 			</list>
 		</property>
 		<property name="hibernateProperties">
@@ -65,84 +63,6 @@
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
-	<!--  core beans -->
-	
-	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-	
-	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-	
-	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-	
-	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-
-	<bean id="organisationTypeDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-
-	<bean id="authenticationMethodDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-
-	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-
-	<bean id="userOrganisationRoleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>	
-	
-	
-	<!-- LAMS primary business object: Hibernate impleSmentation -->
-	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
-		singleton="false"
-	>
-		<property name="userDAO"><ref local="userDAO"/></property>
-		<property name="roleDAO"><ref local="roleDAO"/></property>
-		<property name="organisationDAO"><ref local="organisationDAO"/></property>
-		<property name="organisationTypeDAO"><ref local="organisationTypeDAO"/></property>
-		<property name="userOrganisationDAO"><ref local="userOrganisationDAO"/></property>
-		<property name="userOrganisationRoleDAO"><ref local="userOrganisationRoleDAO"/></property>
-		<property name="authenticationMethodDAO"><ref local="authenticationMethodDAO"/></property>
-	</bean>	
-	
-	<!-- LAMS primary business object: Hibernate impleSmentation -->
-	<bean id="lamsToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsToolService"
-		singleton="false"
-	>
-		<property name="toolDAO"><ref local="toolDAO"/></property>
-	</bean>	
-	
-	
-	<!--
-		- A parent bean definition which is a base definition for transaction proxies.
-		- It's marked as abstract, since it's not supposed to be instantiated itself.
-		- We set shared transaction attributes here, following our naming patterns.
-		- The attributes can still be overridden in child bean definitions.
-    -->
-	<bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="lamsToolServiceTarget"/></property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="create*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-				<prop key="copy*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-				<prop key="save*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
-				<prop key="update*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-				<prop key="get*">PROPAGATION_REQUIRED,readOnly,-QacpApplicationException</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-			</props>
-		</property>
-	</bean>
-	
-	
 	<!-- tool beans -->
 	<bean id="qaContentDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaContentDAO">
 		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
@@ -166,27 +86,30 @@
 	<!-- end of tool beans -->
 	
 
-	<bean id="qaService" parent="baseTransactionProxy">
-		<property name="target">
-			<bean class="org.lamsfoundation.lams.tool.qa.service.QaServicePOJO">
-				<property name="qaDAO"><ref bean="qaContentDAO"/></property>
-				<property name="qaSessionDAO"><ref bean="qaSessionDAO"/></property>
-				<property name="qaQueUsrDAO"><ref bean="qaQueUsrDAO"/></property>
-				<property name="qaQueContentDAO"><ref bean="qaQueContentDAO"/></property>
-				<property name="qaUsrRespDAO"><ref bean="qaUsrRespDAO"/></property>								
-				<!-- <property name="userManagementService"><ref bean="baseTransactionProxy"/></property> -->
-				<property name="toolService"><ref bean="baseTransactionProxy"/></property>			
-			</bean>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="configureContentRepository">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-			</props>
-		</property>
+	<bean id="qaService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+			<property name="target">
+				<bean class="org.lamsfoundation.lams.tool.qa.service.QaServicePOJO">
+					<property name="qaDAO"><ref bean="qaContentDAO"/></property>
+					<property name="qaSessionDAO"><ref bean="qaSessionDAO"/></property>
+					<property name="qaQueUsrDAO"><ref bean="qaQueUsrDAO"/></property>
+					<property name="qaQueContentDAO"><ref bean="qaQueContentDAO"/></property>
+					<property name="qaUsrRespDAO"><ref bean="qaUsrRespDAO"/></property>								
+					<!-- <property name="userManagementService"><ref bean="baseTransactionProxy"/></property> -->
+					<property name="toolService"><ref bean="lamsToolService"/></property>
+				</bean>
+			</property>
+			<property name="transactionAttributes">
+				<props>
+					<prop key="create*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="copy*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="save*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
+					<prop key="update*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="get*">PROPAGATION_REQUIRED,readOnly,-QacpApplicationException</prop>
+					<prop key="remove*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="configureContentRepository">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				</props>
+			</property>
 	</bean>  
 
-	<!--  DAO classes -->
-	
-	
-
 </beans>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r7473d498dd9a1beb27a3f29d9364eca13e9b8165 -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd)
@@ -1079,6 +1079,7 @@
     public long getToolDefaultContentIdBySignature(String toolSignature) throws QaApplicationException
     {
     	long contentId=0;
+    	logger.debug(logger + " " + this.getClass().getName() +  "before attempting retrieving tool with signature : " + toolSignature);
     	contentId=toolService.getToolDefaultContentIdBySignature(toolSignature);
     	logger.debug(logger + " " + this.getClass().getName() +  " " + "tool default contentId : " + contentId);
 	    return contentId;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -r7473d498dd9a1beb27a3f29d9364eca13e9b8165 -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd)
@@ -76,9 +76,13 @@
 		    request.getSession().setAttribute(TOOL_SERVICE, qaService);		
 		}
 		
+		/**
+		 * retrive the default content id based on tool signature
+		 */
+
 		try
 		{
-			logger.debug(logger + " " + this.getClass().getName() +  "attempte retrieving tool with signatute : " + MY_SIGNATURE);
+			logger.debug(logger + " " + this.getClass().getName() +  "attempt retrieving tool with signatute : " + MY_SIGNATURE);
 			long contentId=qaService.getToolDefaultContentIdBySignature(MY_SIGNATURE);
 			logger.debug(logger + " " + this.getClass().getName() +  "retrieved tool default contentId: " + contentId);
 			if (contentId == 0)
@@ -89,16 +93,16 @@
 				return (mapping.findForward(LOAD_QUESTIONS));	
 			}
 		}
-		catch(QaApplicationException e)
+		catch(Exception e)
 		{
 			logger.debug(logger + " " + this.getClass().getName() +  "error getting the default content id: " + e.getMessage());
 			persistError(request,"error.defaultContent.notSetup");
 	    	request.setAttribute(USER_EXCEPTION_DEAFULTCONTENT_NOTSETUP, new Boolean(true));
 			return (mapping.findForward(LOAD_QUESTIONS));
 		}
+
 		
 		
-		
 		/**
 	     * mark the http session as an authoring activity 
 	     */
Index: lams_tool_laqa/web/META-INF/MANIFEST.MF
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd
--- lams_tool_laqa/web/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd)
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.5.3 
 Created-By: 1.4.2_08-b03 (Sun Microsystems Inc.)
-Class-Path: ./lams.jar ./lams_contentrepository.jar ./lams-tool-questionAnswer.jar ./FCKeditor-2.1.jar
+Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./FCKeditor-2.1.jar ./lams-contentrepository.jar ./lams-learning.jar
 
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd)
@@ -10,8 +10,11 @@
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<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/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
-				
 		</param-value>
 	</context-param>