Activity lams/

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.

- binary
/lams_build/lib/lams/lams-central.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-central.jar
- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -35
- +42
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java
- -10
- +22
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringService.java
- -0
- +3
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../BranchCondition.hbm.xml
- -9
- +16
/lams_common/db/model/lams_11.clay
- History
- Source
- Diff
/lams_common/db/model/lams_11.clay
- -6
- +7
/lams_common/db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
/lams_common/db/.../create_lams_11_tables.sql
- -6
- +7
/lams_common/db/sql/updatescripts/alter_21_branching.sql
- History
- Source
- Diff
/lams_common/db/.../alter_21_branching.sql
- -2
- +6
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java
- -4
- +116
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
- History
- Source
- Diff
/lams_common/src/.../BranchCondition.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
- History
- Source
- Diff
/lams_common/.../ChosenBranchingActivity.java
- -1
- +6
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
- History
- Source
- Diff
/lams_common/src/.../ComplexActivity.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
- History
- Source
- Diff
/lams_common/.../GroupBranchingActivity.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
- History
- Source
- Diff
/lams_common/src/.../OptionsActivity.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
- History
- Source
- Diff
/lams_common/src/.../ParallelActivity.java
… 22 more files in changeset.

8:38 pm

lfoxton

More
MAIN:lfoxton:20070904123852
changed 4 files
MAIN

Prototype created, creates a lams tool project using the submit tool as a template. More templates will be added later

- -80
- +17
/org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java
- History
- Source
- Diff
/org.lams.toolbuilder/src/.../RenameTool.java
- -9
- +31
/org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java
- History
- Source
- Diff
/org.lams.toolbuilder/.../LAMSNewToolWizard.java
- -26
- +21
/org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardPage.java
- History
- Source
- Diff
/org.lams.toolbuilder/.../LAMSNewToolWizardPage.java
- -8
- +1
/org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/WizardConstants.java
- History
- Source
- Diff
/org.lams.toolbuilder/.../WizardConstants.java

3:01 pm

lfoxton

More
MAIN:lfoxton:20070904070133
changed 3 files
MAIN

Creates a new project and copies a sample submit project into it

- -202
- +0
/org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/Main.java
- History
- Source
- Diff
/org.lams.toolbuilder/src/.../Main.java
- -0
- +288
/org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java
- History
- Source
/org.lams.toolbuilder/src/.../RenameTool.java
- -60
- +90
/org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java
- History
- Source
- Diff
/org.lams.toolbuilder/.../LAMSNewToolWizard.java

2:09 pm

fmalikoff

More
MAIN:fmalikoff:20070904060925
changed 2 files
MAIN

Removing unnecessary lookup of the activity - it shouldn't be a cglib activity as it has just created.

- -7
- +4
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringService.java
- -12
- +1
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../IAuthoringService.java

1:13 pm

mseaton

More
MAIN:mseaton:20070904051323
changed 2 files
MAIN

added tool output conditions dialog labels

- -1
- +1
/lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/conf/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/conf/.../en_dictionary.xml

1:08 pm

mseaton

More
MAIN:mseaton:20070904050834
changed 4 files
MAIN

fixed incorrect constructor name which was resulting in app calls failing

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -3
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
- History
- Source
- Diff
/lams_flash/src/.../DesignDataModel.as
- -2
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as
- History
- Source
- Diff
/lams_flash/src/.../br/BranchMappingDialog.as

11:34 am

mseaton

checking in wizard changes onto shib branch

- binary
/lams_monitoring/web/lams_wizard.swf
- History
- Source
- Diff
/lams_monitoring/web/lams_wizard.swf
- binary
/lams_monitoring/web/lams_wizard_library.swf
- History
- Source
- Diff
/lams_monitoring/.../lams_wizard_library.swf

4:02 pm

Ernie Ghiglione

More
MAIN:ernieg:20070903080200
changed 4 files
MAIN

See the posting you are replying to (LDEV-1305)

- -1
- +2
/lams_tool_forum/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources.properties
- -1
- +4
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumConstants.java
- -2
- +10
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java
- -1
- +33
/lams_tool_forum/web/jsps/learning/reply.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../learning/reply.jsp

3:58 pm

Ernie Ghiglione

More
MAIN:ernieg:20070903075807
changed 1 file
MAIN

Changed the width of the text area from cols=40 to cols=65 (LDEV-1329)

