Activity lams/lams_common/src/java

4:05 pm

fmalikoff

More
MAIN:fmalikoff:20070905080512
changed 37 files
MAIN

LDEV-1109: Fixing bugs in the authoring support for tool output based branching and getting the progress engine working. A rough implementation of the condition checking down for one MCQ condition for demonstration purposes. Two new methods added to the tool contract.

- -2
- +6
./org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
./org/lamsfoundation/.../Activity.java
- -4
- +116
./org/lamsfoundation/lams/learningdesign/BranchCondition.java
- History
- Source
- Diff
./org/lamsfoundation/.../BranchCondition.java
- -2
- +2
./org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
- History
- Source
- Diff
./org/.../ChosenBranchingActivity.java
- -1
- +6
./org/lamsfoundation/lams/learningdesign/ComplexActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../ComplexActivity.java
- -2
- +2
./org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
- History
- Source
- Diff
./org/.../GroupBranchingActivity.java
- -2
- +2
./org/lamsfoundation/lams/learningdesign/OptionsActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../OptionsActivity.java
- -2
- +2
./org/lamsfoundation/lams/learningdesign/ParallelActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../ParallelActivity.java
- -2
- +2
./org/lamsfoundation/lams/learningdesign/SequenceActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../SequenceActivity.java
- -2
- +2
./org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
- History
- Source
- Diff
./org/.../ToolBranchingActivity.java
- -2
- +13
./org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
- History
- Source
- Diff
./org/.../AuthoringActivityDTO.java
- -1
- +11
./org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
- History
- Source
- Diff
./org/.../BranchConditionDTO.java
- -2
- +37
./org/lamsfoundation/lams/tool/ToolSessionManager.java
- History
- Source
- Diff
./org/.../ToolSessionManager.java
- -1
- +65
./org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
- History
- Source
- Diff
./org/.../ILamsCoreToolService.java
- -6
- +127
./org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
- History
- Source
- Diff
./org/.../LamsCoreToolService.java
- -2
- +4
./org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
- History
- Source
- Diff
./org/lamsfoundation/.../wddx/WDDXTAGS.java
… 22 more files in changeset.

3:41 pm

jliew

More
MAIN:jliew:20070831074119
changed 9 files
MAIN

putting ldap's add/create/update user into it's own spring transaction'd bean; added some more config parameters for ldap

- -0
- +24
./org/lamsfoundation/lams/usermanagement/ldapContext.xml
- History
- Source
./org/lamsfoundation/.../ldapContext.xml
- -0
- +41
./org/lamsfoundation/lams/usermanagement/service/ILdapService.java
- History
- Source
./org/lamsfoundation/.../service/ILdapService.java
- -0
- +261
./org/lamsfoundation/lams/usermanagement/service/LdapService.java
- History
- Source
./org/lamsfoundation/.../service/LdapService.java
- -2
- +8
./org/lamsfoundation/lams/util/ConfigurationKeys.java
- History
- Source
- Diff
./org/.../ConfigurationKeys.java
… 5 more files in changeset.

3:39 pm

jliew

More
MAIN:jliew:20070831073938
changed 3 files
MAIN

adding authenticationMethodId to UserDTO so profile.jsp knows not to display 'edit profile/password'

- -2
- +4
./org/lamsfoundation/lams/usermanagement/User.java
- History
- Source
- Diff
./org/lamsfoundation/.../User.java
- -2
- +9
./org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
- History
- Source
- Diff
./org/lamsfoundation/lams/.../dto/UserDTO.java
… 1 more file in changeset.

9:27 am

fmalikoff

More
MAIN:fmalikoff:20070831012756
changed 1 file
MAIN

LDEV-1109: Fixed up a couple of bugs with copying the learning design that crept in due to the addition of the tool output based branching - the branch mappings weren't being copied properly.

- -2
- +2
./org/lamsfoundation/lams/learningdesign/SequenceActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../SequenceActivity.java

3:51 pm

mseaton

fixed for lessons call on service + desc value changes in flash

- -1
- +1
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
… 4 more files in changeset.

9:35 am

mseaton

fixed up service - missing methods

