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. … 45 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. … 3 more files in changeset.
LDEV-4411 Add collections 2nd level cache

  1. … 97 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. … 23 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. … 19 more files in changeset.
LDEV-4400 Update configuration files to match latest schemas

  1. … 33 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. … 5 more files in changeset.
LDEV-4184: Silence few unnecessary logs.

  1. … 1 more file in changeset.
LDEV-4184: SIlence " HHH000179: Narrowing proxy..." warning.

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

  1. … 1 more file in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 1071 more files in changeset.
LDEV-3333: Put back an extension required by slimmed configuration.

LDEV-3734: Use proper class for MySQL connection validator.

  1. … 1 more file in changeset.
LDEV-3734: Use previous (MySQL) connection validator as it is more efficient than SELECT query. Turn on connection validation on connection check out.

  1. … 1 more file in changeset.
LDEV-3347: Revert to default caches' settings as "entity" cache config is a template for a region (one Java entity = one region). This is different to JBoss where all entities were stored in single region and it had to be large. Add missing parameters in Hibernate config.

  1. … 2 more files in changeset.
LDEV-3734: Auto-reconnect DB connections. Use another connection checker.

  1. … 1 more file in changeset.
LDEV-3718: Increase the server upload limit to 100 MB. LAMS inner limit can still be controlled with sysadmin settings.

  1. … 1 more file in changeset.
LDEV-2846: Silence too verbose logs.

  1. … 1 more file in changeset.
LDEV-3671: unnecessary white spaces in jsp generation

  1. … 1 more file in changeset.
LDEV-3275: Make WF use hot deployed JSP pages, not cached ones.

  1. … 1 more file in changeset.
LDEV-3651: Remove x-powered-by from WF

  1. … 1 more file in changeset.
LDEV-3647: Set logging level for some Hibernate Java packages to INFO.

  1. … 1 more file in changeset.
LDEV-3633: Disable SSL when LAMS connects to DB.

  1. … 1 more file in changeset.
LDEV-3275: Use tokens instead of hardcoded DB details for slimmed configuration.

LDEV-3591: Flatten UniversalLoginModule hierarchy - it was just a single leaf anyway. Format code. Clean up logs, errors and comments. Move queries from config files to code.

  1. … 12 more files in changeset.
LDEV-3540: Add root context content which redirects to /lams/ context.

  1. … 3 more files in changeset.
LDEV-3275: Remove headers and set logging conf.

  1. … 1 more file in changeset.
LDEV-3333: Remove configuration files, binaries, docs and other unnecessary resources.

  1. … 8 more files in changeset.
LDEV-2797: Change slim-jboss tasks so it removes more unnecessary files.

    • -0
    • +61
    ./legacy-invokers-service.xml
    • -0
    • +1115
    ./standardjboss.xml
    • -0
    • +253
    ./war-deployers-jboss-beans.xml
  1. … 3 more files in changeset.