Index: lams_tool_laqa/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/build.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/build.xml	4 Jul 2005 06:11:24 -0000	1.7
+++ lams_tool_laqa/build.xml	28 Jul 2005 03:48:37 -0000	1.8
@@ -402,7 +402,14 @@
 				<copy file="${webinf}/web.xml" todir="${testwebinf}" overwrite="true"/>		
 				<copy file="${webinf}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
 				<copy file="${webinf}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>			
-				<junit printsummary="yes" haltonerror="no" haltonfailure="no"
+				<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/qa/">
+								<fileset dir="${src.dir.test}/org/lamsfoundation/lams/tool/qa/">
+										<include name="*.xml"/>
+										<include name="*.properties"/>
+					   				    <exclude name="web.xml"/>
+								</fileset>
+				</copy>						
+								<junit printsummary="yes" haltonerror="no" haltonfailure="no"
 					   fork="yes">
 					<formatter type="plain" usefile="false"/>
 					<formatter type="xml"/>
@@ -413,8 +420,8 @@
 						</fileset>
 					</batchtest>
 					<classpath>
-						<pathelement location="${build.classes}"/>
-						<pathelement location="${build.test}"/>
+						<pathelement location="${build.classes.java}"/>
+						<pathelement location="${build.classes.test}"/>
 						<pathelement location="${hbm}"/>
 						<pathelement location="${web}"/>
 						<pathelement location="${webinf.spring}"/>
@@ -424,5 +431,15 @@
 				</junit>
 			</target>
 
+	<target name="test-report" depends="compile.test">
+		<mkdir dir="${build.report}/html"/> 
+		<junitreport todir="${build.report}"> 
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml"/>
+			</fileset>
+			<report todir="${build.report}/html"/> 
+		</junitreport>
+	</target>
+
 	
 </project>
\ No newline at end of file
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaDataAccessTestCase.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	29 Jun 2005 06:12:01 -0000	1.3
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	28 Jul 2005 03:48:37 -0000	1.4
@@ -68,12 +68,12 @@
     protected String[] getContextConfigLocation()
     {
     	System.out.println("QaDataAccessTestCase will be configured");
-        return new String[] {"/org/lamsfoundation/lams/qa/qaApplicationContext.xml"};
+        return new String[] {"/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml" };
     }
     
     protected String getHibernateSessionFactoryName()
     {
-    	return "qaCompactSessionFactory";
+    	return "qaSessionFactory";
     }
     
     protected void tearDown() throws Exception
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/testqaApplicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml	28 Jul 2005 03:48:37 -0000	1.1
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for lams survey business layer.
+	- Contains bean references to the transaction manager and to the DAOs in
+	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
+	<!-- (in this case, hibernate-related settings for the session factory definition below) -->
+	
+	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location"><value>/org/lamsfoundation/lams/tool/qa/dbConnection.properties</value></property>
+	</bean>
+	
+
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+	
+		<!-- Local DataSource that works in any environment -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName"><value>${jdbc.driverClassName}</value></property>
+		<property name="url"><value>${jdbc.url}</value></property>
+		<property name="username"><value>${jdbc.username}</value></property>
+		<property name="password"><value>${jdbc.password}</value></property>
+	</bean>
+	
+	
+	<!-- Hibernate SessionFactory -->
+	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+		<property name="dataSource"><ref local="dataSource"/></property>
+		<property name="mappingResources">
+			<list>	
+				<value>/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml</value>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<props>
+				<prop key="hibernate.dialect">${hibernate.dialect}</prop>
+				<prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
+				<prop key="hibernate.c3p0.minPoolSize">${hibernate.c3p0.minPoolSize}</prop>
+				<prop key="hibernate.c3p0.maxPoolSize">${hibernate.c3p0.maxPoolSize}</prop>
+				<prop key="hibernate.c3p0.timeout">${hibernate.c3p0.timeout}</prop>
+				<prop key="hibernate.c3p0.max_statement">${hibernate.c3p0.max_statement}</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- If we really use multiple SessionFactory, we have to change to JTA Transaction Manager -->
+	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
+	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
+	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<!-- tool beans -->
+	<bean id="qaContentDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaContentDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>  
+
+	<bean id="qaSessionDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaSessionDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+
+	<bean id="qaQueUsrDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaQueUsrDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+	
+	<bean id="qaQueContentDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaQueContentDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+	
+	<bean id="qaUsrRespDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaUsrRespDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+	
+	<bean id="qaUploadedFileDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaUploadedFileDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+	
+	
+	<!-- end of tool beans -->
+	
+
+	<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="qaUploadedFileDAO"><ref bean="qaUploadedFileDAO"/></property>								
+					<!--  <property name="toolService"><ref bean="lamsToolService"/></property> -->
+					<!--  <property name="repositoryService"><ref bean="repositoryService"/></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>  
+
+</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 -r1.1 -r1.2
--- lams_tool_laqa/test/web/WEB-INF/struts-config.xml	28 Jun 2005 07:24:55 -0000	1.1
+++ lams_tool_laqa/test/web/WEB-INF/struts-config.xml	28 Jul 2005 03:48:37 -0000	1.2
@@ -11,36 +11,214 @@
   -->
 
   <!-- ========== 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>
