Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4696 Rewrite Criteria queries to use new API

    • -20
    • +12
    ./lamsfoundation/lams/dao/IBaseDAO.java
LDEV-4696 Change transaction configuration for Hibernate 5.3

hibernate.transaction.factory_class is deprecated. We need to use

hibernate.transaction.coordinator_class

    • -1
    • +1
    ./lamsfoundation/lams/applicationContext.xml
LDEV-4696 Runs Hibernate 5.3 with errors, Noticeboard hbm xml gone.

    • -1
    • +2
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +2
    ./lamsfoundation/lams/util/FileUtil.java
  1. … 3448 more files in changeset.
LDEV-4440 Fix author and monitor links requested from integrations

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

  1. … 17 more files in changeset.
LDEV-4693 Add name in logged in user list in sysadmin

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

    • -1
    • +28
    ./lamsfoundation/lams/commonContext.xml
  1. … 14 more files in changeset.
LDEV-4691 Adjust classloader switch

    • -7
    • +8
    ./lamsfoundation/lams/util/Configuration.java
LDEV-4691 Reset a classloader when refreshing configuration cache

In WildFly 14 the Configuration bean can get created by one of LAMS EAR

modules, for example Image Gallery. This module's classloader does not

have access to java.sql.Connection. It should ask its parent for this

class, but context class loaders are not obliged to do it and apparently

WildFly module classloaders do not do it. We need to manually reset a

classloader for the given thread.

    • -3
    • +10
    ./lamsfoundation/lams/util/Configuration.java
LDEV-4691 Make Hibernate a part of LAMS libraries

WildFly 14 provides Hibernate 5.3. Migrating LAMS from 5.0.10 will

require some effort. For now we provide our own version of Hibernate to

keep compatible.

  1. … 44 more files in changeset.
LDEV-4691 Update libraries provided by WildFly

  1. … 47 more files in changeset.
LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

  1. … 10 more files in changeset.
LDEV-4670 add maxlength limit to the image title's input

  1. … 1 more file in changeset.
LDEV-4686 Remove Kaltura settings from admin config settings

    • -0
    • +19
    ./lamsfoundation/lams/dbupdates/patch20181012.sql
  1. … 9 more files in changeset.
LDEV-4677 Copy old attributes when renaming fields

LDEV-4688 Remove not used method

    • -23
    • +0
    ./lamsfoundation/lams/util/WebUtil.java
LDEV-4440 Remove an unnecessary dependency from Email validator

  1. … 2 more files in changeset.
LDEV-4683 Ensure new learning designs have a unique name within folder

    • -0
    • +2
    ./lamsfoundation/lams/commonContext.xml
  1. … 4 more files in changeset.
LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

  1. … 182 more files in changeset.
LDEV-4440, LDEV-3275 Update XStream binaries

Version 1.4.10 is more up to date than 1.5.0 which has been released

unofficially.

  1. … 4 more files in changeset.
LDEV-4440 Fix Spring MVC related issues with signup pages

    • -2
    • +3
    ./lamsfoundation/lams/signup/dao/ISignupDAO.java
  1. … 7 more files in changeset.
LDEV-4440, LDEV-3275 Tweak field extraction from XStream error message

    • -1
    • +9
    ./lamsfoundation/lams/util/FileUtil.java
LDEV-4135 Identified parallel activity children with tool signatures

Identification with description words sometimes fails.

  1. … 2 more files in changeset.
LDEV-4666 Fix uploading images in CKEditor when contentFolderId is short

    • -0
    • +5
    ./lamsfoundation/lams/util/UploadFileUtil.java
  1. … 1 more file in changeset.
LDEV-4664 Tweak HTTP connection access

  1. … 4 more files in changeset.
LDEV-4664 Delete obsolete reference

LDEV-4440 Migrate Planner to Spring MVC

Also several minor fixes to Planner logic

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180924.sql
  1. … 2 more files in changeset.
LDEV-4440 Get rid of obsolete token processing

    • -287
    • +0
    ./lamsfoundation/lams/web/util/TokenProcessor.java
  1. … 3 more files in changeset.
LDEV-4440 Rename preferred locale attribute name to non-Struts

LDEV-4440 Merge FileValidatorSpringUtil and FileValidatorUtil into FileValidatorUtil

    • -99
    • +0
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
  1. … 21 more files in changeset.