Activity lams/lams_common/src/java

1:34 pm

Marcin Cieslak

More
MAIN:marcin:20081029053451
changed 26 files
MAIN

LDEV-1299: Backend for condition gates.

- -1
- +12
./org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
- History
- Source
- Diff
./org/.../patch0013_updateFrom21.sql
- -1065
- +1093
./org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
./org/lamsfoundation/.../Activity.java
- -193
- +213
./org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
- History
- Source
- Diff
./org/.../BranchActivityEntry.java
- -3
- +4
./org/lamsfoundation/lams/learningdesign/BranchCondition.java
- History
- Source
- Diff
./org/lamsfoundation/.../BranchCondition.java
- -96
- +109
./org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
- History
- Source
- Diff
./org/.../ConditionGateActivity.java
- -5
- +4
./org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java
- History
- Source
- Diff
./org/.../BranchActivityEntryDAO.java
- -6
- +12
./org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
- History
- Source
- Diff
./org/.../AuthoringActivityDTO.java
- -0
- +60
./org/lamsfoundation/lams/learningdesign/dto/ToolOutputGateActivityEntryDTO.java
- History
- Source
./org/.../ToolOutputGateActivityEntryDTO.java
- -9
- +17
./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
./org/.../ExportToolContentService.java
- -303
- +298
./org/lamsfoundation/lams/tool/SystemTool.java
- History
- Source
- Diff
./org/lamsfoundation/.../tool/SystemTool.java
- -207
- +203
./org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
- History
- Source
- Diff
./org/lamsfoundation/.../wddx/WDDXTAGS.java
… 15 more files in changeset.

8:46 am

Marcin Cieslak

More
MAIN:marcin:20081027004639
changed 2 files
MAIN

LDEV-1606: Changed visibility of some properties for inheriting classes use.

- -7
- +7
./org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
- History
- Source
- Diff
./org/.../TextSearchCondition.java
… 1 more file in changeset.

1:24 pm

lfoxton

More
MAIN:lfoxton:20081024052412
changed 1 file
MAIN

LDEV-1908 NotifyCloseUrl not in parameters breaks tool adapters,

and error in logic was causing this problem, now fixed

- -16
- +10
./org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
- History
- Source
- Diff
./org/.../LoginRequestDispatcher.java

1:18 pm

lfoxton

More
MAIN:lfoxton:20081024051855
changed 1 file
MAIN

Chaning loginRequestDispatcher to correct agreed format

- -121
- +116
./org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
- History
- Source
- Diff
./org/.../LoginRequestDispatcher.java

9:26 am

Marcin Cieslak

More
MAIN:marcin:20081023012620
changed 2 files
MAIN

LDEV-1606: Forgot to remove an unneeded parameter.

- -1
- +1
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
… 1 more file in changeset.

9:15 am

Marcin Cieslak

More
MAIN:marcin:20081023011504
changed 17 files
MAIN

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.

- -14
- +7
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
… 16 more files in changeset.

12:46 pm

Marcin Cieslak

More
MAIN:marcin:20081022044639
changed 2 files
MAIN

LDEV-1606: Fixed bug that stopped the server start-up if a tool is not deployed and core session factory needs its mapping files.

- -4
- +4
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
… 1 more file in changeset.

12:12 pm

Marcin Cieslak

More
MAIN:marcin:20081022041241
changed 4 files
MAIN

LDEV-1606: Fixed bug that stopped the server start-up if a tool is not deployed and core session factory needs its mapping files.

- -15
- +4
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
… 3 more files in changeset.

8:11 am

Marcin Cieslak

More
MAIN:marcin:20081022001148
changed 33 files
MAIN

LDEV-1946: Added text search based conditions to Survey tool.

- -1
- +10
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
… 32 more files in changeset.

11:05 am

lfoxton

More
MAIN:lfoxton:20081021030521
changed 8 files
MAIN