+<form-beans>
+	<form-bean name="QaAuthoringForm" type="org.lamsfoundation.lams.tool.qa.web.QaAuthoringForm"/>
+      	<form-bean name="QaLearningForm" type="org.lamsfoundation.lams.tool.qa.web.QaLearningForm"/>
+      	<form-bean name="QaMonitoringForm" type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringForm"/>
+</form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
   <!--
     Define your exceptions in a file called global-exceptions.xml and place
     it in your merge directory.
   -->
 
+<!-- 
+<global-exceptions>
+      <exception
+        key="error.system.qa"
+        type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
+        handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
+        path=".systemError"
+        scope="request"
+      />
+</global-exceptions>
+-->
+
   <!-- ========== Global Forward Definitions =================================== -->
-  <!--
-    Define your forwards in a file called global-forwards.xml and place
-    it in your merge directory.
-  -->
+   <global-forwards>
+     <forward name="starter" path="/authoringStarter"/>   
+	  <forward name="learningStarter" path="/learningStarter"/>   
+	  <forward name="monitoringStarter" path="/monitoringStarter"/>   
+ </global-forwards>
 
   <!-- ========== Action Mapping Definitions =================================== -->
-   <action-mappings>
+  <action-mappings>
+   
+	<!--Authoring Starter  -->
+   <action path="/authoringStarter" type="org.lamsfoundation.lams.tool.qa.web.QaStarterAction" 
+   			name="QaAuthoringForm" input=".starter"> 
+	  	<forward
+		    name="load"
+		    path=".questions"
+		    redirect="true"
+	  	/>
+	  	<forward
+        name="monitoringReport"
+        path=".monitoringReport"
+        redirect="true"
+   	  	/>
+	</action>  
+	<!--Learning Starter  -->
+   <action path="/learningStarter" type="org.lamsfoundation.lams.tool.qa.web.QaLearningStarterAction" 
+   			name="QaLearningForm" input=".learningStarter"> 
+	  <forward
+	    name="load"
+	    path=".answers"
+	    redirect="true"
+	  />
+	  	
+      <forward
+        name="learnerReport"
+        path=".learnerReport"
+        redirect="true"
+      />
+	  	
+	</action>  
+	<!--Monitoring Starter  -->
+	<action path="/monitoringStarter" type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringStarterAction" 
+   			name="QaMonitoringForm" input=".monitoringStarter"> 
+      <forward
+        name="monitoringReport"
+        path=".monitoringReport"
+        redirect="true"
+   	  	/>
+   	  	
+	   	<forward
+        name="load"
+        path=".questions"
+        redirect="true"
+      />
+      
+       	<forward
+        name="monitoringError"
+        path=".monitoringError"
+        redirect="true"
+      />	
+      
+      
+	</action>  
 
