Activity lams-github/

various changes including * change the values of contentId and sessionId * remove most of the remove/recreate code when saving existing contents * updated file upload methods

- -14
- +20
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAppConstants.java
- -0
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaContent.java
- -1
- +13
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
- History
- Source
- Diff
/lams_tool_laqa/.../QaResources.properties
- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/.../QaUploadedFile.hbm.xml
- -13
- +15
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaUploadedFile.java
- -343
- +454
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
- History
- Source
- Diff
/lams_tool_laqa/src/java/.../qa/QaUtils.java
- -1
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueContentDAO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../IQaQueContentDAO.java
- -8
- +10
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java
- History
- Source
- Diff
/lams_tool_laqa/.../IQaUploadedFileDAO.java
- -0
- +3
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaContentDAO.java
- -68
- +58
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaUploadedFileDAO.java
- -1
- +7
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
- History
- Source
- Diff
/lams_tool_laqa/.../qaApplicationContext.xml
- -6
- +14
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../IQaService.java
- -98
- +168
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaServicePOJO.java
- -0
- +63
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java
- History
- Source
/lams_tool_laqa/src/.../QaToolContentHandler.java
- -239
- +326
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../AuthoringUtil.java
… 9 more files in changeset.

6:51 am

steven

More
718baa8
changed 7 files
v4.7, v4.8

Fix bug in createToolContent.

- -0
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../InstructionFiles.java
- -0
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmissionDetails.java
- -1
- +3
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesContent.java
- -0
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesReport.java
- -0
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesSession.java
- -0
- +1
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesSessionDAO.java
- -2
- +3
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesService.java

11:56 am

fmalikoff

More
018ca38
changed 1 file
v4.7, v4.8

Modified common build to update the content repository deletion - wasn't working as the repository location had been changed. Relies on the o/s properties file now.

- -5
- +2
/lams_common/build.xml
- History
- Source
- Diff
/lams_common/build.xml

11:55 am

Added o/s property to the common.properties, so that you can configure whether to use windows or linux configuration file. Modified common build to update the content repository deletion - wasn't working as the repository location had been changed.

- -1
- +1
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- -1
- +4
/lams_build/common.properties
- History
- Source
- Diff
/lams_build/common.properties
- -1
- +2
/lams_build/unix.properties
- History
- Source
- Diff
/lams_build/unix.properties
- -1
- +1
/lams_build/windows.properties
- History
- Source
- Diff
/lams_build/windows.properties

12:08 am

ozgurd

More
9473507
changed 6 files
v4.7, v4.8

*** empty log message ***

- -0
- +4
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McAppConstants.java
- -1
- +5
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../IMcService.java
- -0
- +30
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McServicePOJO.java
- -4
- +475
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../AuthoringUtil.java
- -8
- +46
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/McAction.java
- -11
- +16
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McStarterAction.java

12:26 am

dcaygill

More
7ee6148
changed 1 file
v4.7, v4.8

tidy

- -21
- +8
/lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
- History
- Source
- Diff
/lams_central/src/.../DesignDataModel.as

8:02 pm

ozgurd

More
25fb91f
changed 8 files
v4.7, v4.8

*** empty log message ***

- -0
- +10
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../IMcQueContentDAO.java
- -1
- +13
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McQueContentDAO.java
- -0
- +4
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../IMcService.java
- -10
- +40
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McServicePOJO.java
- -260
- +442
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../AuthoringUtil.java
- -7
- +0
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/LearningUtil.java
- -17
- +32
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/McAction.java
- -24
- +10
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McStarterAction.java

9:56 pm

ozgurd

More
5af0c11
changed 1 file
v4.7, v4.8

*** empty log message ***

- -24
- +20
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/McAction.java

8:34 pm

ozgurd

More
dd305c6
changed 3 files
v4.7, v4.8

*** empty log message ***

- -231
- +326
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/McAction.java
- -1
- +2
/lams_tool_lamc/web/ResultsSummary.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/ResultsSummary.jsp
- -7
- +0
/lams_tool_lamc/web/ViewSummary.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/ViewSummary.jsp

7:59 pm

ozgurd

More
129fb6e
changed 3 files
v4.7, v4.8

*** empty log message ***

- -0
- +465
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../AuthoringUtil.java
- -579
- +348
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/McAction.java
- -1
- +0
/lams_tool_lamc/web/WEB-INF/struts-config.xml
- History
- Source
- Diff
/lams_tool_lamc/web/.../struts-config.xml

5:37 pm

ozgurd

More
f779565
changed 1 file
v4.7, v4.8