- -1
- +1
/lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../message/bodyarea.jsp

2:23 pm

mseaton

More
MAIN:mseaton:20070903062355
changed 2 files
MAIN

added tool ouput definition class to handle received data

- -0
- +98
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as
- History
- Source
/lams_flash/src/.../ToolOutputDefinition.as
- -11
- +23
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
- History
- Source
- Diff
/lams_flash/.../ToolOutputConditionsDialog.as

12:43 pm

lfoxton

More
MAIN:lfoxton:20070903044300
changed 3 files
MAIN

Fixed a bug in the blackboard integration that was causing the modify and remove buttons to not work

- -0
- +4
/lams_bb_integration/WEB-INF/bb-manifest.xml
- History
- Source
- Diff
/lams_bb_integration/.../bb-manifest.xml
- -0
- +2
/lams_bb_integration/web/modules/create.jsp
- History
- Source
- Diff
/lams_bb_integration/web/.../create.jsp
- -1
- +1
/lams_bb_integration/web/modules/start_lesson.jsp
- History
- Source
- Diff
/lams_bb_integration/web/.../start_lesson.jsp

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
- +1
/lams_central/conf/xdoclet/web-settings.xml
- History
- Source
- Diff
/lams_central/conf/.../web-settings.xml
- -151
- +26
/lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java
- History
- Source
- Diff
/lams_central/src/.../LDAPAuthenticator.java
- -39
- +9
/lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java
- History
- Source
- Diff
/lams_central/.../UniversalLoginModule.java
- -2
- +5
/lams_common/db/sql/insert_lams_unix_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_lams_unix_config_data.sql
- -2
- +5
/lams_common/db/sql/insert_lams_windows_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_lams_windows_config_data.sql
- -0
- +24
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
- History
- Source
/lams_common/src/.../ldapContext.xml
- -0
- +41
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
- History
- Source
/lams_common/src/.../service/ILdapService.java
- -0
- +261
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
- History
- Source
/lams_common/src/java/.../service/LdapService.java
- -2
- +8
/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
- History
- Source
- Diff
/lams_common/src/.../ConfigurationKeys.java

3:40 pm

mseaton

More
MAIN:mseaton:20070831074041
updated 1 file
MAIN

added tool output conditions dialog + alert dialog merge

- binary
/lams_flash/src/central/flash/lams_authoring.fla
- History
- Source
- Diff
/lams_flash/src/.../flash/lams_authoring.fla

3:39 pm

mseaton

More
MAIN:mseaton:20070831073940
changed 7 files
MAIN

added tool output conditions dialog

- -0
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/ToolActivity.as
- -7
- +7
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
- History
- Source
- Diff
/lams_flash/src/.../ToolOutputCondition.as
- -0
- +257
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
- History
- Source
/lams_flash/src/.../ToolOutputConditionsDialog.as
- -4
- +13
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/Canvas.as
- -1
- +17
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasController.as
- -0
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/CanvasView.as
- -16
- +6
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
- History
- Source
- Diff
/lams_flash/.../PropertyInspectorControls.as

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'

- -0
- +5
/lams_central/web/profile.jsp
- History
- Source
- Diff
/lams_central/web/profile.jsp
- -2
- +4
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
- History
- Source
- Diff
/lams_common/src/.../usermanagement/User.java
- -2
- +9
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
- History
- Source
- Diff
/lams_common/src/java/.../dto/UserDTO.java

2:13 pm

jliew

More
MAIN:jliew:20070831061333
deleted 1 file
MAIN

file network.gif was initially added on branch shibboleth_2_0.

- binary
/lams_central/web/images/network.gif
- History
- Source
/lams_central/web/images/network.gif

2:13 pm

jliew

add icon to identify shared lessons

- -0
- +1
/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
- History
- Source
- Diff
/lams_central/src/.../web/IndexAction.java
- -0
- +7
/lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java
- History
- Source
- Diff
/lams_central/src/.../IndexLessonBean.java
- -0
- +2
/lams_central/web/indexCommon.jsp
- History
- Source
- Diff
/lams_central/web/indexCommon.jsp
- binary
/lams_central/web/images/network.gif
- History
- Source
- Diff
/lams_central/web/images/network.gif

9:28 am

fmalikoff

More
MAIN:fmalikoff:20070831012832
changed 2 files
MAIN

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

- -10
- +12
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java
- -3
- +4
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringService.java

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.