Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/BasicToolVO.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/Attic/QaContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -19,9 +19,10 @@
         type="java.lang.Long"
         column="qa_content_id"
     >
-        <generator class="assigned" />
+	    <generator class="assigned"/>
     </id>
 
+
     <property
         name="title"
         type="java.lang.String"
Index: lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/Attic/QaQueContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -18,8 +18,7 @@
             column="qa_que_content_id"
             type="java.lang.Long"
         >
-            <generator class="increment">
-            </generator>
+		    <generator class="increment"/>
         </id>
 
         <property
Index: lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/Attic/QaQueUsr.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="que_usr_id"
     >
-        <generator class="assigned" />
+		    <generator class="assigned"/>
     </id>
 
     <property
@@ -71,6 +71,5 @@
               />
    </set>
 
-
 </class>
 </hibernate-mapping>
Index: lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/Attic/QaSession.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -17,7 +17,7 @@
         type="java.lang.Long"
         column="qa_session_id"
     >
-        <generator class="assigned"/>
+		    <generator class="assigned"/>
     </id>
 
     <property
Index: lams_tool_laqa/conf/hibernate/mappings/QaUsrResp.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/Attic/QaUsrResp.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/conf/hibernate/mappings/QaUsrResp.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/conf/hibernate/mappings/QaUsrResp.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="response_id"
     >
-        <generator class="increment" />
+		    <generator class="increment"/>
     </id>
 
     <property
Index: lams_tool_laqa/conf/war/META-INF/MANIFEST.MF
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/war/META-INF/Attic/MANIFEST.MF,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/conf/war/META-INF/MANIFEST.MF	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/conf/war/META-INF/MANIFEST.MF	28 Jun 2005 07:24:55 -0000	1.2
@@ -1 +1 @@
-Class-Path: ./lams.jar ./lams-tool-questionAnswer.jar ./FCKeditor-2.1.jar ./lams_contentrepository.jar
+Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./FCKeditor-2.1.jar ./lams_contentrepository.jar ./lams-learning.jar
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -19,9 +19,10 @@
         type="java.lang.Long"
         column="qa_content_id"
     >
-        <generator class="assigned" />
+	    <generator class="assigned"/>
     </id>
 
+
     <property
         name="title"
         type="java.lang.String"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaQueContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -18,8 +18,7 @@
             column="qa_que_content_id"
             type="java.lang.Long"
         >
-            <generator class="increment">
-            </generator>
+		    <generator class="increment"/>
         </id>
 
         <property
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaQueUsr.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="que_usr_id"
     >
-        <generator class="assigned" />
+		    <generator class="assigned"/>
     </id>
 
     <property
@@ -71,6 +71,5 @@
               />
    </set>
 
-
 </class>
 </hibernate-mapping>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaSession.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -17,7 +17,7 @@
         type="java.lang.Long"
         column="qa_session_id"
     >
-        <generator class="assigned"/>
+		    <generator class="assigned"/>
     </id>
 
     <property
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUsrResp.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	21 Jun 2005 05:43:03 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="response_id"
     >
-        <generator class="increment" />
+		    <generator class="increment"/>
     </id>
 
     <property
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/User.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaContent.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	24 Jun 2005 08:56:54 -0000	1.2
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.3
@@ -19,9 +19,10 @@
         type="java.lang.Long"
         column="qa_content_id"
     >
-        <generator class="assigned" />
+	    <generator class="assigned"/>
     </id>
 
+
     <property
         name="title"
         type="java.lang.String"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaQueContent.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	24 Jun 2005 08:56:54 -0000	1.2
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.3
@@ -18,8 +18,7 @@
             column="qa_que_content_id"
             type="java.lang.Long"
         >
-            <generator class="increment">
-            </generator>
+		    <generator class="increment"/>
         </id>
 
         <property
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaQueUsr.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	24 Jun 2005 08:56:54 -0000	1.2
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	28 Jun 2005 07:24:55 -0000	1.3
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="que_usr_id"
     >
-        <generator class="assigned" />
+		    <generator class="assigned"/>
     </id>
 
     <property