*** empty log message ***

- -0
- +3
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
- History
- Source
- Diff
/lams_tool_lamc/.../McResources.properties

2:25 pm

steven

More
caa9a3e
changed 15 files
v4.7, v4.8

Working version for monitoring.

- -1
- +7
/lams_tool_forum/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_forum/conf/.../struts-actions.xml
- -0
- +11
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
- History
- Source
- Diff
/lams_tool_forum/src/.../MessageDao.java
- -1
- +11
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -0
- +6
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../IForumService.java
- -0
- +1
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources.properties
- -5
- +164
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_forum/.../MonitoringAction.java
- -1
- +7
/lams_tool_forum/web/WEB-INF/struts-config.xml
- History
- Source
- Diff
/lams_tool_forum/web/.../struts-config.xml
- -0
- +9
/lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_tool_forum/web/.../tiles-defs.xml
- -2
- +2
/lams_tool_forum/web/includes/header.jsp
- History
- Source
- Diff
/lams_tool_forum/web/includes/header.jsp
- -2
- +13
/lams_tool_forum/web/includes/scripts.jsp
- History
- Source
- Diff
/lams_tool_forum/web/includes/scripts.jsp
- -3
- +3
/lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../contentuserlist.jsp
- -0
- +39
/lams_tool_forum/web/jsps/monitoring/message/topicview.jsp
- History
- Source
/lams_tool_forum/web/.../message/topicview.jsp
- -2
- +3
/lams_tool_forum/web/jsps/monitoring/usermarklist.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../usermarklist.jsp
- -92
- +83
/lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../viewallmarks.jsp
- -0
- +8
/lams_tool_forum/web/jsps/monitoring/viewtopic.jsp
- History
- Source
/lams_tool_forum/web/.../monitoring/viewtopic.jsp

11:41 am

steven

More
1079ea2
changed 16 files
v4.7, v4.8

Working version for monitoring.

- -2
- +10
/lams_tool_forum/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_forum/conf/.../struts-actions.xml
- -11
- +7
/lams_tool_forum/conf/xdoclet/taglibs.xml
- History
- Source
- Diff
/lams_tool_forum/conf/xdoclet/taglibs.xml
- -1
- +7
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources.properties
- -10
- +65
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_forum/.../MonitoringAction.java
- -4
- +33
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java
- History
- Source
- Diff
/lams_tool_forum/src/.../forms/MarkForm.java
- -194
- +0
/lams_tool_forum/web/WEB-INF/fckeditor/FCKeditor.tld
- History
- Source
- Diff
/lams_tool_forum/web/.../FCKeditor.tld
- -0
- +194
/lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
- History
- Source
/lams_tool_forum/web/.../tlds/FCKeditor.tld
- -2
- +10
/lams_tool_forum/web/WEB-INF/struts-config.xml
- History
- Source
- Diff
/lams_tool_forum/web/.../struts-config.xml
- -1
- +1
/lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_tool_forum/web/.../tiles-defs.xml
- -11
- +7
/lams_tool_forum/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_tool_forum/web/WEB-INF/web.xml
- -0
- +2
/lams_tool_forum/web/includes/taglibs.jsp
- History
- Source
- Diff
/lams_tool_forum/web/includes/taglibs.jsp
- -1
- +1
/lams_tool_forum/web/jsps/authoring/authoring.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../authoring.jsp
- -38
- +40
/lams_tool_forum/web/jsps/monitoring/editactivity.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../editactivity.jsp
- -1
- +5
/lams_tool_forum/web/jsps/monitoring/instructions.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../instructions.jsp
- -19
- +26
/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../updatemarks.jsp
- -4
- +10
/lams_tool_forum/web/jsps/monitoring/viewactivity.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../viewactivity.jsp

11:09 am

fmalikoff

More
4efa164
changed 3 files
v4.7, v4.8

Removed run sequences from getAccessibleWorkspaceFolders() and added a new call getFolderContentsExcludeHome() which excludes the user's home directory from the returned contents.

- -1
- +15
/lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
- History
- Source
- Diff
/lams_central/.../IWorkspaceManagementService.java
- -16
- +34
/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
- History
- Source
- Diff
/lams_central/.../WorkspaceManagementService.java
- -0
- +24
/lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java
- History
- Source
- Diff
/lams_central/src/.../WorkspaceAction.java

10:57 am

fmalikoff

More
b1347f5
updated 2 files
v4.7, v4.8

Removed run sequences from getAccessibleWorkspaceFolders() and added a new call getFolderContentsExcludeHome() which excludes the user's home directory from the returned contents.