Index: lams_tool_sbmt/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/.classpath,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/.classpath 23 Aug 2005 01:52:06 -0000 1.10
+++ lams_tool_sbmt/.classpath 10 Oct 2005 04:41:20 -0000 1.11
@@ -3,8 +3,6 @@
-
-
Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.20 -r1.21
--- lams_tool_sbmt/build.xml 6 Oct 2005 06:48:49 -0000 1.20
+++ lams_tool_sbmt/build.xml 10 Oct 2005 04:41:20 -0000 1.21
@@ -154,7 +154,7 @@
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/InstructionFiles.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml 4 Aug 2005 07:01:12 -0000 1.5
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml 10 Oct 2005 04:41:20 -0000 1.6
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/Learner.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml 3 Aug 2005 06:19:03 -0000 1.1
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml 10 Oct 2005 04:41:20 -0000 1.2
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmissionDetails.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml 3 Aug 2005 06:19:03 -0000 1.4
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml 10 Oct 2005 04:41:20 -0000 1.5
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesContent.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml 28 Jul 2005 07:25:53 -0000 1.5
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml 10 Oct 2005 04:41:20 -0000 1.6
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesReport.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml 19 Jul 2005 05:10:40 -0000 1.3
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml 10 Oct 2005 04:41:20 -0000 1.4
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesSession.hbm.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml 3 Aug 2005 06:19:03 -0000 1.6
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml 10 Oct 2005 04:41:20 -0000 1.7
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/InstructionFiles.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml 4 Aug 2005 07:01:12 -0000 1.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml 10 Oct 2005 04:41:20 -0000 1.6
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/Learner.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml 3 Aug 2005 06:19:03 -0000 1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml 10 Oct 2005 04:41:20 -0000 1.2
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmissionDetails.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml 3 Aug 2005 06:19:03 -0000 1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml 10 Oct 2005 04:41:20 -0000 1.3
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesContent.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml 28 Jul 2005 07:25:53 -0000 1.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml 10 Oct 2005 04:41:20 -0000 1.4
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesReport.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml 25 Jul 2005 07:07:27 -0000 1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml 10 Oct 2005 04:41:20 -0000 1.2
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesSession.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml 3 Aug 2005 06:19:03 -0000 1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml 10 Oct 2005 04:41:20 -0000 1.3
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.19 -r1.20
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 29 Sep 2005 01:42:03 -0000 1.19
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 10 Oct 2005 04:41:20 -0000 1.20
@@ -189,7 +189,8 @@
List report = submitFilesService.getFilesUploadedByUser(userID,sessionID);
request.setAttribute("userReport",report);
request.setAttribute(SbmtConstants.TOOL_SESSION_ID,sessionID);
- request.setAttribute("userID",userID);
+ UserDTO userDto = submitFilesService.getUserDetails(userID);
+ request.setAttribute("user",userDto);
return mapping.findForward("userMarks");
}
public ActionForward viewAllMarks(ActionMapping mapping,
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/web.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/web/WEB-INF/web.xml 23 Aug 2005 01:52:06 -0000 1.7
+++ lams_tool_sbmt/web/WEB-INF/web.xml 10 Oct 2005 04:41:20 -0000 1.8
@@ -3,10 +3,14 @@
-
+ LAMS
+
+Learning Activity Management System
+
contextConfigLocation
classpath:/org/lamsfoundation/lams/applicationContext.xml
+ classpath:/org/lamsfoundation/lams/commonContext.xml
classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
@@ -22,18 +26,29 @@
hibernateFilter
- org.springframework.orm.hibernate.support.OpenSessionInViewFilter
+ org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
sessionFactoryBeanName
sbmtSessionFactory
+
+
+ SystemSessionFilter
+
+ org.lamsfoundation.lams.web.session.SystemSessionFilter
+
+
hibernateFilter
*.do
+
+ SystemSessionFilter
+ /*
+
-
-
@@ -202,24 +215,80 @@
/WEB-INF/fckeditor/tlds/FCKeditor.tld
-
+
+
+ Secure Content
+ /*
+
+
+ LEARNER
+ TEACHER
+ STAFF
+ AUTHOR
+ ADMIN
+ SYSADMIN
+
+
-
-
-
-
-
-
-
+
+
+ Authoring Update
+ /authoring.do
+
+
+ AUTHOR
+
+
+
+
+ Staff Content
+ /monitoring.do
+
+
+ STAFF
+
+
-
-
-
-
-
-
- -->
+
+
+ Adminstrator Content
+ /admin.do
+
+
+ ADMIN
+
+
+
+
+ LAMS System Adminstrator Content
+ /sysadmin.do
+
+
+ SYSADMIN
+
+
+
+
+
+ Download Files
+ /download/
+
+
+ AUTHOR
+ STAFF
+ ADMIN
+ SYSADMIN
+
+
+
+
+ FORM
+ LAMS
+
+ /login.jsp
+
+
+