- -3
- +16
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
- -1
- +10
./org/lamsfoundation/lams/federation/service/IFederationService.java
- History
- Source
- Diff
./org/.../IFederationService.java

4:15 pm

jliew

adding description field to extLessonDTO received from remote lams server

- -0
- +9
./org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dto/ExtLessonDTO.java
- -0
- +3
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
… 1 more file in changeset.

3:28 pm

jliew

removing unused methods

- -20
- +0
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
- -28
- +1
./org/lamsfoundation/lams/federation/service/IFederationService.java
- History
- Source
- Diff
./org/.../IFederationService.java

2:40 pm

jliew

adding field for lesson description of remote shared lessons

- -1
- +19
./org/lamsfoundation/lams/federation/LessonFederation.java
- History
- Source
- Diff
./org/lamsfoundation/.../LessonFederation.java
- -1
- +3
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
… 1 more file in changeset.

12:47 pm

fmalikoff

More
MAIN:fmalikoff:20070829044745
changed 1 file
MAIN

LDEV-1109: Implement more of the authoring support for tool output based branching. Added the table to store the conditions designed in authoring and refactored the branch mapping table to support the conditions. Modified the authoring code to expect the new objects from the authoring client.

- -8
- +8
./org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
- History
- Source
- Diff
./org/.../BranchConditionDTO.java

12:44 pm

jliew

complete toString method

- -1
- +4
./org/lamsfoundation/lams/federation/LessonFederation.java
- History
- Source
- Diff
./org/lamsfoundation/.../LessonFederation.java

11:44 am

fmalikoff

More
MAIN:fmalikoff:20070829034453
changed 21 files
MAIN

LDEV-1109: Implement more of the authoring support for tool output based branching. Added the table to store the conditions designed in authoring and refactored the branch mapping table to support the conditions. Modified the authoring code to expect the new objects from the authoring client.

- -1
- +5
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
- -0
- +235
./org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
- History
- Source
./org/lamsfoundation/.../BranchActivityEntry.java
- -0
- +178
./org/lamsfoundation/lams/learningdesign/BranchCondition.java
- History
- Source
./org/lamsfoundation/.../BranchCondition.java
- -18
- +7
./org/lamsfoundation/lams/learningdesign/Group.java
- History
- Source
- Diff
./org/lamsfoundation/.../Group.java
- -187
- +0
./org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
- History
- Source
- Diff
./org/.../GroupBranchActivityEntry.java
- -1
- +14
./org/lamsfoundation/lams/learningdesign/Grouping.java
- History
- Source
- Diff
./org/lamsfoundation/.../Grouping.java
- -6
- +22
./org/lamsfoundation/lams/learningdesign/SequenceActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../SequenceActivity.java
- -0
- +43
./org/lamsfoundation/lams/learningdesign/dao/IBranchActivityEntryDAO.java
- History
- Source
./org/.../IBranchActivityEntryDAO.java
- -0
- +47
./org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java
- History
- Source
./org/.../BranchActivityEntryDAO.java
- -0
- +101
./org/lamsfoundation/lams/learningdesign/dto/BranchActivityEntryDTO.java
- History
- Source
./org/.../BranchActivityEntryDTO.java
- -0
- +125
./org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
- History
- Source
./org/lamsfoundation/.../BranchConditionDTO.java
- -111
- +0
./org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
- History
- Source
- Diff
./org/.../GroupBranchActivityEntryDTO.java
- -4
- +4
./org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
- History
- Source
- Diff
./org/.../LearningDesignDTO.java
- -0
- +48
./org/lamsfoundation/lams/learningdesign/dto/ToolOutputBranchActivityEntryDTO.java
- History
- Source
./org/.../ToolOutputBranchActivityEntryDTO.java
- -12
- +8
./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
./org/.../ExportToolContentService.java
… 6 more files in changeset.

11:32 am

jliew

adding saveLessonFed servlet, for saving external lessons

- -0
- +5
./org/lamsfoundation/lams/federation/LessonFederation.java
- History
- Source
- Diff
./org/lamsfoundation/.../LessonFederation.java
- -0
- +36
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
- -0
- +9
./org/lamsfoundation/lams/federation/service/IFederationService.java
- History
- Source
- Diff
./org/.../IFederationService.java
… 1 more file in changeset.