LDEV-1977 make a lams-central action that takes a relative LAMS url and redirects to it, so the users are taken through the login page if neccessary.

- Adding checking to make sure that a user cannot access monitor unless they have permission, see LDEV-1978

- -1
- +4
./org/lamsfoundation/lams/tool/service/ILamsToolService.java
- History
- Source
- Diff
./org/lamsfoundation/.../ILamsToolService.java
- -61
- +67
./org/lamsfoundation/lams/tool/service/LamsToolService.java
- History
- Source
- Diff
./org/lamsfoundation/.../LamsToolService.java
… 6 more files in changeset.

9:50 am

Marcin Cieslak

More
MAIN:marcin:20081021015034
changed 15 files
MAIN

LDEV-1606: Done some clean up and added several features for TextSearchConditions.

- -47
- +56
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
- -15
- +29
./org/lamsfoundation/lams/learningdesign/BranchCondition.java
- History
- Source
- Diff
./org/lamsfoundation/.../BranchCondition.java
- -62
- +108
./org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
- History
- Source
- Diff
./org/.../TextSearchCondition.java
- -0
- +49
./org/lamsfoundation/lams/learningdesign/TextSearchConditionComparator.java
- History
- Source
./org/.../TextSearchConditionComparator.java
- -8
- +10
./org/lamsfoundation/lams/learningdesign/dao/IBranchActivityEntryDAO.java
- History
- Source
- Diff
./org/.../IBranchActivityEntryDAO.java
- -13
- +27
./org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java
- History
- Source
- Diff
./org/.../BranchActivityEntryDAO.java
- -169
- +227
./org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
- History
- Source
- Diff
./org/.../ILamsCoreToolService.java
- -2
- +2
./org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
- History
- Source
- Diff
./org/.../LamsCoreToolService.java
… 7 more files in changeset.

2:07 pm

paulg

More
MAIN:paulg:20081016060732
changed 34 files
MAIN

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

- -0
- +6
./org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
- History
- Source
- Diff
./org/.../patch0013_updateFrom21.sql
- -10
- +50
./org/lamsfoundation/lams/lesson/Lesson.java
- History
- Source
- Diff
./org/lamsfoundation/.../lesson/Lesson.java
- -1
- +15
./org/lamsfoundation/lams/lesson/dto/LessonDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dto/LessonDTO.java
- -1
- +4
./org/lamsfoundation/lams/web/util/AttributeNames.java
- History
- Source
- Diff
./org/lamsfoundation/.../AttributeNames.java
… 30 more files in changeset.

12:13 pm

asukkar

More
MAIN:asukkar:20081015041309
changed 4 files
MAIN

LDEV-1969

Moved createId and createMultiUserChat from the chat tool to lams_common

- -0
- +94
./org/lamsfoundation/lams/util/XMPPUtil.java
- History
- Source
./org/lamsfoundation/lams/util/XMPPUtil.java
… 3 more files in changeset.

8:36 am

Marcin Cieslak

More
MAIN:marcin:20081010003655
changed 21 files
MAIN

LDEV-1891: Added code that sends notifications to all monitoring teachers, not only those who started monitoring the chosen tool.

- -43
- +76
./org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dao/ILessonDAO.java
- -250
- +229
./org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../LessonDAO.java
- -247
- +304
./org/lamsfoundation/lams/lesson/service/ILessonService.java
- History
- Source
- Diff
./org/lamsfoundation/.../ILessonService.java
- -656
- +707
./org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
./org/lamsfoundation/.../LessonService.java
… 17 more files in changeset.

2:29 pm

Marcin Cieslak

More
MAIN:marcin:20081007062959
changed 3 files
MAIN

LDEV-1825: Change in order: activities from DTO are parsed first. This way we can check for the activities with unwanted elements (groupings, branching mappings). These elements are then removed from DTO so they don't get into XML.

