Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

  1. … 43 more files in changeset.
LDEV-4483 Make secure content cacheable

WildFly makes in non-cacheable by default.

Also we put an explicit header in LAMS content repository.

  1. … 1 more file in changeset.
LDEV-4411 Add collections 2nd level cache

  1. … 96 more files in changeset.
LDEV-4411 Enable and configure Hibernate 2nd level cache

This configuration is only for standalone mode. It is explained in JIRA

comments.

  1. … 1 more file in changeset.
LDEV-4400, LDEV-3315 Comment out a test parameter

It should be uncommented only for TestHarness.

LDEV-4400, LDEV-3315 Toggle session ID change for each LAMS module

WildFly 10 changes session ID after authentication by default in order

to prevent session fixation attack. It breaks TestHarness, though. In

order to run TH, session ID change needs to be turned off.

Turning it off for Central is not enough as a request to any other

module, like Tool, triggers session ID change. In this case we need to

have session ID change turned on or off in each LAMS module, not just

Central.

    • -0
    • +1
    ./deployment-handler/io.undertow.servlet.ServletExtension
  1. … 3 more files in changeset.
LDEV-4293 Prevent deadlock exceptions on logout

It seems that a server-side logout not only causes invalidation

exception (which will be dealt with soon), but also puts session fetch

transaction in deadlock. This commit fixed the deadlock.

LDEV-4402 Reintroduce XML Commons library

The library was supposed to become obsolete after changing XStream cod,

but is still required by Struts and Apache Commons Validator.

Also obsolete entries for JBoss Web and Gson were removed from a

configuration file.

  1. … 4 more files in changeset.
LDEV-4293, LDEV-4400 Update domain configuration for WF10

WildFly 10 configuration files are slightly changed compared to WildFly

8 and LAMS custom stuff had to be adjusted too.

  1. … 1 more file in changeset.
LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

  1. … 135 more files in changeset.
LDEV-4402 Remove Lucene library

It has only been used for Pedagogical Planner filter feature, which is

not used by clients anyway

  1. … 8 more files in changeset.
LDEV-4402 Remove dependency to Xerces library

Apparently it is a part of Java or WF now

  1. … 2 more files in changeset.
LDEV-4402 Get rid of LAMS customised session filter

This filter was implemented in 2005 and seems more like a workaround

than a feature we need. Especially that many of LAMS tools already use

the standard filter and they work OK.

  1. … 21 more files in changeset.
LDEV-4402 Use Spring support for Hibernate v5 instead of v4

WF10 is shipped with Hibernate 5, so Spring support version should

match.

  1. … 17 more files in changeset.
LDEV-4400 Update configuration files to match latest schemas

  1. … 30 more files in changeset.
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

    • -840
    • +0
    ./scss/_bootstrap-variables.scss
  1. … 155 more files in changeset.
LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

    • -0
    • +840
    ./scss/_bootstrap-variables.scss
    • -0
    • +56
    ./scss/_lams_variables.scss
  1. … 157 more files in changeset.
LDEV-4184: Silence "[DEPRECATION] Encountered positional parameter" warning in hibernatelams.log. Fixing them requires going through multiple SQL queries and it is not worth it. Positional parameters work fine.

  1. … 3 more files in changeset.
LDEV-4293: Add Ant build which prepares LAMS cluster test environment. ThemeDTO needs to be serializable in order to put it into a shared session.

  1. … 2 more files in changeset.
LDEV-4196 Create document collaboration tool

  1. … 5 more files in changeset.
LDEV-4184: Silence few unnecessary logs.

LDEV-4184: SIlence " HHH000179: Narrowing proxy..." warning.

LDEV-4073: Periodically check server state and refresh configuration cache once it is started.

  1. … 3 more files in changeset.
LDEV-3997 Support for LTI 1.1 * httpclient was removed as it's now available as WV internal library * added new libraries required to verify OAuth signature and util classes for LTI

  1. … 16 more files in changeset.
LDEV-3965 added new Google Auth Java library that implements the Time-based One-time Password (TOTP) algorithm

  1. … 6 more files in changeset.
LDEV-3956 * added missing .jar phrase * renamed urlrewrite->urlrewritefilter

  1. … 3 more files in changeset.
LDEV-3888 Include configuration for HTTP Strict-Transport-Security Header

LDEV-3665: SAML still uses joda.

LDEV-3776: Remove $Id CVS keyword.

  1. … 1063 more files in changeset.
LDEV-3768: Remove XDoclet library and corresponding Ant tasks. Generate and use static configuration files instead.

    • -268
    • +0
    ./xdoclet-hibernate-template.xml
  1. … 403 more files in changeset.