Index: lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml =================================================================== diff -u -r11b1827ff684ae7472bb77194d2c35a9dafc0bc1 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 11b1827ff684ae7472bb77194d2c35a9dafc0bc1) +++ lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r866e5012ca9e3e0591eef3d026f6406d5acc97b6 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml (.../QaQueContent.hbm.xml) (revision 866e5012ca9e3e0591eef3d026f6406d5acc97b6) +++ lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml (.../QaQueContent.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -rc2c90fffd84acacd50458727538e2e934e71d03e -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml (.../QaQueUsr.hbm.xml) (revision c2c90fffd84acacd50458727538e2e934e71d03e) +++ lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml (.../QaQueUsr.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -rc2c90fffd84acacd50458727538e2e934e71d03e -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision c2c90fffd84acacd50458727538e2e934e71d03e) +++ lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r11b1827ff684ae7472bb77194d2c35a9dafc0bc1 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 11b1827ff684ae7472bb77194d2c35a9dafc0bc1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r866e5012ca9e3e0591eef3d026f6406d5acc97b6 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml (.../QaQueContent.hbm.xml) (revision 866e5012ca9e3e0591eef3d026f6406d5acc97b6) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml (.../QaQueContent.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -rc2c90fffd84acacd50458727538e2e934e71d03e -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml (.../QaQueUsr.hbm.xml) (revision c2c90fffd84acacd50458727538e2e934e71d03e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml (.../QaQueUsr.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -rc2c90fffd84acacd50458727538e2e934e71d03e -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision c2c90fffd84acacd50458727538e2e934e71d03e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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/dao/hibernate/QaContentDAO.java =================================================================== diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties =================================================================== diff -u -rd790644956d0f37acaf742d7d281c6e49ea96972 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties (.../dbConnection.properties) (revision d790644956d0f37acaf742d7d281c6e49ea96972) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties (.../dbConnection.properties) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 Fisheye: Tag 664a5459e87fdfde268c9c54e458618c0965f816 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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java (.../QaDataAccessTestCase.java) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java (.../QaDataAccessTestCase.java) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml (.../QaQueContent.hbm.xml) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml (.../QaQueContent.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml (.../QaQueUsr.hbm.xml) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml (.../QaQueUsr.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java (.../TestQaContent.java) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java (.../TestQaContent.java) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java (.../TestQaQueContent.java) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java (.../TestQaQueContent.java) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties (.../dbConnection.properties) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/dbConnection.properties (.../dbConnection.properties) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 =================================================================== diff -u -r5f015bed03f28f95ee08f3c03a1f3f03254cf426 -r664a5459e87fdfde268c9c54e458618c0965f816 --- lams_tool_laqa/test/web/WEB-INF/web.xml (.../web.xml) (revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426) +++ lams_tool_laqa/test/web/WEB-INF/web.xml (.../web.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) @@ -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 + + + +