1:46 pm

jliew

adding saveFedLessons servlet for flash

- -0
- +50
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
- -0
- +9
./org/lamsfoundation/lams/federation/service/IFederationService.java
- History
- Source
- Diff
./org/.../IFederationService.java
… 18 more files in changeset.

11:24 am

jliew

adding orgCode field to extLessonDTO

- -0
- +9
./org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dto/ExtLessonDTO.java
- -0
- +3
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
… 3 more files in changeset.

3:02 pm

fmalikoff

More
MAIN:fmalikoff:20070822070213
changed 7 files
MAIN

LDEV-1134: Adding more support for the tool output based branching. Added a couple of simple tool output definitions for MCQ and Forum and added a class to the core to help tools create the tool output definitions (OutputDefinitionFactory), which required a change to MessageService. Also added the call to the core tool service to support calling the tools for their output definitions.

- -0
- +223
./org/lamsfoundation/lams/tool/OutputDefinitionFactory.java
- History
- Source
./org/.../OutputDefinitionFactory.java
- -2
- +13
./org/lamsfoundation/lams/tool/ToolContentManager.java
- History
- Source
- Diff
./org/.../ToolContentManager.java
- -8
- +12
./org/lamsfoundation/lams/tool/ToolOutputDefinition.java
- History
- Source
- Diff
./org/.../ToolOutputDefinition.java
- -2
- +13
./org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
- History
- Source
- Diff
./org/.../ToolOutputDefinitionDTO.java
- -2
- +19
./org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
- History
- Source
- Diff
./org/.../ILamsCoreToolService.java
- -1
- +50
./org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
- History
- Source
- Diff
./org/.../LamsCoreToolService.java
- -10
- +17
./org/lamsfoundation/lams/util/MessageService.java
- History
- Source
- Diff
./org/lamsfoundation/.../MessageService.java

8:59 am

jliew

change call to update local list of federation servers to pass key as request header rather than get parameter

- -7
- +19
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
- -10
- +0
./org/lamsfoundation/lams/federation/service/IFederationService.java
- History
- Source
- Diff
./org/.../IFederationService.java
… 2 more files in changeset.

8:20 am

jliew

More
MAIN:jliew:20070821002054
deleted 1 file
MAIN

file FedServerDTO.java was initially added on branch shibboleth_2_0.

- -0
- +0
./org/lamsfoundation/lams/federation/dto/FedServerDTO.java
- History
- Source
./org/lamsfoundation/lams/.../dto/FedServerDTO.java

8:20 am

jliew

adding getFedServerIds servlet to allow flash to read locally the names and ids of each lams server in 'federation'

- -0
- +35
./org/lamsfoundation/lams/federation/dto/FedServerDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dto/FedServerDTO.java
- -0
- +30
./org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
./org/.../FederationService.java
- -0
- +14
./org/lamsfoundation/lams/federation/service/IFederationService.java
- History
- Source
- Diff
./org/.../IFederationService.java
… 3 more files in changeset.

2:56 pm

mseaton

updated organisation DTO for new boolean fields (joint lessons) and tested access to values in flash

- -2
- +18
./org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../OrganisationDTO.java
- -1
- +1
./org/lamsfoundation/lams/usermanagement/dto/OrganisationDTOFactory.java
- History
- Source
- Diff
./org/.../OrganisationDTOFactory.java
… 3 more files in changeset.

12:28 pm

jliew

More
MAIN:jliew:20070820042821
changed 10 files
MAIN

more LDAP support; UserManagementService.setRolesForUserOrganisations has LazyInitialisationException problem

- -1
- +5
./org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java
- History
- Source
- Diff
./org/.../AuthenticationMethodType.java
- -1
- +20
./org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
- History
- Source
- Diff
./org/.../IUserManagementService.java
- -1
- +21
./org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
- History
- Source
- Diff
./org/.../UserManagementService.java
- -1
- +45
./org/lamsfoundation/lams/util/ConfigurationKeys.java
- History
- Source
- Diff
./org/.../ConfigurationKeys.java
… 6 more files in changeset.

