Activity lams-github/

DB Changes: lams_tool: columns learning_library_id and default_tool_content_id made nullable (C Perfect's request). lams_user: column user_organisation_id removed (checked with F Yang)

- -2
- +2
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../tool/Tool.hbm.xml
- -18
- +5
/lams_common/db/model/lams_11.clay
- History
- Source
- Diff
/lams_common/db/model/lams_11.clay
- -5
- +9
/lams_common/db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
/lams_common/db/.../create_lams_11_tables.sql
- -3
- +3
/lams_common/db/sql/insert_test_data.sql
- History
- Source
- Diff
/lams_common/db/sql/insert_test_data.sql
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
- History
- Source
- Diff
/lams_common/src/java/.../lams/tool/Tool.java

7:59 am

jfang

More
8d2dabc
changed 9 files
v4.7, v4.8

refactorred strategies using template method. added comments

- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplextActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../ComplextActivityStrategy.java
- -0
- +51
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/GateActivityStrategy.java
- History
- Source
/lams_common/src/.../GateActivityStrategy.java
- -18
- +38
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/GroupingActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../GroupingActivityStrategy.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/OptionsActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../OptionsActivityStrategy.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ParallelActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../ParallelActivityStrategy.java
- -17
- +36
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/PermissionGateActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../PermissionGateActivityStrategy.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../SequenceActivityStrategy.java
- -22
- +75
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../SimpleActivityStrategy.java
- -19
- +41
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../ToolActivityStrategy.java

2:55 pm

jfang

More
30ab647
changed 1 file
v4.7, v4.8

clean up some unused code

- -32
- +0
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java

2:52 pm

jfang

More
35d5350
changed 22 files
v4.7, v4.8

activity strategy refactored to fit the activity hierarchy

- -14
- +10
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java
- -0
- +33
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
- History
- Source
- Diff
/lams_common/src/.../ComplexActivity.java
- -3
- +11
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
- History
- Source
- Diff
/lams_common/src/.../GateActivity.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
- History
- Source
- Diff
/lams_common/src/.../OptionsActivity.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
- History
- Source
- Diff
/lams_common/src/.../ParallelActivity.java
- -1
- +6
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouper.java
- -6
- +32
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
- History
- Source
- Diff
/lams_common/.../ScheduleGateActivity.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
- History
- Source
- Diff
/lams_common/src/.../SequenceActivity.java
- -0
- +8
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
- History
- Source
- Diff
/lams_common/src/.../SimpleActivity.java
- -0
- +86
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplextActivityStrategy.java
- History
- Source
/lams_common/src/.../ComplextActivityStrategy.java
- -0
- +63
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/OptionsActivityStrategy.java
- History
- Source
/lams_common/src/.../OptionsActivityStrategy.java
- -0
- +62
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ParallelActivityStrategy.java
- History
- Source
/lams_common/src/.../ParallelActivityStrategy.java
- -0
- +83
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
- History
- Source
/lams_common/src/.../SequenceActivityStrategy.java
- -86
- +0
/lams_common/src/java/org/lamsfoundation/lams/lesson/ActivityStrategy.java
- History
- Source
- Diff
/lams_common/src/.../ActivityStrategy.java
- -63
- +0
/lams_common/src/java/org/lamsfoundation/lams/lesson/OptionsActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../OptionsActivityStrategy.java
… 7 more files in changeset.

2:00 pm

cperfect

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

Dev update

- -2
- +2
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddWebAppToApplicationXmlTask.java
- History
- Source
- Diff
/lams_tool_deploy/.../AddWebAppToApplicationXmlTask.java
- -1
- +21
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java
- History
- Source
- Diff
/lams_tool_deploy/src/.../deploy/Deploy.java
- -2
- +2
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveWebAppFromApplicationXmlTask.java
- History
- Source
- Diff
/lams_tool_deploy/.../RemoveWebAppFromApplicationXmlTask.java
- -15
- +19
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/UpdateApplicationXmlTask.java
- History
- Source
- Diff
/lams_tool_deploy/.../UpdateApplicationXmlTask.java

1:43 pm

cperfect

More
5a1e442
changed 21 files
v4.7, v4.8

Dev update

- -21
- +25
/lams_tool_deploy/build.xml
- History
- Source
- Diff
/lams_tool_deploy/build.xml
- binary
/lams_tool_deploy/lib/jakarta-commmons/commons-collections-3.1.jar
- History
- Source
/lams_tool_deploy/.../commons-collections-3.1.jar
- binary
/lams_tool_deploy/lib/jakarta-commmons/commons-configuration-1.1.jar
- History
- Source
/lams_tool_deploy/.../commons-configuration-1.1.jar
- binary
/lams_tool_deploy/lib/jakarta-commmons/commons-io-1.0.jar
- History
- Source
/lams_tool_deploy/lib/.../commons-io-1.0.jar
- binary
/lams_tool_deploy/lib/jakarta-commmons/commons-lang-2.0.jar
- History
- Source
/lams_tool_deploy/lib/.../commons-lang-2.0.jar
- binary
/lams_tool_deploy/lib/jakarta-commmons/commons-logging.jar
- History
- Source
/lams_tool_deploy/lib/.../commons-logging.jar
- -2
- +6
/lams_tool_deploy/nbproject/project.xml
- History
- Source
- Diff
/lams_tool_deploy/nbproject/project.xml
- -0
- +30
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java
- History
- Source
/lams_tool_deploy/src/java/.../deploy/Deploy.java
- -0
- +281
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java
- History
- Source
/lams_tool_deploy/src/.../deploy/DeployConfig.java
- -0
- +96
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployFilesTask.java
- History
- Source
/lams_tool_deploy/src/.../DeployFilesTask.java
- -51
- +0
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployWarTask.java
- History
- Source
- Diff
/lams_tool_deploy/src/.../DeployWarTask.java
- -0
- +1
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTask.java
- History
- Source
- Diff
/lams_tool_deploy/.../ToolDBActivateTask.java
- -287
- +58
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java
- History
- Source
- Diff
/lams_tool_deploy/.../ToolDBDeployTask.java
- -43
- +0
/lams_tool_deploy/test/file/application.xml
- History
- Source
- Diff
/lams_tool_deploy/test/.../application.xml
- -0
- +39
/lams_tool_deploy/test/file/deploy.properties
- History
- Source
/lams_tool_deploy/test/file/deploy.properties
… 6 more files in changeset.

12:59 pm

fmalikoff

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

Converted sql type to date for creation date

- -1
- +1
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java
- History
- Source
- Diff
/lams_contentrepository/src/.../CrNode.java

12:54 pm

fmalikoff

More
f367bd8
changed 8 files
v4.7, v4.8

Updating version of struts, converting ActionErrors to ActionMessages

- binary
/lams_contentrepository/lib/commons-codec-1.1.jar
- History
- Source
/lams_contentrepository/.../commons-codec-1.1.jar
- binary
/lams_contentrepository/lib/struts/struts-el.jar
- History
- Source
- Diff
/lams_contentrepository/lib/.../struts-el.jar
- binary
/lams_contentrepository/lib/struts/struts.jar
- History
- Source
- Diff
/lams_contentrepository/lib/.../struts.jar
- -7
- +3
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java
- History
- Source
- Diff
/lams_contentrepository/.../AddFileContentAction.java
- -11
- +5
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java
- History
- Source
- Diff
/lams_contentrepository/.../NodeSelectionAction.java
- -8
- +7
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/RepositoryDispatchAction.java
- History
- Source
- Diff
/lams_contentrepository/.../RepositoryDispatchAction.java
- -5
- +5
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/AddFileContentForm.java
- History
- Source
- Diff
/lams_contentrepository/.../AddFileContentForm.java
- -4
- +4
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/LoginRepositoryForm.java
- History
- Source
- Diff
/lams_contentrepository/.../LoginRepositoryForm.java

12:50 pm

fmalikoff

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

Change the build script to use a properties file. Moved to the shared tools datasource.

- binary
/lams_contentrepository/lib/ehcache/ehcache-1.0.jar
- History
- Source
/lams_contentrepository/lib/.../ehcache-1.0.jar
- binary
/lams_contentrepository/lib/jboss-cache/jboss-cache.jar
- History
- Source
/lams_contentrepository/lib/.../jboss-cache.jar
- binary
/lams_contentrepository/lib/jboss-cache/jgroups.jar
- History
- Source
/lams_contentrepository/lib/.../jgroups.jar
- -13
- +6
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/contentRepositoryApplicationContext.xml
- History
- Source
- Diff
/lams_contentrepository/.../contentRepositoryApplicationContext.xml
- -7
- +4
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties
- History
- Source
- Diff
/lams_contentrepository/.../dbConnection.properties
- -2
- +3
/lams_contentrepository/src/java/treecache.xml
- History
- Source
- Diff
/lams_contentrepository/src/.../treecache.xml

12:43 pm

fmalikoff

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

Change the build script to use a properties file

- -0
- +70
/lams_contentrepository/build.properties
- History
- Source
/lams_contentrepository/build.properties
- -43
- +7
/lams_contentrepository/build.xml
- History
- Source
- Diff
/lams_contentrepository/build.xml
- -77
- +0
/lams_contentrepository/properties.xml
- History
- Source
- Diff
/lams_contentrepository/properties.xml

8:20 am

jfang

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

fix the bug caused by using learner progress data across request.

- -19
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityAction.java

9:26 pm

jfang

More
1ac0307
changed 15 files
v4.7, v4.8

implemented complete activity for the completion of system driven activity. customized the Spring OpenSessionInViewFilter to resolve redundent hibernate session issue.