@@ -71,6 +71,5 @@
               />
    </set>
 
-
 </class>
 </hibernate-mapping>
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaSession.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	24 Jun 2005 08:56:54 -0000	1.2
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	28 Jun 2005 07:24:55 -0000	1.3
@@ -17,7 +17,7 @@
         type="java.lang.Long"
         column="qa_session_id"
     >
-        <generator class="assigned"/>
+		    <generator class="assigned"/>
     </id>
 
     <property
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaUsrResp.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	24 Jun 2005 08:56:54 -0000	1.2
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	28 Jun 2005 07:24:55 -0000	1.3
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="response_id"
     >
-        <generator class="increment" />
+		    <generator class="increment"/>
     </id>
 
     <property
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaContent.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	27 Jun 2005 01:49:54 -0000	1.3
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	28 Jun 2005 07:24:55 -0000	1.4
@@ -10,8 +10,10 @@
 package org.lamsfoundation.lams.tool.qa;
 
 import org.lamsfoundation.lams.tool.BasicToolVO;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
 
 
+
 /*
  * 
  * @author ozgurd
@@ -27,10 +29,11 @@
 public class TestQaContent extends QaDataAccessTestCase
 {
 	public org.lamsfoundation.lams.tool.dao.IToolDAO toolDAO;
+	public ILamsToolService lamsToolService;
+	
 	protected void setUp() throws Exception
     {
         super.setUp();
-      	System.out.println(this.getClass().getName() + " \nTestQaContent started: ");
     }
 
     protected void tearDown() throws Exception
@@ -154,19 +157,14 @@
     	System.out.println(this.getClass().getName() + " DEFAULT_CONTENT_ID removed");
     }
     */
-    
+ 
+    /*
     public void testRemoveQaContent()
     {
     	QaContent qaContent = qaContentDAO.loadQaById(TEST_NONEXISTING_CONTENT_ID);
     	System.out.println(this.getClass().getName() + "qaContent loaded : " + qaContent);
     }
+    */
     
-    public void testCoreToolClass()
-    {
-    	BasicToolVO tool=toolDAO.getToolBySignature("laqa11");
-    	System.out.println(this.getClass().getName() + "the tool is : " + tool);
-    }
-
-
     
 }
