Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

  1. … 2102 more files in changeset.
LDEV-5440 Reintroduce more strict security rules in web.xml

  1. … 38 more files in changeset.
LDEV-5440 Fix file uploads

  1. … 38 more files in changeset.
LDEV-5440 Configure file uploads in Spring servlet

  1. … 34 more files in changeset.
LDEV-5440 Update web.xml version

  1. … 40 more files in changeset.
LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

  1. … 223 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5302' into v4.7

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

lams_admin/web/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

  1. … 58 more files in changeset.
LDEV-5302 Rename sysadmin role to appadmin

  1. … 181 more files in changeset.
LDEV-5259 Manually create parent application context

Previous attempt to reproduce BeanFactoryLocater was an overkill. A

simple singleton parent application context is sufficient.

  1. … 45 more files in changeset.
LDEV-5259 Reintroduce BeanFactoryLocator mechanism back to LAMS

It was removed for Spring 5

  1. … 58 more files in changeset.
LDEV-5156 Fix element ordering in web.xml files

  1. … 29 more files in changeset.
LDEV-5156 Fix schema info in web.xml files

  1. … 37 more files in changeset.
LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

  1. … 172 more files in changeset.
LDEV-4932 Secure setting submission deadline with CSRF Guard

  1. … 63 more files in changeset.
LDEV-4705 Remove references to Group Admin role from web.xml

  1. … 30 more files in changeset.
LDEV-4440 Finished survey

  1. … 24 more files in changeset.
LDEV-4440 Initial version of authoring on Spring MVC

  1. … 25 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-4272: Do not allow in LAMS any HTTP methods other than GET or POST.

  1. … 34 more files in changeset.
LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

  1. … 371 more files in changeset.
LDEV-3335, LDEV-3340: Remove a filter which sets inactive timeout in sessions. With new SSO it is just needed in Central and it is already taken care of by SessionListener.

  1. … 33 more files in changeset.
LDEV-3335, LDEV-3334: Add session and cookie configuration to jboss-all.xml. Remove obsolete configuration from web.xml files.

  1. … 35 more files in changeset.
LDEV-3335, LDEV-3334: Use SSO mechanism introduced in WildFly 9. Do not create web.xml files with XDoclet as it can not produce them based on 3.1 schema. Use static ones instead. Make SessionManager just a proxy to webserver's HTTP session. Remov custom shared sessions and JSESSIONIDSSO cookie as they are obsolete. Remove own session monitoring as the container should take care of invalidation. Move injecting UserDTO into session to SsoHandler intead of UniversalLoginModule as an authentication request may not reach the latter due to WildFly credentials caching.

  1. … 226 more files in changeset.
LDEV-3315: Clean up roles and paths to secured resources in all modules. Remove AUTHOR ADMIN role.

  1. … 72 more files in changeset.
LDEV-3315: Remove AUTHOR ADMIN role. Allow AUTHOR role to preview lessons. Allow MONITOR role to edit activities and run Live Edit.

  1. … 72 more files in changeset.
LDEV-3315: Clean up roles and paths to secured resources in all modules.

  1. … 38 more files in changeset.
LDEV-3293: Use Spring support for Hibernate 4 instead of 3 (session factory and filters). Use new path for Hibernate DTDs. Make XDoclet generate hbm.xml files with the correct path by providing it a new template.

  1. … 111 more files in changeset.
LDEV-3293: Use new Spring ApplicationContext classes.

  1. … 34 more files in changeset.
LDEV-2847: Major changes to build.xml files. See JIRA comment for full explanation.

  1. … 1313 more files in changeset.
LDEV-2577 The new CKEditor does not have Java Integration library (yet). We have been using it to: a) get the tag library to create our own tag <lams:FCKeditor> But the new CKEditor uses AJAX to get the contents, so the library is not needed anymore. The references to it has been deleted from every tool. FCKEditor.tag has been rewritten to use the new syntax. b) get a FCKEditor internal file manager by a Connector from the jar The new CKEditor does not provide a file manager - the license became commercial and the whole thing became a separate project, CKFinder. There were alternatives suggested on the web: jasfinder - http://sourceforge.net/projects/jasfinder/support kcfinder - http://kcfinder.sunhater.com/ some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/ but we have already nicely integrated with the old file manager. This page: http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/ in polish says how to use the file manager from the old FCKEditor. The steps that have to be done: - download the new CKEditor - download the old FCKEditor - copy the filemanager to ckeditor directory - in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to: window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' ); - in the file browser/default/browser.html add in line 80: document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

  1. … 1096 more files in changeset.