lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-4694' into LDEV-4440

LDEV-4694 Remove obsolete embedded MySQL configuration

    • -13
    • +0
    /lams_build/conf/slim/standalone.xml
LDEV-4691 Use a memory, non-transactional cache for HTTP sessions

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

    • -9
    • +9
    /lams_central/web/outcome/outcomeEdit.jsp
    • -9
    • +9
    /lams_central/web/outcome/scaleEdit.jsp
    • -9
    • +8
    /lams_central/web/outcome/scaleManage.jsp
  1. … 3 more files in changeset.
Merge branch 'LDEV-4693' into lams31

LDEV-4693 Add name in logged in user list in sysadmin

Merge remote-tracking branch 'origin/master' into lams31

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_build/build_base.xml

# lams_build/lib/lams/lams.jar

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

# lams_common/build.xml

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

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

LDEV-4609 Adjust columns for previous attempts in monitor activity view

    • -12
    • +18
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4440 TBLMonitoring links fixed

    • -1
    • +1
    /lams_monitoring/web/tblmonitor/forum.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/gates.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/teams.jsp
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

    • -74
    • +127
    /lams_gradebook/web/gradebookMonitor.jsp
Merge remote-tracking branch 'origin/LDEV-4609'

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java

lams_gradebook/web/gradebookMonitor.jsp

    • -43
    • +63
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4691 Rewrite domain config file to comply with WF14 structure

    • -218
    • +294
    /lams_build/conf/domain.xml
LDEV-4691 Update libraries for TestHarness

    • binary
    /TestHarness4LAMS2/lib/jackson-core-2.7.4.jar
    • binary
    /TestHarness4LAMS2/lib/jackson-core-2.9.5.jar
    • binary
    /TestHarness4LAMS2/lib/jackson-databind-2.7.4.jar
    • binary
    /TestHarness4LAMS2/lib/jackson-databind-2.9.5.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-logging-3.3.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-logging-3.3.2.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-servlet-api_3.1_spec-1.0.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-servlet-api_4.0_spec-1.0.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-websocket-api_1.1_spec-1.1.1.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-websocket-api_1.1_spec-1.1.3.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-core-1.4.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-core-2.0.13.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-servlet-1.4.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-servlet-2.0.13.Final.jar
LDEV-4691 Update source code of 3rd party libraries

  1. … 1864 more files in changeset.
LDEV-4691 Rewrite config file to comply with WF14 structure

    • -63
    • +178
    /lams_build/conf/standalone.xml
LDEV-4691 Mark WF slimming as not yet implemented

    • -495
    • +0
    /lams_build/conf/slim/standalone.xml
LDEV-4691 Adjust classloader switch

LDEV-4691 Stick to the default module definition

    • -120
    • +0
    /lams_build/lib/jdk/jdk.module.xml
LDEV-4691 Do not reference a library which is not provided anymore

LDEV-4691 Use Hibernate 5.0.10 as the main version

If we put Hibernate 5.0.10 as an alternative version in a slot, then

WildFly will load Hibernate 5.3 by default and there will be a class

clash on server start. We need to enforce only one version.

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.

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.

    • binary
    /lams_build/lib/hibernate/hibernate-core-5.0.10.Final.jar
    • binary
    /lams_build/lib/hibernate/hibernate-entitymanager-5.0.10.Final.jar
    • binary
    /lams_build/lib/hibernate/hibernate-envers-5.0.10.Final.jar
    • binary
    /lams_build/lib/hibernate/hibernate-java8-5.0.10.Final.jar
    • -0
    • +55
    /lams_build/lib/hibernate/hibernate.module.xml
  1. … 30 more files in changeset.
LDEV-4689 Save works, can edit acts after gate, learner msg improvement

LDEV-4691 Update libraries provided by WildFly

    • binary
    /lams_build/deploy-tool/lib/commons-io-2.5.jar
  1. … 33 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.

    • -2
    • +2
    /lams_central/web/authoring/authoring.jsp
LDEV-4668 Only display Finish button when in resources completed

LDEV-4670 add maxlength limit to the image title's input

LDEV-4671 Remove "locked when finished" option

LDEV-4679 No need to have a search field for confidence

LDEV-4686 Remove Kaltura settings from admin config settings