Index: lams_gradebook/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/.classpath,v diff -u -r1.1.2.1 -r1.1.2.1.2.1 --- lams_gradebook/.classpath 22 Apr 2009 06:39:06 -0000 1.1.2.1 +++ lams_gradebook/.classpath 13 May 2009 11:47:06 -0000 1.1.2.1.2.1 @@ -3,11 +3,9 @@ - - - - - + + + - + Index: lams_gradebook/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/conf/xdoclet/web-settings.xml,v diff -u -r1.1.2.1 -r1.1.2.1.2.1 --- lams_gradebook/conf/xdoclet/web-settings.xml 22 Apr 2009 06:39:06 -0000 1.1.2.1 +++ lams_gradebook/conf/xdoclet/web-settings.xml 13 May 2009 11:47:06 -0000 1.1.2.1.2.1 @@ -6,9 +6,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.gradebook.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + + + contextConfigLocation + classpath:/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml + + locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_learning/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_learning/.classpath,v diff -u -r1.6.6.3 -r1.6.6.3.2.1 --- lams_learning/.classpath 8 May 2009 04:21:34 -0000 1.6.6.3 +++ lams_learning/.classpath 13 May 2009 11:49:55 -0000 1.6.6.3.2.1 @@ -3,13 +3,11 @@ - - - - + + Index: lams_learning/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v diff -u -r1.21 -r1.21.4.1 --- lams_learning/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:35 -0000 1.21 +++ lams_learning/conf/xdoclet/web-settings.xml 13 May 2009 11:49:55 -0000 1.21.4.1 @@ -8,13 +8,17 @@ learningMessageSource + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_monitoring/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/.classpath,v diff -u -r1.10 -r1.10.8.1 --- lams_monitoring/.classpath 30 Oct 2008 03:48:29 -0000 1.10 +++ lams_monitoring/.classpath 13 May 2009 11:50:32 -0000 1.10.8.1 @@ -4,11 +4,9 @@ - - - + - + Index: lams_monitoring/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/web-settings.xml,v diff -u -r1.16 -r1.16.4.1 --- lams_monitoring/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:35 -0000 1.16 +++ lams_monitoring/conf/xdoclet/web-settings.xml 13 May 2009 11:50:32 -0000 1.16.4.1 @@ -8,13 +8,17 @@ monitoringMessageSource + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_assessment/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/.classpath,v diff -u -r1.2 -r1.2.6.1 --- lams_tool_assessment/.classpath 20 Feb 2009 07:05:03 -0000 1.2 +++ lams_tool_assessment/.classpath 13 May 2009 11:56:36 -0000 1.2.6.1 @@ -3,13 +3,16 @@ - - - - + + + + + + + Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/web.xml,v diff -u -r1.4 -r1.4.4.1 --- lams_tool_assessment/web/WEB-INF/web.xml 26 Mar 2009 19:07:06 -0000 1.4 +++ lams_tool_assessment/web/WEB-INF/web.xml 13 May 2009 11:56:35 -0000 1.4.4.1 @@ -9,13 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.assessment.ApplicationResources + + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_chat/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/.classpath,v diff -u -r1.7 -r1.7.8.1 --- lams_tool_chat/.classpath 30 Oct 2008 03:48:30 -0000 1.7 +++ lams_tool_chat/.classpath 13 May 2009 11:56:26 -0000 1.7.8.1 @@ -4,12 +4,15 @@ - - - + + + + + + - + Index: lams_tool_chat/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/conf/xdoclet/web-settings.xml,v diff -u -r1.8 -r1.8.4.1 --- lams_tool_chat/conf/xdoclet/web-settings.xml 26 Mar 2009 10:00:37 -0000 1.8 +++ lams_tool_chat/conf/xdoclet/web-settings.xml 13 May 2009 11:56:25 -0000 1.8.4.1 @@ -5,13 +5,17 @@ org.lamsfoundation.lams.tool.chat.ApplicationResources + + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + contextConfigLocation classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml locatorFactorySelector - classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + classpath:/org/lamsfoundation/lams/beanRefContext.xml parentContextKey Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java,v diff -u -r1.6 -r1.6.8.1 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java 27 Oct 2008 03:31:23 -0000 1.6 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java 13 May 2009 11:56:26 -0000 1.6.8.1 @@ -107,7 +107,7 @@ Map resultMap = new HashMap(); for (Iterator iter = list.iterator(); iter.hasNext();) { Object[] row = (Object[]) iter.next(); - resultMap.put((Long) row[0], (Integer) row[1]); + resultMap.put((Long) row[0], ((Number) row[1]).intValue()); } return resultMap; } @@ -119,7 +119,7 @@ Map resultMap = new HashMap(); for (Iterator iter = list.iterator(); iter.hasNext();) { Object[] row = (Object[]) iter.next(); - resultMap.put((Long) row[0], (Integer) row[1]); + resultMap.put((Long) row[0], ((Number) row[1]).intValue()); } return resultMap; }