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.3 -r1.4 --- lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml 21 Jul 2005 06:58:27 -0000 1.3 +++ lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml 8 Oct 2005 15:11:51 -0000 1.4 @@ -1,17 +1,13 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > - - - 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.3 -r1.4 --- lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml 29 Jun 2005 01:26:50 -0000 1.3 +++ lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml 8 Oct 2005 15:11:51 -0000 1.4 @@ -1,16 +1,12 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > - - - - - 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.2 -r1.3 --- lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml 28 Jun 2005 07:24:55 -0000 1.2 +++ lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml 8 Oct 2005 15:11:51 -0000 1.3 @@ -1,7 +1,7 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > 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.2 -r1.3 --- lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml 28 Jun 2005 07:24:55 -0000 1.2 +++ lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml 8 Oct 2005 15:11:50 -0000 1.3 @@ -1,16 +1,12 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > @@ -101,6 +101,5 @@ /> - 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.3 -r1.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 21 Jul 2005 06:58:27 -0000 1.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 8 Oct 2005 15:11:50 -0000 1.4 @@ -1,17 +1,13 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > - - - 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.3 -r1.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 29 Jun 2005 01:26:49 -0000 1.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 8 Oct 2005 15:11:50 -0000 1.4 @@ -1,16 +1,12 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > - - - - - 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.2 -r1.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml 28 Jun 2005 07:24:55 -0000 1.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml 8 Oct 2005 15:11:50 -0000 1.3 @@ -1,7 +1,7 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > 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.2 -r1.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml 28 Jun 2005 07:24:55 -0000 1.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml 8 Oct 2005 15:11:50 -0000 1.3 @@ -1,16 +1,12 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > @@ -101,6 +101,5 @@ /> - Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/dbConnection.properties,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties 17 Aug 2005 01:31:46 -0000 1.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties 8 Oct 2005 15:11:50 -0000 1.4 @@ -11,7 +11,7 @@ #Hibernate configuration hibernate.show_sql=true -hibernate.dialect=net.sf.hibernate.dialect.MySQLDialect +hibernate.dialect=org.hibernate.dialect.MySQLDialect #Connection Pooling configuration hibernate.c3p0.minPoolSize=5 Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v diff -u -r1.9 -r1.10 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 6 Oct 2005 06:45:30 -0000 1.9 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 8 Oct 2005 15:11:50 -0000 1.10 @@ -17,12 +17,12 @@ - /WEB-INF/QaContent.hbm.xml - /WEB-INF/QaSession.hbm.xml - /WEB-INF/QaQueContent.hbm.xml - /WEB-INF/QaQueUsr.hbm.xml - /WEB-INF/QaUsrResp.hbm.xml - /WEB-INF/QaUploadedFile.hbm.xml + /org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml + /org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml + /org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml + /org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml + /org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml + /org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java 6 Oct 2005 06:45:30 -0000 1.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java 8 Oct 2005 15:11:51 -0000 1.4 @@ -23,7 +23,6 @@ package org.lamsfoundation.lams.tool.qa.dao.hibernate; import org.apache.log4j.Logger; -import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.Session; import org.lamsfoundation.lams.tool.qa.QaContent; Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportServlet.java'. 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.6 -r1.7 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 4 Oct 2005 11:41:37 -0000 1.6 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 8 Oct 2005 15:11:50 -0000 1.7 @@ -1,17 +1,13 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > - - - 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.7 -r1.8 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 4 Oct 2005 11:41:37 -0000 1.7 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 8 Oct 2005 15:11:50 -0000 1.8 @@ -67,7 +67,6 @@ protected String[] getContextConfigLocation() { - System.out.println("QaDataAccessTestCase will be configured"); return new String[] {"/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml" }; } 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.6 -r1.7 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 4 Oct 2005 11:41:37 -0000 1.6 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 8 Oct 2005 15:11:50 -0000 1.7 @@ -1,16 +1,12 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > - - - - - 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.5 -r1.6 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml 4 Oct 2005 11:41:37 -0000 1.5 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml 8 Oct 2005 15:11:50 -0000 1.6 @@ -1,7 +1,7 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > 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.5 -r1.6 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml 4 Oct 2005 11:41:37 -0000 1.5 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml 8 Oct 2005 15:11:50 -0000 1.6 @@ -1,16 +1,12 @@ + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > @@ -101,6 +101,5 @@ /> - 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.8 -r1.9 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java 4 Oct 2005 11:41:37 -0000 1.8 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java 8 Oct 2005 15:11:50 -0000 1.9 @@ -12,6 +12,7 @@ import java.text.DateFormat; import java.util.Date; import java.util.TimeZone; +import java.util.TreeSet; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -49,6 +50,39 @@ super(name); } + public void testSimpleCreateNewQaContent() + { + //create new qa content + QaContent qa = new QaContent(); + qa.setQaContentId(new Long(TEST_NEW_CONTENT_ID)); + qa.setTitle("New - Put Title Here"); + qa.setInstructions("New - Put instructions here."); + qa.setCreationDate(new Date(System.currentTimeMillis()).toString() ); + qa.setCreatedBy(0); + qa.setUsernameVisible(false); + qa.setDefineLater(false); + qa.setSynchInMonitor(false); + qa.setOnlineInstructions("New- online instructions"); + qa.setOfflineInstructions("New- offline instructions"); + qa.setReportTitle("New-Report title"); + qa.setQaQueContents(new TreeSet()); + qa.setQaSessions(new TreeSet()); + + //create new qa que content + QaQueContent qaQueContent = new QaQueContent("What planet are you from", + 4, + qa, + new TreeSet(), + new TreeSet()); + + qa.getQaQueContents().add(qaQueContent); + + //create the new content + qaContentDAO.createQa(qa); + } + + + /* public void testCreateNewQaContent() { Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaQueContent.java,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java 4 Oct 2005 11:41:37 -0000 1.3 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java 8 Oct 2005 15:11:50 -0000 1.4 @@ -8,9 +8,6 @@ ******************************************************************************** */ package org.lamsfoundation.lams.tool.qa; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeMap; /* * * @author ozgurd Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/dbConnection.properties,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties 4 Oct 2005 11:41:37 -0000 1.4 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties 8 Oct 2005 15:11:50 -0000 1.5 @@ -6,12 +6,12 @@ jdbc.driverClassName=org.gjt.mm.mysql.Driver jdbc.url=jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -jdbc.username=root -jdbc.password=root +jdbc.username=lams +jdbc.password=lamsdemo #Hibernate configuration hibernate.show_sql=true -hibernate.dialect=net.sf.hibernate.dialect.MySQLDialect +hibernate.dialect=org.hibernate.dialect.MySQLDialect #Connection Pooling configuration hibernate.c3p0.minPoolSize=5 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 -r1.5 -r1.6 --- lams_tool_laqa/test/web/WEB-INF/web.xml 9 Sep 2005 00:27:35 -0000 1.5 +++ lams_tool_laqa/test/web/WEB-INF/web.xml 8 Oct 2005 15:13:02 -0000 1.6 @@ -24,7 +24,42 @@ org.springframework.web.context.ContextLoaderListener + + + + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + + SystemSessionFilter + /* + + + + + exportPortfolio + Export Portfolio + Export Portfolio + org.lamsfoundation.lams.tool.qa.web.QaExportServlet + + + + exportPortfolio + /portfolioExport + + + + + + + Secure Content + /* + + + LEARNER + TEACHER + STAFF + AUTHOR + ADMIN + SYSADMIN + + + + + Authoring Update + /authoringStarter.do + /authoring.do + + + AUTHOR + + + + + + + Staff Content + /monitoringStarter.do + /monitoring.do + + + STAFF + + + + + + + + Download Files + /download/ + + + AUTHOR + STAFF + ADMIN + SYSADMIN + + + + + + FORM + LAMS + + /login.jsp + + + +