- -4
- +3
./org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
- History
- Source
- Diff
./org/.../AuthoringActivityDTO.java
- -7
- +48
./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
./org/.../ExportToolContentService.java
… 1 more file in changeset.

1:27 pm

Marcin Cieslak

More
MAIN:marcin:20081007052710
changed 1 file
MAIN

LDEV-1825: Committing Java file formatted with the new convention.

- -1067
- +1250
./org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
- History
- Source
- Diff
./org/.../AuthoringActivityDTO.java

1:16 pm

Marcin Cieslak

More
MAIN:marcin:20081007051603
changed 1 file
MAIN

LDEV-1825: Committing Java file formatted with the new convention.

- -2316
- +2315
./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
./org/.../ExportToolContentService.java

10:44 am

Marcin Cieslak

More
MAIN:marcin:20081004024427
changed 8 files
MAIN

LDEV-1606: Several minor changes in the base files.

- -7
- +3
./org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
- History
- Source
- Diff
./org/.../TextSearchCondition.java
- -50
- +2
./org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
- History
- Source
- Diff
./org/.../BranchConditionDTO.java
… 6 more files in changeset.

9:22 am

Marcin Cieslak

More
MAIN:marcin:20081001012211
changed 1 file
MAIN

LDEV-1533: If the tool session creation fails because the name already exists, the attempt is repeated.

- -536
- +561
./org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
- History
- Source
- Diff
./org/.../LamsCoreToolService.java

1:52 pm

Marcin Cieslak

More
MAIN:marcin:20080930055227
changed 12 files
MAIN

LDEV-1606: Added common code for creating text based conditions.

- -2
- +11
./org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
- History
- Source
- Diff
./org/.../patch0013_updateFrom21.sql
- -334
- +322
./org/lamsfoundation/lams/learningdesign/BranchCondition.java
- History
- Source
- Diff
./org/lamsfoundation/.../BranchCondition.java
- -0
- +330
./org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
- History
- Source
./org/lamsfoundation/.../TextSearchCondition.java
- -105
- +159
./org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
- History
- Source
- Diff
./org/.../BranchConditionDTO.java
… 8 more files in changeset.

8:03 am

lfoxton

More
MAIN:lfoxton:20080930000306
changed 1 file
MAIN

Adding an update script for the competence tables - autopatch

- -1
- +28
./org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
- History
- Source
- Diff
./org/.../patch0013_updateFrom21.sql

3:04 pm

jliew

More
MAIN:jliew:20080926070455
changed 1 file
MAIN

LDEV-1447 when using i18n'd message to name run sequences folder, use server default locale, not user's locale

- -9
- +16
./org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
- History
- Source
- Diff
./org/.../UserManagementService.java

3:04 pm

jliew

More
MAIN:jliew:20080926070418
added 1 file
MAIN

LDEV-1447 update script to sync workspace and folder names with their group names, especially 'run sequences' folders which need to use i18n'd text

- -0
- +128
./org/lamsfoundation/lams/dbupdates/Patch0012FixWorkspaceNames.java
- History
- Source
./org/.../Patch0012FixWorkspaceNames.java

3:03 pm

jliew

More
MAIN:jliew:20080926070342
changed 2 files
MAIN

LDEV-1447 moving commonMessageService out of commonContext into a standalone definition file, in order to get bean without loading everything else

- -10
- +1
./org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../commonContext.xml
- -0
- +22
./org/lamsfoundation/lams/messageContext.xml
- History
- Source
./org/lamsfoundation/lams/messageContext.xml

3:22 pm

jliew

More
MAIN:jliew:20080922072226
deleted 1 file
MAIN

LDEV-1916 removing example code

- -202
- +0
./org/lamsfoundation/lams/dbupdates/Patch0011Alter21Integration.java
- History
- Source
- Diff
./org/.../Patch0011Alter21Integration.java

1:29 pm

jliew

More
MAIN:jliew:20080922052919
changed 36 files
MAIN

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).