\ No newline at end of file
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/qaApplicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	24 Jun 2005 08:56:54 -0000	1.1
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -63,72 +63,6 @@
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
-	<!--  core beans -->
-	<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>	
-	
-	
-	<!--
-		- 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="userManagementServiceTarget"/></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>
@@ -152,26 +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>			
-			</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/test/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/web/WEB-INF/Attic/struts-config.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/test/web/WEB-INF/struts-config.xml	28 Jun 2005 07:24:55 -0000	1.1
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
+
+<struts-config>
+
+  <!-- ========== Data Sources Definitions =================================== -->
+  <!--
+    Define your Struts data sources in a file called struts-data-sources.xml and place
+    it in your merge directory.
+  -->
+
+  <!-- ========== Form Bean Definitions =================================== -->
+  <form-beans>
+
+    <!--
+         If you have non XDoclet forms, define them in a file called struts-forms.xml and
+         place it in your merge directory.
+    -->
+  </form-beans>
+
+  <!-- ========== Global Exceptions Definitions =================================== -->
+  <!--
+    Define your exceptions in a file called global-exceptions.xml and place
+    it in your merge directory.
+  -->
+
+  <!-- ========== Global Forward Definitions =================================== -->
+  <!--
+    Define your forwards in a file called global-forwards.xml and place
+    it in your merge directory.
+  -->
+
+  <!-- ========== Action Mapping Definitions =================================== -->
+   <action-mappings>
+
+    <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
+  </action-mappings>
+
+   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
+
+   <!-- Define your Struts message-resources in a file called struts-message-resources.xml and place it in your merge directory. -->
+
+   <!-- Define your Struts plugins in a file called struts-plugins.xml and place it in your merge directory. -->
+
+</struts-config>
Index: lams_tool_laqa/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/web/WEB-INF/Attic/web.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	28 Jun 2005 07:24:55 -0000	1.1
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app >
+	<context-param>
+	  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+	  	<param-value>org.lamsfoundation.lams.tool.qa.QaResources</param-value>
+	</context-param>
+	<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>
+	
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>	
+
+    <!--
+    To use non XDoclet filters, create a filters.xml file that
+    contains the additional filters (eg Sitemesh) and place it in your
+    project's merge dir.  Don't include filter-mappings in this file,
+    include them in a file called filter-mappings.xml and put that in
+    the same directory.
+    -->
+
+    <!--
+    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
+    contains the additional filter-mappings and place it in your
+    project's merge dir.
+    -->
+
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
+
+     	<!--
+	  - Loads the root application context of this web app at startup,
+	  - by default from "/WEB-INF/applicationContext.xml".
+		- Note that it is preferable to use ContextLoaderListener in a servlet container
+		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
+		-
+	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
+	  - to access it anywhere in the web application, outside of the framework.
+	  -
+	  - The root context is the parent of all servlet-specific contexts.
+	  - This means that its beans are automatically available in these child contexts,
+	  - both for getBean(name) calls and (external) bean references.
+		-->
+	<servlet>
+		<servlet-name>context</servlet-name>
+		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet>
+	    <servlet-name>action</servlet-name>
+	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+	    <init-param>
+	      <param-name>config</param-name>
+	      <param-value>/WEB-INF/struts-config.xml</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>debug</param-name>
+	      <param-value>999</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>detail</param-name>
+	      <param-value>2</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>validate</param-name>
+	      <param-value>true</param-value>
+	    </init-param>
+	    <load-on-startup>2</load-on-startup>
+    </servlet>
+
+  	<servlet-mapping>
+		<servlet-name>action</servlet-name>
+	    <url-pattern>*.do</url-pattern>
+	</servlet-mapping>
+
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
+
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
+
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
+
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+  <!--
+  To add taglibs by xml, create a file called taglibs.xml and place it
+  in your merge dir.
+  -->
+
+   <!--
+   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
+   Organize web-security.xml following this DTD slice:
+
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
+
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
+
+</web-app>
Index: lams_tool_laqa/test/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/test/web/WEB-INF/tiles/tiles-defs.xml	28 Jun 2005 07:24:55 -0000	1.1
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+-->
+<!DOCTYPE tiles-definitions PUBLIC
+   "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+   "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
+ 
+<tiles-definitions>
+<!-- ============= template Definitions ====================== -->
+	<definition name=".baseDef" path="/template.jsp">
+		<put name="title" value="Base Template Page"/>
+		<put name="pageHeader" value = "Base Template"/>
+		<put name="header" value="/header.jsp"/>
+		<put name="content" value="/baseContent.jsp" />	
+		<put name="footer" value="/footer.jsp"/>	
+	</definition>
+<!-- ============= Exception Page Definitions ====================== -->	
+	<definition name=".systemError" extends=".baseDef" >
+		<put name="title" value="System Error Page"/>
+		<put name="pageHeader" value = "System Exception"/>
+		<put name="content" value="/systemErrorContent.jsp" />	
+	</definition>
+
+<!-- ============= Qa Authoring Page Definitions ====================== -->	
+	<definition name=".questions" extends=".baseDef" >
+		<put name="title" value="Questions for Q/A"/>
+		<put name="pageHeader" value = "Questions for Q/A"/>
+		<put name="content" value="/questionsContent.jsp" />	
+	</definition>
+	
+<!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
+	<definition name=".starter" extends=".baseDef" >
+		<put name="title" value="Starter for Q/A Authoring"/>
+		<put name="pageHeader" value = "Starter for Q/A Authoring"/>
+		<put name="content" value="/index.jsp" />	
+	</definition>
+	
+<!-- ============= Qa Learning Page Definitions ====================== -->	
+	<definition name=".answers" extends=".baseDef" >
+		<put name="title" value="Answers for Q/A"/>
+		<put name="pageHeader" value = "Answers for Q/A"/>
+		<put name="content" value="/answersContent.jsp" />	
+	</definition>
+	
+<!-- ============= Qa Learning Starter Page Definitions ====================== -->	
+	<definition name=".learningStarter" extends=".baseDef" >
+		<put name="title" value="Starter for Q/A Learning"/>
+		<put name="pageHeader" value = "Starter for Q/A Learning"/>
+		<put name="content" value="/learnerIndex.jsp" />	
+	</definition>
+	
+	<definition name=".learnerReport" extends=".baseDef" >
+		<put name="title" value="Learner Report"/>
+		<put name="pageHeader" value = "Learner Report"/>
+		<put name="content" value="/learnerReport.jsp" />	
+	</definition>
+
+	<definition name=".monitoringReport" extends=".baseDef" >
+		<put name="title" value="Monitoring Report"/>
+		<put name="pageHeader" value = "Monitoring Report"/>
+		<put name="content" value="/monitoringReport.jsp" />	
+	</definition>
+
+	<definition name=".monitoringError" extends=".baseDef" >
+		<put name="title" value="Monitoring Error"/>
+		<put name="pageHeader" value = "Monitoring Error"/>
+		<put name="content" value="/monitoringErrorScreen.jsp" />	
+	</definition>
+
+
+<!-- ============= Qa Monitoring Starter Page Definitions ====================== -->	
+	<definition name=".monitoringStarter" extends=".baseDef" >
+		<put name="title" value="Starter for Q/A Monitoring"/>
+		<put name="pageHeader" value = "Starter for Q/A Monitoring"/>
+		<put name="content" value="/monitoringIndex.jsp" />	
+	</definition>
+
+</tiles-definitions>
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/BasicToolVO.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/QaContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/QaContent.hbm.xml	21 Jun 2005 05:43:12 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/QaContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -19,9 +19,10 @@
         type="java.lang.Long"
         column="qa_content_id"
     >
