Index: lams_tool_gmap/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/.classpath,v diff -u -r1.5 -r1.5.8.1 --- lams_tool_gmap/.classpath 30 Oct 2008 03:48:29 -0000 1.5 +++ lams_tool_gmap/.classpath 13 May 2009 12:10:51 -0000 1.5.8.1 @@ -4,13 +4,16 @@ - - - + + + + + + - + Index: lams_tool_gmap/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/xdoclet/web-settings.xml,v diff -u -r1.3 -r1.3.4.1 --- lams_tool_gmap/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:38 -0000 1.3 +++ lams_tool_gmap/conf/xdoclet/web-settings.xml 13 May 2009 12:10:51 -0000 1.3.4.1 @@ -5,13 +5,17 @@ org.lamsfoundation.lams.tool.gmap.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_images/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/.classpath,v diff -u -r1.2 -r1.2.6.1 --- lams_tool_images/.classpath 21 Dec 2008 23:33:14 -0000 1.2 +++ lams_tool_images/.classpath 13 May 2009 12:10:57 -0000 1.2.6.1 @@ -3,20 +3,19 @@ - - - - - - - - + + + + + + + Index: lams_tool_images/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/web.xml,v diff -u -r1.4 -r1.4.4.1 --- lams_tool_images/web/WEB-INF/web.xml 26 Mar 2009 10:00:38 -0000 1.4 +++ lams_tool_images/web/WEB-INF/web.xml 13 May 2009 12:10:57 -0000 1.4.4.1 @@ -9,13 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.imageGallery.ApplicationResources + + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey @@ -213,10 +218,10 @@ - - Secure Content + + Secure Content /* - + LEARNER TEACHER @@ -229,61 +234,61 @@ - - Authoring Update + + Authoring Update /authoring/* - + AUTHOR AUTHOR ADMIN SYSADMIN - - Staff Content + + Staff Content /monitoring.do - + MONITOR TEACHER - - Staff Content + + Staff Content /definelater.do - + MONITOR TEACHER - - Adminstrator Content + + Adminstrator Content /admin.do - + ADMIN - - LAMS System Adminstrator Content + + LAMS System Adminstrator Content /sysadmin.do - + SYSADMIN - - Download Files + + Download Files /download/ - + LEARNER AUTHOR Index: lams_tool_lamc/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/.classpath,v diff -u -r1.5 -r1.5.8.1 --- lams_tool_lamc/.classpath 30 Oct 2008 03:48:31 -0000 1.5 +++ lams_tool_lamc/.classpath 13 May 2009 12:12:58 -0000 1.5.8.1 @@ -5,12 +5,15 @@ - - - + + + + + + - + Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v diff -u -r1.28 -r1.28.4.1 --- lams_tool_lamc/web/WEB-INF/web.xml 26 Mar 2009 10:00:38 -0000 1.28 +++ lams_tool_lamc/web/WEB-INF/web.xml 13 May 2009 12:12:58 -0000 1.28.4.1 @@ -6,13 +6,17 @@ org.lamsfoundation.lams.tool.mc.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_laqa/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/.classpath,v diff -u -r1.10 -r1.10.8.1 --- lams_tool_laqa/.classpath 30 Oct 2008 03:48:32 -0000 1.10 +++ lams_tool_laqa/.classpath 13 May 2009 12:13:04 -0000 1.10.8.1 @@ -5,12 +5,15 @@ - - - + + + + + + - + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java,v diff -u -r1.22 -r1.22.6.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 19 Feb 2009 23:59:13 -0000 1.22 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 13 May 2009 12:13:04 -0000 1.22.6.1 @@ -38,8 +38,8 @@ /** * @author Ozgur Demirtas * - * TODO To change the template for this generated type comment go to Window - - * Preferences - Java - Code Style - Code Templates + * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code + * Templates */ public class QaQueUsrDAO extends HibernateDaoSupport implements IQaQueUsrDAO { @@ -51,14 +51,15 @@ private static final String GET_USER_COUNT_FOR_CONTENT = "select count(*) from QaQueUsr quser, QaSession qses, QaQueContent qcon where " + "quser.qaSession=qses and " + "qses.qaContent=qcon and " + "qcon.uid=:uid"; - // select count(*) from tl_laqa11_que_usr quser, tl_laqa11_session qses where quser.qa_session_id=qses.uid and qses.qa_content_id=5378; + // select count(*) from tl_laqa11_que_usr quser, tl_laqa11_session qses where quser.qa_session_id=qses.uid and + // qses.qa_content_id=5378; public QaQueUsr getQaUserByUID(Long uid) { return (QaQueUsr) this.getHibernateTemplate().get(QaQueUsr.class, uid); } public int countSessionUser(QaSession qaSession) { - return (getHibernateTemplate().findByNamedParam(COUNT_SESSION_USER, "qaSession", qaSession)).size(); + return getHibernateTemplate().findByNamedParam(QaQueUsrDAO.COUNT_SESSION_USER, "qaSession", qaSession).size(); } public QaQueUsr getQaQueUsrById(long qaQueUsrId) { @@ -90,7 +91,7 @@ public List getUserBySessionOnly(final QaSession qaSession) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_USER_FOR_SESSION).setLong("qaSessionId", + List list = getSession().createQuery(QaQueUsrDAO.LOAD_USER_FOR_SESSION).setLong("qaSessionId", qaSession.getUid().longValue()).list(); return list; } @@ -118,13 +119,14 @@ int returnInt = 0; if (qa != null && qa.getUid() != null) { - List result = getSession().createQuery(GET_USER_COUNT_FOR_CONTENT).setLong("uid", qa.getUid()).list(); - Integer resultInt = (result.get(0) != null) ? (Integer) result.get(0) : new Integer(0); - returnInt = resultInt.intValue(); + List result = getSession().createQuery(QaQueUsrDAO.GET_USER_COUNT_FOR_CONTENT).setLong("uid", qa.getUid()) + .list(); + Long resultLong = result.get(0) != null ? (Long) result.get(0) : new Long(0); + returnInt = resultLong.intValue(); } else { - logger.error("Attempt to count users from null content"); + QaQueUsrDAO.logger.error("Attempt to count users from null content"); } - return returnInt; + return returnInt; } } \ No newline at end of file Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v diff -u -r1.30 -r1.30.4.1 --- lams_tool_laqa/web/WEB-INF/web.xml 26 Mar 2009 10:00:38 -0000 1.30 +++ lams_tool_laqa/web/WEB-INF/web.xml 13 May 2009 12:13:04 -0000 1.30.4.1 @@ -6,14 +6,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.qa.ApplicationResources - + + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_larsrc/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/.classpath,v diff -u -r1.6 -r1.6.8.1 --- lams_tool_larsrc/.classpath 30 Oct 2008 03:48:31 -0000 1.6 +++ lams_tool_larsrc/.classpath 13 May 2009 12:15:38 -0000 1.6.8.1 @@ -9,19 +9,21 @@ - - - - - + + + + + + + Index: lams_tool_larsrc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v diff -u -r1.20 -r1.20.4.1 --- lams_tool_larsrc/web/WEB-INF/web.xml 26 Mar 2009 10:00:38 -0000 1.20 +++ lams_tool_larsrc/web/WEB-INF/web.xml 13 May 2009 12:15:38 -0000 1.20.4.1 @@ -9,13 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.rsrc.ApplicationResources + + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_mindmap/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/.classpath,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_mindmap/.classpath 3 Apr 2009 00:00:33 -0000 1.1 +++ lams_tool_mindmap/.classpath 13 May 2009 12:15:31 -0000 1.1.4.1 @@ -1,23 +1,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + Index: lams_tool_mindmap/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/conf/xdoclet/web-settings.xml,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_mindmap/conf/xdoclet/web-settings.xml 3 Apr 2009 00:00:32 -0000 1.1 +++ lams_tool_mindmap/conf/xdoclet/web-settings.xml 13 May 2009 12:15:31 -0000 1.1.4.1 @@ -5,6 +5,10 @@ org.lamsfoundation.lams.tool.mindmap.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation @@ -14,7 +18,7 @@ locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml Index: lams_tool_nb/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/.classpath,v diff -u -r1.7 -r1.7.8.1 --- lams_tool_nb/.classpath 30 Oct 2008 03:48:29 -0000 1.7 +++ lams_tool_nb/.classpath 13 May 2009 12:17:07 -0000 1.7.8.1 @@ -6,12 +6,15 @@ - - - + + + + + + - + Index: lams_tool_nb/conf/xdoclet/servlets.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/servlets.xml,v diff -u -r1.7 -r1.7.10.1 --- lams_tool_nb/conf/xdoclet/servlets.xml 30 Jun 2006 07:04:06 -0000 1.7 +++ lams_tool_nb/conf/xdoclet/servlets.xml 13 May 2009 12:17:07 -0000 1.7.10.1 @@ -22,9 +22,7 @@ - download - Instructions Download - Instructions Download + download org.lamsfoundation.lams.contentrepository.client.ToolDownload toolContentHandlerBeanName @@ -35,8 +33,6 @@ exportPortfolio - Export Portfolio - Export Portfolio org.lamsfoundation.lams.tool.noticeboard.web.NbExportServlet Index: lams_tool_nb/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/web-settings.xml,v diff -u -r1.8 -r1.8.4.1 --- lams_tool_nb/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:38 -0000 1.8 +++ lams_tool_nb/conf/xdoclet/web-settings.xml 13 May 2009 12:17:07 -0000 1.8.4.1 @@ -2,13 +2,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.noticeboard.ApplicationResources + + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_notebook/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/.classpath,v diff -u -r1.3 -r1.3.8.1 --- lams_tool_notebook/.classpath 30 Oct 2008 03:48:31 -0000 1.3 +++ lams_tool_notebook/.classpath 13 May 2009 12:17:12 -0000 1.3.8.1 @@ -4,12 +4,15 @@ - - - + + + + + + - + Index: lams_tool_notebook/conf/xdoclet/servlets.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/xdoclet/servlets.xml,v diff -u -r1.2 -r1.2.6.1 --- lams_tool_notebook/conf/xdoclet/servlets.xml 6 Feb 2009 02:23:09 -0000 1.2 +++ lams_tool_notebook/conf/xdoclet/servlets.xml 13 May 2009 12:17:12 -0000 1.2.6.1 @@ -39,7 +39,6 @@ Attachment Download - Attachment Download download org.lamsfoundation.lams.contentrepository.client.ToolDownload Index: lams_tool_notebook/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/xdoclet/web-settings.xml,v diff -u -r1.3 -r1.3.4.1 --- lams_tool_notebook/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:39 -0000 1.3 +++ lams_tool_notebook/conf/xdoclet/web-settings.xml 13 May 2009 12:17:12 -0000 1.3.4.1 @@ -5,13 +5,17 @@ org.lamsfoundation.lams.tool.notebook.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_pixlr/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/.classpath,v diff -u -r1.1 -r1.1.6.1 --- lams_tool_pixlr/.classpath 7 Jan 2009 22:37:48 -0000 1.1 +++ lams_tool_pixlr/.classpath 13 May 2009 12:17:03 -0000 1.1.6.1 @@ -4,12 +4,15 @@ - - - + + + + + + - + Index: lams_tool_pixlr/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/conf/xdoclet/web-settings.xml,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_pixlr/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:39 -0000 1.2 +++ lams_tool_pixlr/conf/xdoclet/web-settings.xml 13 May 2009 12:17:03 -0000 1.2.4.1 @@ -5,13 +5,17 @@ org.lamsfoundation.lams.tool.pixlr.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_sbmt/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/.classpath,v diff -u -r1.17.6.1 -r1.17.6.1.2.1 --- lams_tool_sbmt/.classpath 23 Apr 2009 00:26:40 -0000 1.17.6.1 +++ lams_tool_sbmt/.classpath 13 May 2009 12:18:27 -0000 1.17.6.1.2.1 @@ -4,13 +4,16 @@ - - - + + + + + + - + Index: lams_tool_sbmt/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/web-settings.xml,v diff -u -r1.9 -r1.9.4.1 --- lams_tool_sbmt/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:39 -0000 1.9 +++ lams_tool_sbmt/conf/xdoclet/web-settings.xml 13 May 2009 12:18:27 -0000 1.9.4.1 @@ -1,13 +1,17 @@ LAMS Learning Activity Management System + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_scribe/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/.classpath,v diff -u -r1.3 -r1.3.8.1 --- lams_tool_scribe/.classpath 30 Oct 2008 03:48:31 -0000 1.3 +++ lams_tool_scribe/.classpath 13 May 2009 12:18:23 -0000 1.3.8.1 @@ -4,12 +4,15 @@ - - - + + + + + + - + Index: lams_tool_scribe/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/xdoclet/web-settings.xml,v diff -u -r1.3 -r1.3.4.1 --- lams_tool_scribe/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:39 -0000 1.3 +++ lams_tool_scribe/conf/xdoclet/web-settings.xml 13 May 2009 12:18:23 -0000 1.3.4.1 @@ -5,13 +5,17 @@ org.lamsfoundation.lams.tool.scribe.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_spreadsheet/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/.classpath,v diff -u -r1.4 -r1.4.8.1 --- lams_tool_spreadsheet/.classpath 10 Nov 2008 11:13:51 -0000 1.4 +++ lams_tool_spreadsheet/.classpath 13 May 2009 12:18:33 -0000 1.4.8.1 @@ -4,12 +4,15 @@ - - - + + + + + + - + Index: lams_tool_spreadsheet/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/web.xml,v diff -u -r1.5 -r1.5.4.1 --- lams_tool_spreadsheet/web/WEB-INF/web.xml 26 Mar 2009 10:00:40 -0000 1.5 +++ lams_tool_spreadsheet/web/WEB-INF/web.xml 13 May 2009 12:18:33 -0000 1.5.4.1 @@ -9,13 +9,17 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey