Activity lams-github/lams_tool

2:32 pm

asukkar

More
cd6be92
changed 39 files
v4.7, v4.8

LDEV-2007

Added support for Dimdim Enterprise 4.5

- -1
- +1
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../DimdimConfig.hbm.xml
- -0
- +8
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../DimdimSession.hbm.xml
- -1
- +10
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -8
- +16
./db/sql/create_lams_tool_dimdim.sql
- History
- Source
- Diff
./db/sql/create_lams_tool_dimdim.sql
- -3
- +3
./db/sql/table-schema.sql
- History
- Source
- Diff
./db/sql/table-schema.sql
- -1
- +1
./db/sql/tool_insert.sql
- History
- Source
- Diff
./db/sql/tool_insert.sql
- -4
- +0
./db/sql/updatescripts/updateTo20070227.sql
- History
- Source
- Diff
./db/sql/.../updateTo20070227.sql
- -2
- +0
./db/sql/updatescripts/updateTo20080229.sql
- History
- Source
- Diff
./db/sql/.../updateTo20080229.sql
- -8
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/IDimdimUserDAO.java
- -0
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimAttachmentDAO.java
- History
- Source
- Diff
./src/java/.../DimdimAttachmentDAO.java
- -1
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimConfigDAO.java
- History
- Source
- Diff
./src/java/.../hibernate/DimdimConfigDAO.java
- -0
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimDAO.java
- History
- Source
- Diff
./src/java/org/.../hibernate/DimdimDAO.java
- -8
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimUserDAO.java
- History
- Source
- Diff
./src/java/.../hibernate/DimdimUserDAO.java
- -0
- +66
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ConfigDTO.java
- History
- Source
./src/java/org/.../dimdim/dto/ConfigDTO.java
- -15
- +15
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/ContentDTO.java
… 24 more files in changeset.

9:15 am

LDEV-1606: Deploying classes both in tool's JAR and WAR files led to duplicate imports while trying to make Core Session Facory to be aware of tools' classes. Classes are not deployed in WAR files anymore, since they are not needed. Core Session Factory gets mappings of all the deployed tools.

- -3
- +0
./build.xml
- History
- Source
- Diff
./build.xml
… 16 more files in changeset.

2:02 pm

asukkar

More
848dda4
changed 4 files
v4.7, v4.8

LDEV-1941

Fixed maxAttendeeMikes

- -4
- +5
./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/DimdimService.java
- -1
- +3
./src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/IDimdimService.java
- -1
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
./src/java/org/.../actions/LearningAction.java
- -1
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
- History
- Source
- Diff
./src/java/.../actions/MonitoringAction.java

11:36 am

erniegx <ernieg@gmail.com>

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

Changing dimdim to be a collaborative activity

- -1
- +1
./db/sql/activity_insert.sql
- History
- Source
- Diff
./db/sql/activity_insert.sql

1:33 pm

asukkar

More
44423a1
changed 10 files
v4.7, v4.8

LDEV-1928

Fixed return url

- -0
- +2
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -0
- +3
./conf/xdoclet/struts-actions.xml
- History
- Source
./conf/xdoclet/struts-actions.xml
- -3
- +4
./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/DimdimService.java
- -1
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/IDimdimService.java
- -0
- +20
./src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
- History
- Source
- Diff
./src/java/org/.../dimdim/util/DimdimUtil.java
- -1
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
- History
- Source
- Diff
./src/java/.../actions/AuthoringAction.java
- -1
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
./src/java/org/.../actions/LearningAction.java
- -1
- +4
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
- History
- Source
- Diff
./src/java/.../actions/MonitoringAction.java
- -8
- +6
./web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
./web/WEB-INF/struts/tiles-defs.xml
- -0
- +15
./web/pages/dimdim/end_meeting.jsp
- History
- Source
./web/pages/dimdim/end_meeting.jsp

3:02 pm

asukkar

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

LDEV-1941

Set maximum number of mics to 3

- -2
- +0
./web/pages/authoring/basic.jsp
- History
- Source
- Diff
./web/pages/authoring/basic.jsp

2:44 pm

asukkar

More
170b178
changed 3 files
v4.7, v4.8

Removed unused and merged duplicated language keys

- -75
- +52
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -14
- +14
./web/pages/authoring/instructions.jsp
- History
- Source
- Diff
./web/pages/authoring/instructions.jsp
- -4
- +4
./web/pages/monitoring/instructions.jsp
- History
- Source
- Diff
./web/pages/monitoring/instructions.jsp

2:43 pm

asukkar

More
c1df2d1
changed 2 files
v4.7, v4.8

Renamed instruction variables to match names in Dimdim

- -2
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
- History
- Source
- Diff
./src/java/.../actions/AuthoringAction.java
- -10
- +10
./src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java
- History
- Source
- Diff
./src/java/org/.../forms/AuthoringForm.java

2:41 pm

asukkar

More
256fb72
changed 2 files
v4.7, v4.8

Added default constructor

- -1
- +4
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimAttachment.java
- -0
- +4
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimUser.java

8:37 am

asukkar

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

Updated language keys

- -2
- +2
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties

8:35 am

asukkar

More
17f365b
changed 1 file
v4.7, v4.8

Removed isEmpty method since this has only been available since java6

- -1
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
./src/java/org/.../actions/LearningAction.java

4:41 pm

asukkar

More
5fd10ce
changed 5 files
v4.7, v4.8

Updated hbm files.

- -29
- +13
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../model/Dimdim.hbm.xml
- -0
- +1
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../DimdimAttachment.hbm.xml
- -0
- +52
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml
- History
- Source
./conf/hibernate/.../model/DimdimConfig.hbm.xml
- -0
- +17
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../DimdimSession.hbm.xml
- -2
- +3
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../model/DimdimUser.hbm.xml

12:44 pm

asukkar

More
fe43b12
changed 10 files
v4.7, v4.8

Formatted page.

- -2
- +4
./web/pages/admin/admin.jsp
- History
- Source
- Diff
./web/pages/admin/admin.jsp
- -1
- +2
./web/pages/authoring/advanced.jsp
- History
- Source
- Diff
./web/pages/authoring/advanced.jsp
- -7
- +7
./web/pages/authoring/authoring.jsp
- History
- Source
- Diff
./web/pages/authoring/authoring.jsp
- -1
- +2
./web/pages/authoring/instructions.jsp
- History
- Source
- Diff
./web/pages/authoring/instructions.jsp
- -2
- +2
./web/pages/export/exportPortfolio.jsp
- History
- Source
- Diff
./web/pages/export/exportPortfolio.jsp
- -3
- +3
./web/pages/learning/learning.jsp
- History
- Source
- Diff
./web/pages/learning/learning.jsp
- -1
- +2
./web/pages/learning/notebook.jsp
- History
- Source
- Diff
./web/pages/learning/notebook.jsp
- -3
- +4
./web/pages/learning/parts/finishButton.jsp
- History
- Source
- Diff
./web/pages/.../parts/finishButton.jsp
- -8
- +8
./web/pages/monitoring/notebook.jsp
- History
- Source
- Diff
./web/pages/monitoring/notebook.jsp
- -7
- +5
./web/pages/monitoring/summary.jsp
- History
- Source
- Diff
./web/pages/monitoring/summary.jsp

12:21 pm

asukkar

More
fa35e59
changed 4 files
v4.7, v4.8

Removed unused constructors

- -28
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java
- History
- Source
- Diff
./src/java/org/.../dimdim/model/Dimdim.java
- -6
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimAttachment.java
- -26
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimSession.java
- -12
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimUser.java

12:10 pm

asukkar

More
718613f
changed 11 files
v4.7, v4.8

Renamed Attendee Mikes and removed rich text editor option.

LDEV-1928

- -2
- +1
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -3
- +1
./db/sql/create_lams_tool_dimdim.sql
- History
- Source
- Diff
./db/sql/create_lams_tool_dimdim.sql
- -1
- +1
./db/sql/table-schema.sql
- History
- Source
- Diff
./db/sql/table-schema.sql
- -11
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/ContentDTO.java
- -14
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java
- History
- Source
- Diff
./src/java/org/.../dimdim/model/Dimdim.java
- -1
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/DimdimService.java
- -1
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
- History
- Source
- Diff
./src/java/.../actions/AuthoringAction.java
- -1
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
./src/java/org/.../actions/LearningAction.java
- -10
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java
- History
- Source
- Diff
./src/java/org/.../forms/AuthoringForm.java
- -8
- +0
./web/pages/authoring/advanced.jsp
- History
- Source
- Diff
./web/pages/authoring/advanced.jsp
- -16
- +0
./web/pages/monitoring/summary.jsp
- History
- Source
- Diff
./web/pages/monitoring/summary.jsp

11:53 am

asukkar

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

Removed topic field.

LDEV-1938

