Activity lams/lams

LDEV-2369: Added further tutorial video functionality: user can disable single video, or all of them in his profile. Also, a dialog after first login is displayed.

Additionally, a small bug preventing Ped Planner to be properly deployed during whole LAMS build was fixed.

- -0
- +30
./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../User.hbm.xml
- -0
- +9
./db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
./db/sql/create_lams_11_tables.sql
- -1
- +13
./src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql
- History
- Source
- Diff
./src/java/.../Patch0017_updateFrom23-231.sql
- -5
- +53
./src/java/org/lamsfoundation/lams/usermanagement/User.java
- History
- Source
- Diff
./src/java/org/.../usermanagement/User.java
- -23
- +55
./src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
- History
- Source
- Diff
./src/java/org/.../dto/UserDTO.java
- -2
- +7
./src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
- History
- Source
- Diff
./src/java/org/.../util/AttributeNames.java
… 10 more files in changeset.

3:56 pm

Ernie Ghiglione

More
lams2_3:ernieg:20090618075607
changed 5 files
lams2_3

Updating Japanese

- -6
- +15
./conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_ja_JP.properties
… 4 more files in changeset.

1:40 pm

lfoxton

Removing unneccessary debug string

- -1
- +0
./src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/hibernate/BaseDAO.java

2:36 pm

lfoxton

More
MAIN:lfoxton:20090603063629
deleted 1 file
MAIN

file ExtServerToolAdapterMap.hbm.xml was initially added on branch lams2_3.

- -0
- +0
./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
- History
- Source
./conf/.../ExtServerToolAdapterMap.hbm.xml

2:36 pm

lfoxton

More
MAIN:lfoxton:20090603063629:2
deleted 1 file
MAIN

file ExtServerToolAdapterMap.java was initially added on branch lams2_3.

- -0
- +0
./src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
- History
- Source
./src/java/.../ExtServerToolAdapterMap.java

2:36 pm

lfoxton

More
MAIN:lfoxton:20090603063629:1
deleted 1 file
MAIN

file Patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

- -0
- +0
./src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql
- History
- Source
./src/java/.../Patch0017_updateFrom23-231.sql

2:36 pm

lfoxton

More
lams2_3:lfoxton:20090603063628
changed 21 files
lams2_3

LDEV-2366 Tool adapters to allow multiple integrated servers to user them

Committing core changes for this JIRA

- -0
- +14
./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../ExtServerOrgMap.hbm.xml
- -0
- +65
./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
- History
- Source
- Diff
./conf/.../ExtServerToolAdapterMap.hbm.xml
- -0
- +11
./conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../tool/Tool.hbm.xml
- -1
- +16
./db/sql/create_integration_tables.sql
- History
- Source
- Diff
./db/sql/create_integration_tables.sql
- -2
- +2
./db/sql/insert_types_data.sql
- History
- Source
- Diff
./db/sql/insert_types_data.sql
- -0
- +1
./src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./src/java/org/.../lams/commonContext.xml
- -0
- +1
./src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/hibernate/BaseDAO.java
- -0
- +15
./src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql
- History
- Source
- Diff
./src/java/.../Patch0017_updateFrom23-231.sql
- -149
- +126
./src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java
- History
- Source
- Diff
./src/java/.../ExtServerOrgMap.java
- -0
- +84
./src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
- History
- Source
- Diff
./src/java/.../ExtServerToolAdapterMap.java
- -0
- +9
./src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
- History
- Source
- Diff
./src/java/.../IIntegrationService.java
- -330
- +337
./src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
- History
- Source
- Diff
./src/java/.../service/IntegrationService.java
- -2
- +25
./src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
- History
- Source
- Diff
./src/java/org/.../dto/LibraryActivityDTO.java
- -1
- +15
./src/java/org/lamsfoundation/lams/tool/Tool.java
- History
- Source
- Diff
./src/java/org/.../lams/tool/Tool.java
- -0
- +2
./src/java/org/lamsfoundation/lams/tool/ToolAdapterContentManager.java
- History
- Source
- Diff
./src/java/.../ToolAdapterContentManager.java
… 6 more files in changeset.

9:33 am

Modified the createId method to return the jabberID instead of null when a 409 error code is returned from the xmpp server. A 409 error code indicates that the user has already been created with this ID

- -6
- +7
./src/java/org/lamsfoundation/lams/util/XMPPUtil.java
- History
- Source
- Diff
./src/java/org/.../lams/util/XMPPUtil.java

11:02 pm

Marcin Cieslak

LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

- -7
- +5
./src/java/org/lamsfoundation/lams/applicationContext.xml
- History
- Source
- Diff
./src/java/org/.../lams/applicationContext.xml
- -3
- +4
./src/java/org/lamsfoundation/lams/toolApplicationContext.xml
- History
- Source
- Diff
./src/java/.../lams/toolApplicationContext.xml
… 9 more files in changeset.

2:16 am

Marcin Cieslak

LDEV-2071, LDEV-2201, LDEV-57: Changed the Transaction Manager to Hibernate instead of JTA. Synchronized code in 2 more spots as deadlock exceptions had been thrown.