-    <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
-  </action-mappings>
+    <action
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.qa.web.QAction"
+      name="QaAuthoringForm"
+      scope="session"
+      input=".questions"
+      parameter="method"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="load"
+        path=".questions"
+        redirect="true"
+      />
+      <forward
+        name="starter"
+        path=".starter"
+        redirect="true"
+      />
+      <forward
+        name="monitoringReport"
+        path=".monitoringReport"
+        redirect="true"
+   	  	/>
+    </action>
 
-   <!-- 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. -->
+ <action
+      path="/learning"
+      type="org.lamsfoundation.lams.tool.qa.web.QAction"
+      name="QaLearningForm"
+      scope="session"
+      input=".answers"
+      parameter="method"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="load"
+        path=".answers"
+        redirect="true"
+      />
+      <forward
+        name="learningStarter"
+        path=".learningStarter"
+        redirect="true"
+      />
+      
+      <forward
+        name="learnerReport"
+        path=".learnerReport"
+        redirect="true"
+      />
+      
+</action>
 
-   <!-- Define your Struts plugins in a file called struts-plugins.xml and place it in your merge directory. -->
 
+
+ <action
+      path="/monitoring"
+      type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringAction"
+      name="QaMonitoringForm"
+      scope="session"
+      input=".monitoringReport"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="monitoringReport"
+        path=".monitoringReport"
+        redirect="true"
+   	  	/>
+	   	
+	   	<forward
+        name="load"
+        path=".questions"
+        redirect="true"
+      />	
+      
+	   	<forward
+        name="error"
+        path=".error"
+        redirect="true"
+      />	
+
+</action>
+
+
+<!--Export Portfoloio Starter  -->
+ <action
+      path="/exportPortfolioStarter"
+      type="org.lamsfoundation.lams.tool.qa.web.QaExportPortfolioStarterAction"
+      name="QaExportPortfolioForm"
+      scope="session"
+      input=".exportPortfolioStarter"
+    >
+      	<forward
+        name="portfolioReport"
+        path=".portfolioReport"
+        redirect="true"
+      />	
+    
+ </action>
+
+ </action-mappings>
+
+  <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
+ <message-resources parameter="org.lamsfoundation.lams.tool.qa.QaResources"/>
+
+<!-- StrutsTestCase doesn't support tile well at the moment, Have to be 
+commented out for testing-->
+<plug-in className="org.apache.struts.tiles.TilesPlugin">
+	<set-property property="definitions-config"
+		value="/WEB-INF/tiles/tiles-defs.xml" />
+	<set-property property="definitions-debug" value="0" />
+	<set-property property="definitions-parser-details" value="0" />
+	<set-property property="definitions-parser-validate" value="true" />
+</plug-in>
+
 </struts-config>
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 -r1.1 -r1.2
--- lams_tool_laqa/test/web/WEB-INF/tiles/tiles-defs.xml	28 Jun 2005 07:24:55 -0000	1.1
+++ lams_tool_laqa/test/web/WEB-INF/tiles/tiles-defs.xml	28 Jul 2005 03:48:38 -0000	1.2
@@ -19,9 +19,6 @@
 
 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 ====================== -->
@@ -86,6 +83,19 @@
 	</definition>
 
 
+	<definition name=".exportPortfolioStarter" extends=".baseDef" >
+		<put name="title" value="Starter for Q/A Export Portfolio"/>
+		<put name="pageHeader" value = "Starter for Q/A Export Portfolio"/>
+		<put name="content" value="/exportPortfolioIndex.jsp" />	
+	</definition>
+
+	<definition name=".portfolioReport" extends=".baseDef" >
+		<put name="title" value="Portfolio Report"/>
+		<put name="pageHeader" value = "Portfolio Report"/>
+		<put name="content" value="/portfolioReport.jsp" />	
+	</definition>
+
+
 <!-- ============= Qa Monitoring Starter Page Definitions ====================== -->	
 	<definition name=".monitoringStarter" extends=".baseDef" >
 		<put name="title" value="Starter for Q/A Monitoring"/>