• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Resolve conflicts from previous merge

  1. … 1 more file in changeset.
Merge lams2_3_jboss5 changes into lams2_3

    • -2
    • +34
    ./org/lamsfoundation/lams/beanRefContext.xml
    • -37
    • +212
    ./org/lamsfoundation/lams/commonContext.xml
    • -197
    • +237
    ./org/lamsfoundation/lams/cache/CacheManager.java
  1. … 86 more files in changeset.
LDEV-2372 Testing framework for LAMS

First draft of testing framework.

includes testcases for all phases(authoring, learning, monitor)

except for the one that creates new lessons (cloudWizzard.swf)

file localCommonContext.xml was initially added on branch lams2_3.

    • -0
    • +0
    ./org/lamsfoundation/lams/localCommonContext.xml
Undo-ing some changes to return to 2.3 branch

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 16 more files in changeset.
Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

  1. … 12 more files in changeset.
file patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

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.

  1. … 12 more files in changeset.
Removing unneccessary debug string

file ExtServerToolAdapterMap.java was initially added on branch lams2_3.

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

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

Committing core changes for this JIRA

    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -1
    • +15
    ./org/lamsfoundation/lams/tool/Tool.java
  1. … 11 more files in changeset.
LDEV-2364

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
    ./org/lamsfoundation/lams/util/XMPPUtil.java
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.

  1. … 9 more files in changeset.
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.

  1. … 6 more files in changeset.
LDEV-1998: Additional clean up.

LDEV-2074: Fixed a bug in Floating Activity validation preventing Learnind Designs to be imported correctly.

LDEV-2071: Removed Quartz distribution from deployment - version from JBoss is now in use. Fixed a bug in Floating Activities.

  1. … 6 more files in changeset.
LDEV-2074 missing dbupdate insert

Disabled videorecorder.

LDEV-2071: Fixed authentication issues. Fixed deadlock issues. Cleaned up.

LDEV-1998: Changed the way Subject field is processed in the Forum Tool.

    • -99
    • +104
    ./org/lamsfoundation/lams/util/WebUtil.java
  1. … 6 more files in changeset.
LDEV-2071: Fixed Learning Design parsing bug - one result taken from database was improperly casted.

LDEV-2071: Fixed Spring classpath scanning problems using newly intruduced to JBoss VFSClassPathXmlApplicationContext class.

Upgraded to Spring 2.5.6 (was 1.2.8).

    • -27
    • +27
    ./org/lamsfoundation/lams/beanRefContext.xml
    • -20
    • +5
    ./org/lamsfoundation/lams/commonContext.xml
  1. … 5 more files in changeset.
LDEV-2311

Added catch for all exceptions.

    • -0
    • +3
    ./org/lamsfoundation/lams/util/XMPPUtil.java
XMPPUtil now doesn't report an error when a room is trying to be recreated

    • -0
    • +5
    ./org/lamsfoundation/lams/util/XMPPUtil.java
LDEV-2071: Added initial version of LAMS 2.3 on JBoss 5.1.

    • -1
    • +33
    ./org/lamsfoundation/lams/beanRefContext.xml
    • -33
    • +223
    ./org/lamsfoundation/lams/commonContext.xml
    • -197
    • +237
    ./org/lamsfoundation/lams/cache/CacheManager.java
  1. … 8 more files in changeset.
AutoPatch for 2.2->2.3 updated with red5 config stuff and presenceChat table corrected