-        <generator class="assigned" />
+	    <generator class="assigned"/>
     </id>
 
+
     <property
         name="title"
         type="java.lang.String"
Index: lams_tool_laqa/web/WEB-INF/QaQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/QaQueContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/QaQueContent.hbm.xml	21 Jun 2005 05:43:12 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/QaQueContent.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -18,8 +18,7 @@
             column="qa_que_content_id"
             type="java.lang.Long"
         >
-            <generator class="increment">
-            </generator>
+		    <generator class="increment"/>
         </id>
 
         <property
Index: lams_tool_laqa/web/WEB-INF/QaQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/QaQueUsr.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/QaQueUsr.hbm.xml	21 Jun 2005 05:43:12 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/QaQueUsr.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="que_usr_id"
     >
-        <generator class="assigned" />
+		    <generator class="assigned"/>
     </id>
 
     <property
@@ -71,6 +71,5 @@
               />
    </set>
 
-
 </class>
 </hibernate-mapping>
Index: lams_tool_laqa/web/WEB-INF/QaSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/QaSession.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/QaSession.hbm.xml	21 Jun 2005 05:43:12 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/QaSession.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -17,7 +17,7 @@
         type="java.lang.Long"
         column="qa_session_id"
     >
-        <generator class="assigned"/>
+		    <generator class="assigned"/>
     </id>
 
     <property
Index: lams_tool_laqa/web/WEB-INF/QaUsrResp.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/QaUsrResp.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/QaUsrResp.hbm.xml	21 Jun 2005 05:43:12 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/QaUsrResp.hbm.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -14,7 +14,7 @@
         type="java.lang.Long"
         column="response_id"
     >
-        <generator class="increment" />
+		    <generator class="increment"/>
     </id>
 
     <property
Index: lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/qaApplicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml	24 Jun 2005 08:56:54 -0000	1.1
+++ lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml	28 Jun 2005 07:24:55 -0000	1.2
@@ -63,72 +63,6 @@
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
-	<!--  core beans -->
-	<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>	
-	
-	
-	<!--
-		- 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="userManagementServiceTarget"/></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>
@@ -152,26 +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>			
-			</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>