- -1
- +0
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -2
- +2
./db/sql/create_lams_tool_dimdim.sql
- History
- Source
- Diff
./db/sql/create_lams_tool_dimdim.sql
- -2
- +2
./db/sql/table-schema.sql
- History
- Source
- Diff
./db/sql/table-schema.sql
- -11
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/ContentDTO.java
- -14
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java
- History
- Source
- Diff
./src/java/org/.../dimdim/model/Dimdim.java
- -14
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimSession.java
- -6
- +5
./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/DimdimService.java
- -2
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/IDimdimService.java
- -1
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
- History
- Source
- Diff
./src/java/.../actions/AuthoringAction.java
- -1
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
./src/java/org/.../actions/LearningAction.java
- -4
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
- History
- Source
- Diff
./src/java/.../actions/MonitoringAction.java
- -10
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java
- History
- Source
- Diff
./src/java/org/.../forms/AuthoringForm.java
- -10
- +0
./src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java
- History
- Source
- Diff
./src/java/org/.../forms/MonitoringForm.java
- -15
- +0
./web/pages/authoring/basic.jsp
- History
- Source
- Diff
./web/pages/authoring/basic.jsp
- -8
- +0
./web/pages/monitoring/summary.jsp
- History
- Source
- Diff
./web/pages/monitoring/summary.jsp

10:59 am

asukkar

More
7c68a5b
changed 26 files
v4.7, v4.8

Added notebook

LDEV-1931

- -0
- +6
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -3
- +5
./db/sql/create_lams_tool_dimdim.sql
- History
- Source
- Diff
./db/sql/create_lams_tool_dimdim.sql
- -2
- +2
./db/sql/table-schema.sql
- History
- Source
- Diff
./db/sql/table-schema.sql
- -0
- +22
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/ContentDTO.java
- -5
- +5
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java
- History
- Source
- Diff
./src/java/org/.../dto/NotebookEntryDTO.java
- -1
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/SessionDTO.java
- -22
- +11
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/UserDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/UserDTO.java
- -0
- +26
./src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java
- History
- Source
- Diff
./src/java/org/.../dimdim/model/Dimdim.java
- -6
- +6
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimUser.java
- -3
- +21
./src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/DimdimService.java
- -2
- +8
./src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
- History
- Source
- Diff
./src/java/org/.../service/IDimdimService.java
- -3
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
- History
- Source
- Diff
./src/java/org/.../dimdim/util/Constants.java
- -0
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
- History
- Source
- Diff
./src/java/.../actions/AuthoringAction.java
- -21
- +74
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
./src/java/org/.../actions/LearningAction.java
- -3
- +5
./src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
- History
- Source
- Diff
./src/java/.../actions/MonitoringAction.java
… 11 more files in changeset.

1:20 pm

asukkar

More
d6d2a49
changed 34 files
v4.7, v4.8

Formatted code using new standard

- -2
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimAttachmentDAO.java
- History
- Source
- Diff
./src/java/.../dao/IDimdimAttachmentDAO.java
- -2
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimConfigDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/IDimdimConfigDAO.java
- -2
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimDAO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dao/IDimdimDAO.java
- -2
- +2
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimSessionDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/IDimdimSessionDAO.java
- -9
- +9
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/IDimdimUserDAO.java
- -2
- +1
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimAttachmentDAO.java
- History
- Source
- Diff
./src/java/.../DimdimAttachmentDAO.java
- -9
- +6
./src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimUserDAO.java
- History
- Source
- Diff
./src/java/.../hibernate/DimdimUserDAO.java
- -48
- +48
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/AttachmentDTO.java
- History
- Source
- Diff
./src/java/org/.../dto/AttachmentDTO.java
- -142
- +138
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/ContentDTO.java
- -34
- +34
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java
- History
- Source
- Diff
./src/java/org/.../dto/NotebookEntryDTO.java
- -56
- +56
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/SessionDTO.java
- -72
- +72
./src/java/org/lamsfoundation/lams/tool/dimdim/dto/UserDTO.java
- History
- Source
- Diff
./src/java/org/.../dimdim/dto/UserDTO.java
- -357
- +345
./src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java
- History
- Source
- Diff
./src/java/org/.../dimdim/model/Dimdim.java
- -160
- +149
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimAttachment.java
- -32
- +32
./src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.java
- History
- Source
- Diff
./src/java/org/.../model/DimdimConfig.java
… 19 more files in changeset.

12:21 pm

jliew

More
558ead6
changed 72 files
v4.7, v4.8

LDEV-1916 adding autopatch to tools, including db_version_insert.sql script to tool deployer

- -0
- +14
./build.xml
- History
- Source
- Diff
./build.xml
- -1
- +2
./conf/xdoclet/web-settings.xml
- History
- Source
- Diff
./conf/xdoclet/web-settings.xml
- -0
- +2
./db/sql/db_version_insert.sql
- History
- Source
./db/sql/db_version_insert.sql
- -0
- +11
./src/java/org/lamsfoundation/lams/tool/dimdim/dbupdates/autopatchContext.xml
- History
- Source
./src/java/org/.../dbupdates/autopatchContext.xml
… 68 more files in changeset.

1:29 pm

jliew

More
e851ecb
changed 36 files
v4.7, v4.8

LDEV-1912 set session timeout programmatically according to lams' UserInactiveTimeout value via a servlet listener rather than hard coding to 120 mins (in some webapps, no session timeout was specified at all).