10:20 am

mseaton

More
MAIN:mseaton:20070820022021
changed 4 files
MAIN

temp call for returning Tool Output Definitions

- -0
- +113
./org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
- History
- Source
./org/.../ToolOutputDefinitionDTO.java
… 3 more files in changeset.

9:51 am

fmalikoff

More
MAIN:fmalikoff:20070815015115
changed 33 files
MAIN

Changes to support tool output based branching. Work in progress!

- -3
- +31
./org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
./org/lamsfoundation/.../Activity.java
- -2
- +8
./org/lamsfoundation/lams/learningdesign/BranchingActivity.java
- History
- Source
- Diff
./org/.../BranchingActivity.java
- -2
- +6
./org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
- History
- Source
- Diff
./org/.../ChosenBranchingActivity.java
- -5
- +33
./org/lamsfoundation/lams/learningdesign/ComplexActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../ComplexActivity.java
- -2
- +4
./org/lamsfoundation/lams/learningdesign/GateActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../GateActivity.java
- -1
- +5
./org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
- History
- Source
- Diff
./org/.../GroupBranchingActivity.java
- -2
- +5
./org/lamsfoundation/lams/learningdesign/GroupingActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../GroupingActivity.java
- -3
- +7
./org/lamsfoundation/lams/learningdesign/OptionsActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../OptionsActivity.java
- -3
- +7
./org/lamsfoundation/lams/learningdesign/ParallelActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../ParallelActivity.java
- -1
- +3
./org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
- History
- Source
- Diff
./org/.../PermissionGateActivity.java
- -1
- +3
./org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
- History
- Source
- Diff
./org/.../ScheduleGateActivity.java
- -22
- +8
./org/lamsfoundation/lams/learningdesign/SequenceActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../SequenceActivity.java
- -3
- +6
./org/lamsfoundation/lams/learningdesign/SimpleActivity.java
- History
- Source
- Diff
./org/lamsfoundation/.../SimpleActivity.java
- -1
- +3
./org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
- History
- Source
- Diff
./org/.../SynchGateActivity.java
- -1
- +3
./org/lamsfoundation/lams/learningdesign/SystemGateActivity.java
- History
- Source
- Diff
./org/.../SystemGateActivity.java
… 18 more files in changeset.

12:22 pm

fmalikoff

More
MAIN:fmalikoff:20070802042230
changed 4 files
MAIN

Added validation for grouping activities - if the number of groups in the design is more than the specified number of groups then there is a validation error.

- -1
- +15
./org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
- History
- Source
- Diff
./org/.../ValidationErrorDTO.java
- -1
- +36
./org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
- History
- Source
- Diff
./org/.../LearningDesignService.java
… 2 more files in changeset.

11:51 am

fmalikoff

More
MAIN:fmalikoff:20070802035126
changed 1 file
MAIN

Made spelling of branchingActivityUIID entry consistent between DTO and WDDXTAGS

- -2
- +2
./org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
- History
- Source
- Diff
./org/lamsfoundation/.../wddx/WDDXTAGS.java

8:49 am

fmalikoff

More
MAIN:fmalikoff:20070802004922
changed 7 files
MAIN

Made the userlist in the GroupDTO optional, so that it isn't passed to authoring.

- -3
- +3
./org/lamsfoundation/lams/learningdesign/Group.java
- History
- Source
- Diff
./org/lamsfoundation/.../Group.java
- -3
- +3
./org/lamsfoundation/lams/learningdesign/Grouping.java
- History
- Source
- Diff
./org/lamsfoundation/.../Grouping.java
- -3
- +3
./org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dto/GroupDTO.java
- -3
- +3
./org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dto/GroupingDTO.java
- -2
- +6
./org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
- History
- Source
- Diff
./org/.../LearningDesignDTO.java
… 2 more files in changeset.

2:09 pm

fmalikoff

More
MAIN:fmalikoff:20070731060907
changed 10 files
MAIN

Fixing up Grouping related code so it will cope with more cases during grouping, and so that groupingDAO can better find all the groups in a learning design.